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
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
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
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
* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
media: avoid NPE in CodecCapabilities.createFromProfileLevel
Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b
2016-06-01 23:44:12 +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
bf3d1fc245
Merge "media: avoid recursion when evaluating profile support" into nyc-dev
...
am: a72a83a172
* commit 'a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
media: avoid recursion when evaluating profile support
Change-Id: I41d6aac773ab5c31b700eea343d9a143934c2f6b
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
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
* commit 'd34d06606dd5be9fc18029e87cb4b56ecef21864':
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Change-Id: I9a656fe5e1ab598994f7a03984510cb1e9387f01
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
Lajos Molnar
e3d6b69562
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
...
am: 40585321d7
* commit '40585321d7b036ce7f609fbf10e8730deb1ad456':
media: check profile, level and bitrate for isFormatSupported
Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a
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
2c5efb4827
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
...
am: 3a91a8417a
* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
Remove deprecated AudioManager.AudioRecordingCallback method
Change-Id: I1211c2411d052762d95896c0e22661bd718c3039
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
Jean-Michel Trivi
602dc777c5
Remove deprecated AudioManager.AudioRecordingCallback method
...
Remove AudioRecordingCallback.onRecordingConfigChanged(
AudioRecordingConfiguration[] configs)
Bug 28819230
Change-Id: I3b85bb9313267499ac407099939b5889bdba996b
2016-05-24 12:11:59 -07:00
Lajos Molnar
4493049a88
Merge "media: unhide codec levels" into nyc-dev
...
am: aba6e2c78f
* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
media: unhide codec levels
Change-Id: I5a0253e8f8fe65551dadf8b3b024224fedd1042d
2016-05-24 18:56:32 +00:00
Eric Laurent
50103561d2
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
...
am: b143e3de34
* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
Fix AudioTrack and AudioRecord documentation
Change-Id: I2fe322e51f6a7dc548d8f7964fae033b14219b02
2016-05-24 17:33:13 +00:00
Lajos Molnar
6c2e08083a
media: unhide codec levels
...
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
2016-05-24 10:24:47 -07:00
Eric Laurent
b143e3de34
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
2016-05-24 17:15:11 +00:00
Lajos Molnar
01df627536
media: add missing levels in CodecProfileLevel and fix limits
...
am: 2a4001ee62
* commit '2a4001ee62f3374d7fffed72d71f77c5a833c331':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Ibfcfb720cd1503e4318ebcd14dc29749a535038c
2016-05-24 16:07:24 +00: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
Eric Laurent
219de73da2
Fix AudioTrack and AudioRecord documentation
...
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.
Bug: 28906466
Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
2016-05-23 17:36:43 -07:00
Jean-Michel Trivi
bbcf18dbfd
Merge "Recording activity notification: return list of configuration" into nyc-dev
...
am: c991879f29
* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
Recording activity notification: return list of configuration
Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded
2016-05-23 20:56:04 +00:00
Jean-Michel Trivi
f04fab160a
Recording activity notification: return list of configuration
...
Use a list of configurations instead of an array
Bug 28819230
Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
2016-05-23 09:44:58 -07:00
Jae Seo
79108f18bf
Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
...
am: 44fbbfd248
* commit '44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a':
MediaBrowserService: Add more explanation on getBrowserRootHints()
Change-Id: I0cc37df958a3419770cc943a077f35bd3c41a324
2016-05-20 21:02:11 +00:00
Jae Seo
bd6c16908d
MediaBrowserService: Add more explanation on getBrowserRootHints()
...
Bug: 28840985
Change-Id: If4dbcaaa23093b2e6d5ab6158db67b1248464fb8
2016-05-19 14:17:27 -07:00
Jae Seo
3488ed71d2
Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev
...
am: 7996b96311
* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
TIF: Throw a more appropriate runtime exception when building TvInputInfo
Change-Id: Ic7a930eb85984bab3e4a83ffa02ad30c30a568cf
2016-05-17 18:51:02 +00:00
Jae Seo
18c0cfb075
TIF: Throw a more appropriate runtime exception when building TvInputInfo
...
Bug: 28775591
Change-Id: I934c8d7fed3dda356cdc3bafe51a79f585918ed0
2016-05-17 10:06:36 -07:00
Jae Seo
e0b04a29bf
Merge "TIF: Remove the uniqueness check for track ID from notifyTracksChanged" into nyc-dev
...
am: d1fe7ea84f
* commit 'd1fe7ea84fc5abeb495261f69e288851a3f3abd4':
TIF: Remove the uniqueness check for track ID from notifyTracksChanged
Change-Id: I7f75213f543b91ef0a36bd4806f7590b8b9ae0ad
2016-05-12 00:38:13 +00:00
Jae Seo
a2a03aa026
TIF: Remove the uniqueness check for track ID from notifyTracksChanged
...
Requiring uniqueness of ID across all track types seems a little too
much demand for developers and they do want to use the same ID on
different track types. Also, this doesn't seem terribly useful.
Hence remove the check.
Bug: 28436618
Change-Id: I9040310c5ce31bcff522021d83f7508506cbd9d3
2016-05-11 14:32:08 -07:00
Jean-Michel Trivi
0b52195b59
Merge "Fix javadoc missing possible return value in AudioRecordingConfiguration" into nyc-dev
...
am: 0316ed0766
* commit '0316ed0766f6325fa9885488ae0ff0abe6a15a43':
Fix javadoc missing possible return value in AudioRecordingConfiguration
Change-Id: I132ba188ac843e9b5ba66c36b8c09c030d3f72c7
2016-05-11 00:14:58 +00:00
Jean-Michel Trivi
0316ed0766
Merge "Fix javadoc missing possible return value in AudioRecordingConfiguration" into nyc-dev
2016-05-11 00:07:47 +00:00
Jae Seo
421746e991
Merge "TIF: Fix comments for program start/end times" into nyc-dev
...
am: 281d96e238
* commit '281d96e238ba53dba339df7ffde05cf1f46eb1b5':
TIF: Fix comments for program start/end times
Change-Id: I7f3861a39ab465973c16543a5ae27dc5ed73b477
2016-05-10 23:40:24 +00:00
Jae Seo
0129c03357
TIF: Fix comments for program start/end times
...
Bug: 28681747
Change-Id: I28a7359121ca1740c043806e1532ce922c753cbc
2016-05-10 15:17:08 -07:00
Youngsang Cho
07b1cd430b
Merge "TIF: Handle possible memory leaks" into nyc-dev
...
am: cea42f6353
* commit 'cea42f63536f637ad17ad2706cfee3164b576438':
TIF: Handle possible memory leaks
Change-Id: I0eed1df8c4cc565b58701404d0c5bd44225e7737
2016-05-10 01:36:13 +00:00
TreeHugger Robot
cea42f6353
Merge "TIF: Handle possible memory leaks" into nyc-dev
2016-05-10 01:23:36 +00:00
Youngsang Cho
e2cd56cc8a
TIF: Handle possible memory leaks
...
Bug: 28656236
Change-Id: I162bb8ebc59be90ac1b1eb824c1db5aa9169c247
2016-05-09 15:30:43 -07:00
Sungsoo Lim
955431223a
Merge "MediaBrowser: Make support lib v23.x available in N release" into nyc-dev
...
am: c3fc7d4038
* commit 'c3fc7d4038a21918e42efd99f4759e963e1489a3':
MediaBrowser: Make support lib v23.x available in N release
Change-Id: I6558bec509eb6fe516ee185fd9f38b26017733c0
2016-05-09 20:43:47 +00:00
Jae Seo
c3fc7d4038
Merge "MediaBrowser: Make support lib v23.x available in N release" into nyc-dev
2016-05-09 20:32:46 +00:00
Jae Seo
71847d0193
Merge "MediaRouter: Add more logs for debugging" into nyc-dev
...
am: 99aa441581
* commit '99aa4415815fd906b93f5d5220762b94133cefef':
MediaRouter: Add more logs for debugging
Change-Id: I2f025d99ceb26dc19848bea28c64f216e4a45224
2016-05-09 16:51:38 +00:00
Jae Seo
18687b7a27
MediaRouter: Add more logs for debugging
...
Bug: 28517884
Change-Id: I325b407983e79a78701acfbfd8f109657f006846
2016-05-07 14:12:55 -07:00
Sungsoo Lim
6b7bda0bc3
MediaBrowser: Make support lib v23.x available in N release
...
A workaround change for supporting support lib 23.x in N release.
This change should be reverted in some point before O release.
Bug: 28572934
Change-Id: I7e6afc0293688e425736bc93da0ea10233c07e9a
2016-05-07 17:45:40 +09:00