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
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
Robert Shih
ed78114ffd
Fix deadlock when showing subtitles MediaPlayer
...
Move all SubtitleTrack operations to TimeProvider's event handler thread.
Bug: 28784397
Change-Id: Iff848635390e99ffb19add03277a9d62feece4cc
2016-05-27 15:16:47 -07:00
Phil Burk
42facec856
Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d am: 29e8879307" into nyc-mr1-dev-plus-aosp
...
am: 380221f94f
2016-05-27 17:14:11 +00:00
Phil Burk
f6f5ad9cd0
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d
...
am: 29e8879307
2016-05-27 03:02:09 +00:00
Lajos Molnar
0d8337c314
media: avoid NPE in CodecCapabilities.createFromProfileLevel
...
Bug: 28980577
Change-Id: Id020ed350e2a16b7772e05bd6a10235481903b40
2016-05-26 11:45:16 -07:00
Phil Burk
4eccbbf926
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
...
am: d34d06606d
2016-05-26 17:53:19 +00:00
Phil Burk
d34d06606d
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
2016-05-26 17:46:08 +00:00
Phil Burk
2050f6cb43
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
...
Explain buffer size optimization.
This CL has no code changes, just documentation changes.
Bug: 28802853
Change-Id: I91942f00a3e9691e4fc05b24656b8bf4cb538bc2
Signed-off-by: Phil Burk <philburk@google.com >
2016-05-26 10:34:50 -07:00
Daichi Hirono
86c1a9bf60
Remove MTP API marked as @removed.
...
BUG=28146379
Change-Id: I4f0a380941663eac423f8a5633447f1eceb516cb
2016-05-26 16:39:21 +09:00
Lajos Molnar
1dc65e4d68
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 am: e3d6b69562
...
am: c2d9a234c1
2016-05-26 06:50:43 +00:00
Lajos Molnar
e3d6b69562
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
...
am: 40585321d7
2016-05-26 06:27:34 +00: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
Jean-Michel Trivi
3109da2e8b
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a am: 30979c2c76
...
am: 1e34fb313b
2016-05-24 21:35:17 +00:00
Jean-Michel Trivi
1e34fb313b
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a
...
am: 30979c2c76
2016-05-24 21:31:14 +00:00
Jean-Michel Trivi
2c5efb4827
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
...
am: 3a91a8417a
2016-05-24 21:24:03 +00:00
Jean-Michel Trivi
3a91a8417a
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
2016-05-24 21:17:49 +00:00
Lajos Molnar
762db297f7
Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f am: 674262b7e1
...
am: cb86750595
2016-05-24 19:21:49 +00:00
