Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
274,191 Commits 3 Branches 0 Tags
a1c7483429efd9fa5d87b6218018a67eec022f38
Commit Graph

71 Commits

Author SHA1 Message Date
Lajos Molnar
457cdac667 Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-mr1-dev am: 41f0e20739 
am: b353834077

Change-Id: I4dd81ce125ba6bb0b5ff10c5b84cb5a1e4c958de
 2016-06-28 19:07:26 +00:00
Lajos Molnar
db56549ff2 media: document format keys for MediaExtractor/CodecCapabilities 
Bug: 29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
 2016-06-28 17:20:09 +00:00
Lajos Molnar
87dc1a28d1 Merge \\\"media: update getAchievableFrameRatesFor javadoc\\\" into nyc-dev am: 8fe82686ef am: a4b5454f73 
am: 1e34345c89

Change-Id: If9b16cc94ef53b740f545f66eda27c1382fc51b8
 2016-06-23 21:42:17 +00:00
Lajos Molnar
b28b99a425 media: update getAchievableFrameRatesFor javadoc 
Bug: 28752802
Change-Id: I1c04ae7c3f9f15f84ff185af8d8f3c89958f5595
 2016-06-23 18:47:54 +00:00
Jean-Michel Trivi
7c1cb0d5a5 Add MediaCodecInfo profile constant for AAC ER Scalable 
Bug 29221608

Change-Id: I068efcb4c67ad3c2f6ced49157b76766a57d37a5
 2016-06-13 17:56:29 -07:00
Lajos Molnar
2fc9c6925a media: fix issues with video profile levels 
Support additional corner cases in level ordering:
- MPEG4Level1 only implies support for MPEG4Level0
- HEVC high tier levels are only supported by other high tier levels

H263 unusual level definitions:
- levels 45/50+ define minimum requirements that codecs can extend
- levels 10-45 define minimum size
- restrict to QCIF and CIF only if codecs only supports levels 10-40
  (or 45 in profiles 0 and 2)

MPEG4 max width/height/frame rate:
- Only specified for MPEG4Level0/0b
- Using arbitrary 2:1 aspect ratio and 60fps for other levels
  This is sure to include typical sizes for levels

Fix level limits:
- MPEG2LevelML max 25fps for D1 PAL
- H263Level20 max 30fps, but only 15fps for CIF
- H263Level45 max 15fps
- H263Level45+ min alignment is 4
- MPEG4Level0b max 15fps
- add support for VP9 HDR profiles
- fix HEVC overflow for Level62 calculations

Bug: 28671284
Change-Id: Ie75ae1d19f20d5c6eb40807d03c3b487854eb9a0
 2016-06-01 19:08:34 -07:00
TreeHugger Robot
9061b26f1e Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 2016-06-01 23:29:49 +00:00
Lajos Molnar
87436bb67f media: avoid recursion when evaluating profile support 
Bug: 28671284
Bug: 29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
 2016-05-31 16:41:27 -07:00
Lajos Molnar
0d8337c314 media: avoid NPE in CodecCapabilities.createFromProfileLevel 
Bug: 28980577
Change-Id: Id020ed350e2a16b7772e05bd6a10235481903b40
 2016-05-26 11:45:16 -07:00
Lajos Molnar
0581ee4971 media: check profile, level and bitrate for isFormatSupported 
Bug: 28671284
Change-Id: I90639816a7410cf65bcd1c5549c3830ca43b8140
 2016-05-25 07:44:15 -07:00
Lajos Molnar
6c2e08083a media: unhide codec levels 
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
 2016-05-24 10:24:47 -07:00
Lajos Molnar
2a4001ee62 media: add missing levels in CodecProfileLevel and fix limits 
Bug: 28671284
Change-Id: Ie4a91f5639ce8f1c5ac825ec829ac82e695d18b5
 2016-05-24 07:43:51 -07:00
Hangyu Kuang
66496d0d6d Merge "media: Add missing dobly-vision profile." into nyc-dev 2016-05-02 16:55:38 +00:00
TreeHugger Robot
3c6736b078 Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev 2016-04-30 00:36:53 +00:00
Hangyu Kuang
f939e4adf1 media: Add missing dobly-vision profile. 
Bug:28411120
Change-Id: I92eecd7436365fab2668e66b8759c68e7d7af298
 2016-04-28 11:57:40 -07:00
Hangyu Kuang
9186c38fce media: Change VP9 ProfileLevel to start from 0x1. 
Bug:28380207
Related to Bug: 25684127

Change-Id: I9f18358744e9406b34dc880e6eb533945eabe104
 2016-04-26 17:51:59 -07:00
Lajos Molnar
7a2ab16b65 VideoCapabilities: account for block size for getAchievableRates 
Bug: 25597057
Change-Id: I1a01e4b466e2b70cebf55179c83806fe269a31ee
 2016-04-26 13:42:44 -07:00
Lajos Molnar
8acc164738 CodecCapabilities: handle legacy VP9 codecs with no profiles 
Bug: 26935336
Change-Id: I1049b9da8e6c984f86e307990000401b66119693
 2016-04-25 13:28:06 -07:00
Hangyu Kuang
f0ef572fd0 media: update VP9 CodecProfileLevel 
Bug:27969307
Change-Id: I44f230bb691bd193c2119b399eca17da87bfbc97
 2016-04-11 12:08:03 -07:00
Ronghua Wu
32e537c610 media: update dolby vision CodecProfileLevel 
Bug: 25684127
Change-Id: I3d35e31b34cc0d23c68eded87d5e443c74833685
 2016-04-01 18:02:41 +00:00
Ronghua Wu
f2615b8b33 media: define HEVCProfileMain10HDR10 
Bug: 25684127
Change-Id: I9679eaab9b02aeede3e488d33279477a45887b63
 2016-02-26 13:22:52 -08:00
Ronghua Wu
7d8501d06c Merge "media: define vp9 profile and level" 2016-01-27 21:37:59 +00:00
Ronghua Wu
f37f9ba8c8 media: define vp9 profile and level 
Bug: 25684127
Change-Id: I806f87847e0c75c3a39cea0c5ffcc3df28d60a75
 2016-01-27 12:21:00 -08:00
Hangyu Kuang
8e498db77a Merge "media: Add interface to query and set intra refresh for encoder." 2016-01-27 18:06:25 +00:00
Hangyu Kuang
e9618e810a media: Add interface to query and set intra refresh for encoder. 
Bug:26587630
Change-Id: I913a56b4888e2c46ad30ba0e9c3130da7101f7a4
 2016-01-27 16:37:04 +00:00
Ronghua Wu
d6c2a76dcf media: add dolby vision profile and level defines in CodecProfileLevel. 
Bug:
Change-Id: I56adbaab6bf76929b607d3245cf1506da5508a5e
 2016-01-26 17:05:39 -08:00
Ronghua Wu
5755817422 Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC." 
This reverts commit 58a30f1cf6.

Change-Id: I067892ea5a70f366ef20c45781616715705f4ec4
 2016-01-08 09:45:17 -08:00
Glenn Kasten
bd2c3d65d6 Use FCC_2 and FCC_8 to highlight channel count assumptions 
Bug: 21656069
Change-Id: I20a74575eddf6e28f1777d04eeab396f28bcc0cc
 2016-01-05 11:44:12 -08:00
Ronghua Wu
58a30f1cf6 media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC. 
Bug: 25684127
Change-Id: I535b1971e0fe6b19e5182b09ca04b69b337a8474
 2015-12-10 12:36:14 -08:00
Lajos Molnar
afa6ceb5a0 media: Clarify MediaCodec and CodecCapabilities documentation 
Bug: 21932760
Bug: 22847191
Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
 2015-07-31 14:48:47 -07:00
Ronghua Wu
e595268e98 media: use blocks number to find closest size 
Bug: 22504214
Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
 2015-07-30 13:01:20 -07:00
Ronghua Wu
4ef977c08f media: fix estimateFrameRatesFor to use correct ratio 
Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
 2015-07-28 15:08:08 -07:00
Ronghua Wu
75c4824bf6 media: Implement getAchievableFrameRatesFor with measured frame rate. 
Bug: 20507129
Change-Id: I4751ea0f8d4f1173ace18d397b59e9cd6c70688f
 2015-07-07 16:01:53 -07:00
Ronghua Wu
71b5a5866d media: clean up the usage of max-supported-instances. 
Bug: 22089269
Change-Id: I05ab49c8b5aaaa0adb6c1a5a1f7af33e6abc5b91
 2015-06-29 17:07:12 -07:00
Ronghua Wu
cf6a4ba5a4 media: parse max-concurrent-instances. 
Bug: 22089269
Change-Id: I2b0af7c5c6a309c8396b595ea54b899451239b18
 2015-06-25 14:13:40 -07:00
Lajos Molnar
1c436bd911 media: allow feature-can-swap-width-height to be optional. 
We have enabled this only optionally in media_codecs.xml

Bug: 21568607
Change-Id: I11a12883afc051ba8c479255acc59388fb9a6722
 2015-06-10 20:54:53 -07:00
Harish Mahendrakar
34265cd94f media: Added MPEG2 profile/levels and tests 
Bug: 20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
 2015-05-05 11:05:22 -07:00
Lajos Molnar
e7f12bfdf6 media: deprecate correct codec color formats, add flexible formats 
Change-Id: Ie79c4027fa969fe352da224b3f1844b0a7eaaeaa
 2015-04-24 02:34:48 +00:00
Lajos Molnar
38a296a65f media: VideoCapabilities: publish codec performance data 
Bug: 20507129
Change-Id: I0508bdc9aec8eeeb3ebe16ef21f58d5c0d75af4b
 2015-04-23 01:02:39 -07:00
Lajos Molnar
b1fa78c132 media: define codec color formats (part 1) 
Define supported color formats. Deprecate old color formats.

Change-Id: I909acf33a2019e2d5b55080298d5d00f8e9ce71d
 2015-04-22 16:18:31 +00:00
Ronghua Wu
ee2997577d media: add CodecCapabilities.getMaxSupportedInstances. 
Bug: 19620911
Change-Id: I11a55121490eba5027498a27c7719133acd1a39a
 2015-04-13 11:26:07 -07:00
Andreas Gampe
6ec9fd8b3b am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison" 
* commit 'c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
  Frameworks/base: Use equals for Integer comparison
 2015-03-16 20:26:32 +00:00
Andreas Gampe
5c5978985a Frameworks/base: Use equals for Integer comparison 
Integer == is dangerous, as equal objects may not be identical
objects. In fact, MediaFormat.setInteger was creating a new object
every time.

Change MediaFormat.setInteger and setLong to use valueOf, which
may reuse returned objects.

Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
 2015-03-15 15:45:15 -07:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
Lajos Molnar
6c9833b967 MediaCodecInfo: remove stack trace logspam when querying invalid sizes 
Change-Id: I0ed3825f17cacb0502c40483462f1d76f92e5efa
 2015-01-29 10:24:37 -08:00
Chong Zhang
e079f8ee2d am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
automerge: d7383a8

* commit 'd7383a8f00b533d00dc48f7aca7ee89d1fc52a36':
  parse bitrate range for video/audio caps
 2014-12-12 21:07:38 +00:00
Chong Zhang
216e11dcbb parse bitrate range for video/audio caps 
Bug: 18684228
Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
 2014-12-12 11:34:42 -08:00
Lajos Molnar
ceabd79c4b am 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev 
* commit '967da505b2cb96ed85161fd940dbecb467bfe38c':
  media: allow full range of Vorbis sampling rates
 2014-12-09 00:16:43 +00:00
Lajos Molnar
610e288de6 media: allow full range of Vorbis sampling rates 
Bug: 18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
 2014-12-04 09:50:54 -08:00
Lajos Molnar
7d612f0deb am 0b10f9c0: am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev 
* commit '0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb':
  media: fix isSupportedFormat for integer frame rate
 2014-11-24 18:12:56 +00:00