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
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
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
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
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
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
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
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
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
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
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
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
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
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
2016-05-24 18:56:32 +00:00
Eric Laurent
50103561d2
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
...
am: b143e3de34
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
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
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
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
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
2016-05-12 00:38:13 +00:00
