Lajos Molnar
9cecd0a9a2
Merge \\\"media: document format keys for MediaMuxer\\\" into nyc-dev am: 5059e65fec am: 3e81ab2c73
...
am: 3f5ca3d314
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
2016-06-27 16:25:13 +00:00
Lajos Molnar
3e81ab2c73
Merge \"media: document format keys for MediaMuxer\" into nyc-dev
...
am: 5059e65fec
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
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
5495adca3a
media: document format keys for MediaMuxer
...
Bug: 19461810
Change-Id: Iee4396aa6f00b3f580c02fa99f0b9291700f5738
2016-06-24 16:56:53 -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
2016-06-23 21:42:17 +00:00
Lajos Molnar
a4b5454f73
Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev
...
am: 8fe82686ef
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
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
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
2016-06-20 23:16:37 +00:00
Wei Jia
2beba073d1
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
...
am: bd45be5032
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
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
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
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
2016-06-06 20:28:55 +00:00
Jae Seo
711ae66a4b
Merge "TIF: Set the surface secure" into nyc-dev
...
am: 9675f16bba
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
2016-06-02 04:10:07 +00:00
Lajos Molnar
8ce6dee142
media: fix issues with video profile levels am: 2fc9c6925a
...
am: 9e56ec51b0
2016-06-02 04:03:58 +00:00
Lajos Molnar
49f982ec7b
media: fix issues with video profile levels
...
am: 2fc9c6925a
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
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
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
2016-06-02 00:10:33 +00:00
Jae Seo
cf7b33426e
Merge "Fix documentation for channel types" into nyc-dev
2016-06-02 00:03:53 +00:00
Lajos Molnar
12273862c3
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
...
am: 9061b26f1e
2016-06-01 23:44:12 +00:00
Robert Shih
d748cf6ff3
resolve merge conflicts of d579be0 to nyc-dev-plus-aosp am: 4c3d43d2c2
...
am: e188177c21
2016-06-01 23:39:39 +00:00
TreeHugger Robot
9061b26f1e
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
2016-06-01 23:29:49 +00:00
Robert Shih
4c3d43d2c2
resolve merge conflicts of d579be0 to nyc-dev-plus-aosp
...
Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622
2016-06-01 14:53:09 -07:00
Robert Shih
d579be0cf2
Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev
2016-06-01 17:17:00 +00:00
Jae Seo
750e48738c
Fix documentation for channel types
...
Bug: 28747244
Change-Id: I492bdb94400b298d7f2e0ccf9054761e60c5a548
2016-06-01 08:24:18 -07:00
Lajos Molnar
a0846251d2
Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172 am: bf3d1fc245
...
am: d3560d6c05
2016-06-01 01:21:47 +00:00
Lajos Molnar
bf3d1fc245
Merge "media: avoid recursion when evaluating profile support" into nyc-dev
...
am: a72a83a172
2016-06-01 01:05:30 +00:00
