Commit Graph

5648 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
b353834077 Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-mr1-dev
am: 41f0e20739

Change-Id: I482ec13bc3cdf1d7b1a485c2c7baee5131102c56
2016-06-28 19:01:57 +00:00
Lajos Molnar
4461356ea8 media: document rotation and scaling issues for MediaCodec
Bug: 23709311
Bug: 28512795
Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
2016-06-28 10:38:34 -07: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
ed1de77125 Merge \\"media: document VP9 CSD for MediaCodec\\" into nyc-mr1-dev am: 5b2fd818a0
am: c8fea44e5e

Change-Id: I7b6ceeb3192b7b421916bf957a868b1fc8816a62
2016-06-28 16:07:35 +00:00
Lajos Molnar
c8fea44e5e Merge \"media: document VP9 CSD for MediaCodec\" into nyc-mr1-dev
am: 5b2fd818a0

Change-Id: Id7ed6f9342601ee8f67ff28f37c9b38b96e9c084
2016-06-28 16:02:13 +00:00
Lajos Molnar
671da98e2d media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.

Bug: 10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
2016-06-28 14:20:31 +00:00
Lajos Molnar
9cecd0a9a2 Merge \\\"media: document format keys for MediaMuxer\\\" into nyc-dev am: 5059e65fec am: 3e81ab2c73
am: 3f5ca3d314

Change-Id: I33e9b56ec09cae183621ccb6ea42361425c265e7
2016-06-27 16:25:20 +00:00
Lajos Molnar
83bdc9033a Merge \\\"media: document output image crop and layout for MediaCodec\\\" into nyc-dev am: 939484b8ab am: 69484dcd8a
am: 9cb2dfcdeb

Change-Id: If000d886c7681e3badb5e585d3b0ea106eb0859a
2016-06-27 16:25:13 +00:00
Lajos Molnar
3e81ab2c73 Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am: 5059e65fec

Change-Id: I69c5b31fda557ea8d9ca0540f3878f566ada9b56
2016-06-27 16:16:41 +00:00
Lajos Molnar
69484dcd8a Merge \"media: document output image crop and layout for MediaCodec\" into nyc-dev
am: 939484b8ab

Change-Id: Iee0b8c9d07ac7847248e18f23fc26c5d8939f5bb
2016-06-27 16:16:37 +00:00
TreeHugger Robot
5059e65fec Merge "media: document format keys for MediaMuxer" into nyc-dev 2016-06-27 16:10:39 +00:00
Sungsoo Lim
d7e7813734 MediaMetadata: Unhide METADATA_KEY_MEDIA_URI
Bug: 29025504
Change-Id: I38973366ead5878a121b266ce7daf63689858cd0
2016-06-27 11:49:09 +09:00
Lajos Molnar
2c35fd0eba media: document output image crop and layout for MediaCodec
These use hidden, now deprecated MediaFormat keys.

Bug: 14127601
Change-Id: Ib51e4ef41204c9be34ad571300fcb7860feb504e
2016-06-24 17:03:02 -07:00
Lajos Molnar
43a2398258 media: document format keys for MediaExtractor/CodecCapabilities
Bug: 29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
2016-06-24 17:01:26 -07:00
Lajos Molnar
5495adca3a media: document format keys for MediaMuxer
Bug: 19461810
Change-Id: Iee4396aa6f00b3f580c02fa99f0b9291700f5738
2016-06-24 16:56:53 -07:00
Lajos Molnar
231746f67c media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.

Bug: 10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
2016-06-24 16:46:34 -07:00
Muyuan Li
1ed6df6bcf audio: add a flag to force tv-like audio stream.
Bug: 29446492
Change-Id: I5d7272d8735befe7fbed080cca1dd2b47e5f1b6e
(cherry picked from commit 77091ab14a1da2fe4e674edb8af275a3d1ed38ce)
2016-06-24 21:03:02 +00:00
Sungsoo Lim
49663cffe0 Merge "MediaMetadata: Add METADATA_KEY_MEDIA_URI" 2016-06-24 14:32:48 +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
a4b5454f73 Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev
am: 8fe82686ef

Change-Id: I7eac5a104c11d6176d0b8c5469e9a35b36e5cdc4
2016-06-23 21:33:51 +00:00
Lajos Molnar
b28b99a425 media: update getAchievableFrameRatesFor javadoc
Bug: 28752802
Change-Id: I1c04ae7c3f9f15f84ff185af8d8f3c89958f5595
2016-06-23 18:47:54 +00:00
Sungsoo Lim
28b1d88280 MediaMetadata: Add METADATA_KEY_MEDIA_URI
Bug: 29025504
Change-Id: I2447fd0a887ddb5aba5770148c0214c435edde0a
2016-06-23 17:08:33 +09:00
Eric Laurent
68b2ce3b4e Merge \\\"Fix JAVA doc for AudioRecord and AudioTrack Builder\\\" into nyc-dev am: 34ed8ad3c2 am: 4b44c63852
am: f805775657

Change-Id: I1dbe1111191c9542763b7bf24469cda0de2ab015
2016-06-22 01:41:26 +00:00
Eric Laurent
4b44c63852 Merge \"Fix JAVA doc for AudioRecord and AudioTrack Builder\" into nyc-dev
am: 34ed8ad3c2

Change-Id: I1de0df33e6e8f8a453d9c94302d16722d2a0a4a6
2016-06-22 01:17:42 +00:00
Eric Laurent
0f0da49fce Fix JAVA doc for AudioRecord and AudioTrack Builder
The default sampling rate chosen for an AudioTrack or AudioRecord
constructed with a Builder not specifying a sampling rate is not
the primary output sampling rate but depends on the device actually
selected.

Bug: 29541155
Change-Id: Ifcab65418b816b7321b6e9542b9e4bb95f748f95
2016-06-21 15:12:31 -07:00
Sungsoo Lim
184f2e251e Merge "MediaBrowserService: Fix ConcurrentModificationException" 2016-06-20 23:56:14 +00:00
Wei Jia
66f61830e1 Merge \\\"MediaPlayer: fix java doc for setPlaybackParams.\\\" into nyc-dev am: bd45be5032 am: 2beba073d1
am: b3660d6930

Change-Id: I7525ae0ebcf0440b8fc2deb224719e768ab3e5f3
2016-06-20 23:16:37 +00:00
Wei Jia
2beba073d1 Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am: bd45be5032

Change-Id: I1b3604fe84dacf3febf324de154cad00fcd688b8
2016-06-20 23:03:20 +00:00
Wei Jia
ce4957eb37 MediaPlayer: fix java doc for setPlaybackParams.
Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
2016-06-20 15:57:23 -07:00
Sungsoo Lim
6d1910fc0d MediaBrowserService: Fix ConcurrentModificationException
Bug:29438709
Change-Id: Ide54ef7daf4ef78d43485c72e91fd63bc4f99144
2016-06-20 09:28:14 +09:00
Donghyun Cho
16a630d945 Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata" 2016-06-17 02:03:14 +00:00
Donghyun Cho
3cea6d542d Add bluetooth folder type information to MediaDescription and MediaMetadata
Bug: 28210080
Change-Id: Id476fe742c35138b7d83c4440b3f85c0d104df82
2016-06-16 16:26:49 +09:00
Jean-Michel Trivi
02b01b0a68 Merge "Add MediaCodecInfo profile constant for AAC ER Scalable" 2016-06-15 19:36:22 +00:00
Wei Jia
a8372fff7c Merge \\\"MediaPlayer: fix java doc for setSurface and setDisplay.\\\" into nyc-dev am: c6f39a0c36 am: ffd09065a3
am: 8a924cae8e

Change-Id: Ice8a126a15cf15886b768957107012436df1b6fd
2016-06-14 19:05:00 +00:00
Wei Jia
8a924cae8e Merge \\"MediaPlayer: fix java doc for setSurface and setDisplay.\\" into nyc-dev am: c6f39a0c36
am: ffd09065a3

Change-Id: I5ac47afdfa0b5e6cd59d3423eea12b9cad3a31d5
2016-06-14 18:59:56 +00:00
Wei Jia
6a58862af8 Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
am: c6f39a0c36

Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072
2016-06-14 18:58:55 +00:00
Wei Jia
77e351f81e MediaPlayer: fix java doc for setSurface and setDisplay.
Bug: 29149415
Change-Id: I281b6328c068255387ca01a987ff136c3be5e25b
2016-06-14 10:56:57 -07: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
Jae Seo
eed721c3bb Merge "TIF: Set the surface secure" into nyc-dev am: 9675f16bba am: 711ae66a4b
am: 9aa6e93aba

* commit '9aa6e93abaebba22fa3f3592fa0c4eef84b780ea':
  TIF: Set the surface secure

Change-Id: I4ec13078760c33196c9db7ab82d3f38443b86516
2016-06-06 20:28:55 +00:00
Jae Seo
711ae66a4b Merge "TIF: Set the surface secure" into nyc-dev
am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Ic70459cd294453907ce573c55ca0f16868177789
2016-06-06 20:01:14 +00:00
Jae Seo
22168a7dfc TIF: Set the surface secure
Bug: 29104650
Change-Id: I481bf30c57a7c29faaf1cafe64607c22fe55f707
2016-06-02 15:07:17 -07:00
Lajos Molnar
a6ff95dff3 media: fix issues with video profile levels am: 2fc9c6925a am: 9e56ec51b0
am: 8ce6dee142

* commit '8ce6dee142d05f904b6948e8ae72bcbfadd14c51':
  media: fix issues with video profile levels

Change-Id: I375e0d59f7ce3a4bd26fd87a59f223aa8954cf9e
2016-06-02 04:10:07 +00:00
Lajos Molnar
8ce6dee142 media: fix issues with video profile levels am: 2fc9c6925a
am: 9e56ec51b0

* commit '9e56ec51b09803982f2c60075ab6523b69bd0933':
  media: fix issues with video profile levels

Change-Id: I15f18757181186524c63185e26536deddb774eb5
2016-06-02 04:03:58 +00:00
Lajos Molnar
49f982ec7b media: fix issues with video profile levels
am: 2fc9c6925a

* commit '2fc9c6925a51b18452e8080d5ac2d50babd0c866':
  media: fix issues with video profile levels

Change-Id: Id691f951f7b27aded9d2e9d996cd01ebc172d7cf
2016-06-02 03:57:49 +00: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
Jae Seo
5f81e70da9 Merge "Fix documentation for channel types" into nyc-dev am: cf7b33426e am: e96afc7bc2
am: 4c7db55141

* commit '4c7db55141a353fcc1894a6b19e04cdec3dbf9f7':
  Fix documentation for channel types

Change-Id: Ibb73cdfafc247157a62d3f509634886de09335b4
2016-06-02 01:04:51 +00:00
Lajos Molnar
eeba92a884 Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e am: 12273862c3
am: d1991f03de

* commit 'd1991f03de6e2fa25f7e3f6d8cc5a6b25ce6ff7e':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: Icbd327f57fbadacadf70c47f8c60dcfb6bdeeaef
2016-06-02 01:01:13 +00:00
Daichi Hirono
fc4aa530de Merge "Remove MTP API marked as @removed." 2016-06-02 00:23:40 +00:00
Jae Seo
e96afc7bc2 Merge "Fix documentation for channel types" into nyc-dev
am: cf7b33426e

* commit 'cf7b33426e6db0abab94895c3c89c76869f0a8c6':
  Fix documentation for channel types

Change-Id: I4d70f850761d639d4f9ceeff1fe3d33483267415
2016-06-02 00:10:33 +00:00