Eric Laurent
8d3692c565
Merge "MediaActionSound: fix SoundPool load race condition" into nyc-dev am: 2523d8f
...
am: 3503886
* commit '3503886bc08c8ead88c30a3f4111f21e57238379':
MediaActionSound: fix SoundPool load race condition
Change-Id: I51a77e9a9d5b37d0c86595fac1061452cb19c2c5
2016-04-04 21:51:17 +00:00
Eric Laurent
3503886bc0
Merge "MediaActionSound: fix SoundPool load race condition" into nyc-dev
...
am: 2523d8f
* commit '2523d8f1e385bd69bfd33510f1041ee0b7e7db66':
MediaActionSound: fix SoundPool load race condition
Change-Id: If32589bc3097724872303de6fc9b1723bd68486c
2016-04-04 21:48:48 +00:00
Eric Laurent
d7a267de78
MediaActionSound: fix SoundPool load race condition
...
If play() was called shortly after load() and before the load
completion callback, the sample was considered
loaded although the SoundPool was not ready to play it.
Fixed by implementing a more robust state machine for sound
load and play control.
Bug: 22499793
Change-Id: I727e07f842a0adc5225dc248f16bc4a7225a1c8e
2016-04-04 12:53:01 -07:00
Robert Shih
83e3f3afb7
Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev am: 5bf198c
...
am: 1305623
* commit '1305623441eb197a54df9276c118839c5608b08b':
Fix MediaExtractor.getDrmInitData implementation for webm
Change-Id: I88d8daa6475b6ac884b78c661e1025a9faa6c7c1
2016-04-04 17:21:51 +00:00
Robert Shih
1305623441
Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev
...
am: 5bf198c
* commit '5bf198c3806c611fceb3d6d373883ed8f11a37fc':
Fix MediaExtractor.getDrmInitData implementation for webm
Change-Id: I46d4b3a1b17bd11f209a4f9fa150c1d38bb55592
2016-04-04 17:18:25 +00:00
Robert Shih
5bf198c380
Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev
2016-04-04 17:09:45 +00:00
Sungsoo Lim
b646eab3f5
Merge "MediaBrowser: Make EXTRA_PAGE zero-based" into nyc-dev am: 16bbf7d
...
am: 38fdef8
* commit '38fdef8d4e54bcdc9f268662cd5be3a3725bc91a':
MediaBrowser: Make EXTRA_PAGE zero-based
Change-Id: I28e22e71437270b2b74a6bae2fc5631ecb33b8b3
2016-04-04 07:09:34 +00:00
Sungsoo Lim
38fdef8d4e
Merge "MediaBrowser: Make EXTRA_PAGE zero-based" into nyc-dev
...
am: 16bbf7d
* commit '16bbf7d8eddf4778b415e8871ab04885250dbd94':
MediaBrowser: Make EXTRA_PAGE zero-based
Change-Id: I75f1786e6a2acb2a06e11f1af7856a7344593104
2016-04-04 07:06:15 +00:00
Sungsoo Lim
0799bd07d7
MediaBrowser: Make EXTRA_PAGE zero-based
...
Bug: 27948393
Change-Id: I97fb6b5f13ffb8e006ed4a7efc06e7f45fb5121a
2016-04-04 11:14:10 +09:00
Jean-Michel Trivi
4d59d33905
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev am: e731fab
...
am: e2e83f1
* commit 'e2e83f1a7d5434311f1b9597f7b91a15d7cde211':
AudioTrack.Builder: fix javadoc code sample
Change-Id: I6d77e5bfc8951a47a65e67b7c724eb7bcab8d313
2016-04-02 01:31:42 +00:00
Jean-Michel Trivi
e2e83f1a7d
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev
...
am: e731fab
* commit 'e731fab348e5b6d19c078e200afa50f166bfbf7d':
AudioTrack.Builder: fix javadoc code sample
Change-Id: If68633496ba82655cdf9591ed7cb08b96c7733ca
2016-04-02 01:27:07 +00:00
Jean-Michel Trivi
49962261b3
AudioTrack.Builder: fix javadoc code sample
...
Fix sample rate in javadoc code sample.
Bug 24499652
Change-Id: I8d92ff34981cb4486e780d74213ed88fd3f74cc6
2016-04-01 17:23:19 -07:00
Robert Shih
c67abec674
Fix MediaExtractor.getDrmInitData implementation for webm
...
Should lookup "crypto-key" in individual track formats instead of file format.
Bug: 26070802
Change-Id: I1a0f59e7bca1d311631e7ad90b9a403ac20d319b
2016-04-01 16:25:53 -07:00
Jean-Michel Trivi
577c1c1570
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev am: 7fa2caf
...
am: f533f04
* commit 'f533f0480795a81529efc9a64e916837bad09318':
AudioTrack.Builder: fix javadoc code sample
Change-Id: I6710b6df3484ed8dc61b90f460cd75966171d3e6
2016-04-01 22:03:54 +00:00
Jean-Michel Trivi
dd15f5ae28
Merge "Audio recording activity notification: change callback name" into nyc-dev am: 9cc2c5c
...
am: 67e3d66
* commit '67e3d66609912bf9999962b9ffa5ff52e89c593e':
Audio recording activity notification: change callback name
Change-Id: I6db37e8c1531014e4b69a3b8042bf4112bc31b51
2016-04-01 22:03:51 +00:00
Jean-Michel Trivi
f533f04807
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev
...
am: 7fa2caf
* commit '7fa2caf34a941a15062ec4ab77b60aa382e76e2a':
AudioTrack.Builder: fix javadoc code sample
Change-Id: Ia269d56b2881c13d0b72982ba758c842cdf8ad49
2016-04-01 21:58:56 +00:00
Jean-Michel Trivi
67e3d66609
Merge "Audio recording activity notification: change callback name" into nyc-dev
...
am: 9cc2c5c
* commit '9cc2c5ceaa0718c6619890e58cbea3890ebcd9cf':
Audio recording activity notification: change callback name
Change-Id: I68cd7f3674f1856aaa117ff1381b6d6983c59960
2016-04-01 21:58:54 +00:00
Jean-Michel Trivi
7fa2caf34a
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev
2016-04-01 21:53:23 +00:00
Jean-Michel Trivi
e27a75173f
AudioTrack.Builder: fix javadoc code sample
...
Code sample in javadoc for AudioTrack.Builder didn't compile.
Bug 24499652
Change-Id: Ib881052bdebd74a25bb86ab73f9679b17c3ce62b
2016-04-01 21:52:42 +00:00
Jean-Michel Trivi
9cc2c5ceaa
Merge "Audio recording activity notification: change callback name" into nyc-dev
2016-04-01 21:48:41 +00:00
Dongwon Kang
8cf308f1d2
Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev am: 66ebc88
...
am: 93343b8
* commit '93343b8f259f2bbd4335066a4a3302ac49b0f39a':
TIF: Add setLabel(CharSequence) in TvInputInfo.Builder
Change-Id: I6b49fe36df685c4eb5d555a3b45188bae58f5e1d
2016-04-01 19:55:19 +00:00
Dongwon Kang
93343b8f25
Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev
...
am: 66ebc88
* commit '66ebc88626a73f8c2a8833fea000b65dbbf971cc':
TIF: Add setLabel(CharSequence) in TvInputInfo.Builder
Change-Id: Id6784bb9c1db532915250ee586725c3f15e8de05
2016-04-01 19:50:43 +00:00
Dongwon Kang
66ebc88626
Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev
2016-04-01 19:42:41 +00:00
Ronghua Wu
2fd7157ab7
media: update dolby vision CodecProfileLevel am: 32e537c
...
am: 8a051c1
* commit '8a051c1a35fafaf5b09a4f2e7d074fe10347d925':
media: update dolby vision CodecProfileLevel
Change-Id: I7fb4443d4e2de8275f5d2e6115245bb45de5711a
2016-04-01 18:41:56 +00:00
Ronghua Wu
8a051c1a35
media: update dolby vision CodecProfileLevel
...
am: 32e537c
* commit '32e537c610b66ca975e6d9e4cf5dadb4a7cb62d3':
media: update dolby vision CodecProfileLevel
Change-Id: I57990eabeea272fee71ed2aa2cd631e9e92fb190
2016-04-01 18:34:32 +00:00
Ronghua Wu
32e537c610
media: update dolby vision CodecProfileLevel
...
Bug: 25684127
Change-Id: I3d35e31b34cc0d23c68eded87d5e443c74833685
2016-04-01 18:02:41 +00:00
Jean-Michel Trivi
e6a505b775
Audio recording activity notification: change callback name
...
Rename AudioRecordingCallback.onRecordConfigChanged() to
onRecordingConfigChanged() after API council review
Bug 27952000
Change-Id: I362a973781e029bca921181934599dcf60e13136
2016-04-01 09:56:28 -07:00
Dongwon Kang
d09372ad86
TIF: Add setLabel(CharSequence) in TvInputInfo.Builder
...
Bug: 25726241
Change-Id: I8b7cf157dffd0df2b04af0386e448b23409be1e5
2016-04-01 09:51:27 -07:00
Insun Kang
f695304389
Merge "ExifInterface: Code clean up" into nyc-dev am: faecc3f
...
am: 848785f
* commit '848785f20ceff13c9edb9a0730b6416fc3e19f82':
ExifInterface: Code clean up
Change-Id: I201da9079ba1eaa8d17c44f8dfef4d7d0a552851
2016-04-01 09:03:27 +00:00
Insun Kang
848785f20c
Merge "ExifInterface: Code clean up" into nyc-dev
...
am: faecc3f
* commit 'faecc3f800cf2eaaf94f563faaba44193582e8b0':
ExifInterface: Code clean up
Change-Id: I527fe115f16725d9f1ab371e96c776d81a62e36d
2016-04-01 08:59:03 +00:00
Insun Kang
8884af3ee9
ExifInterface: Code clean up
...
Replaces deprecated constants with newly added constants in the actual
implementation.
Bug: 27932489
Change-Id: Id54236a05127cd7ce3bf0668c002635fb86489a9
2016-04-01 11:53:14 +09:00
Jaesung Chung
98a5299bc0
Merge "ExifInterface: deprecate duplicated tags" into nyc-dev am: d37577d
...
am: 61f6904
* commit '61f6904e981dbcd46346ded1223eefd0d711cead':
ExifInterface: deprecate duplicated tags
Change-Id: I9916bf18684821d903c999ba698cb5b6cd99e7a3
2016-03-31 23:19:14 +00:00
Jaesung Chung
61f6904e98
Merge "ExifInterface: deprecate duplicated tags" into nyc-dev
...
am: d37577d
* commit 'd37577d1094de1a93c61502df5738b56433b3e70':
ExifInterface: deprecate duplicated tags
Change-Id: If1c9ac561edcbde6bdcf592886cc3794497ed5c6
2016-03-31 23:12:13 +00:00
Jaesung Chung
d37577d109
Merge "ExifInterface: deprecate duplicated tags" into nyc-dev
2016-03-31 23:04:43 +00:00
Hangyu Kuang
fd38a51b37
Merge "Update mediamuxer documentation that it does not support muxing B-frames." into nyc-dev am: 7c33a5d
...
am: a82e1d5
* commit 'a82e1d5f159d955a3133b1a53fa6627eab7789eb':
Update mediamuxer documentation that it does not support muxing B-frames.
Change-Id: I620dfdcac2e92d6f54f39690cbe54cd36c171788
2016-03-31 21:44:40 +00:00
Hangyu Kuang
a82e1d5f15
Merge "Update mediamuxer documentation that it does not support muxing B-frames." into nyc-dev
...
am: 7c33a5d
* commit '7c33a5dccee1849f7d2a7a6dbea0da2d4eeb27c2':
Update mediamuxer documentation that it does not support muxing B-frames.
Change-Id: I8e8a583590a124d3126459fe54b9885ae7c3046d
2016-03-31 21:40:59 +00:00
Hangyu Kuang
7c33a5dcce
Merge "Update mediamuxer documentation that it does not support muxing B-frames." into nyc-dev
2016-03-31 21:32:43 +00:00
Dongwon Kang
5c67e3a1e0
Merge "TIF: Update javadoc with a better wording" into nyc-dev am: fd0bdc4
...
am: 0264016
* commit '0264016bdb41e704dc10b558c81fc5bb98fc4805':
TIF: Update javadoc with a better wording
Change-Id: Ie231af5085051a4d5c872947d92d9e8ea4c0728e
2016-03-31 19:52:20 +00:00
Dongwon Kang
0264016bdb
Merge "TIF: Update javadoc with a better wording" into nyc-dev
...
am: fd0bdc4
* commit 'fd0bdc4a29e6069e123268981b1af1f12f16030d':
TIF: Update javadoc with a better wording
Change-Id: I5d6fed8a4e661742d13973dda7ba3457cba1e2ec
2016-03-31 19:49:10 +00:00
Dongwon Kang
52e90e59f6
Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev am: 8904a1a
...
am: 2703a4e
* commit '2703a4e7b128b784b31c0bf7d91458c803ef7278':
TIF: Address comments on hardware manager related system APIs
Change-Id: If7a0226ae2448b59cb28d9503e4c5271a5605f78
2016-03-31 17:55:00 +00:00
Dongwon Kang
e7d8e38dbb
Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev am: 8f647b5
...
am: 3c9b498
* commit '3c9b4983a1f42523d061d09a0ef8ba89f7122320':
TIF: Add more class documentation on TvInputManager
Change-Id: If32b728358ed77f4f4fe107a0d41effe85e24b56
2016-03-31 17:53:40 +00:00
Dongwon Kang
2703a4e7b1
Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev
...
am: 8904a1a
* commit '8904a1a1df404149be94ee7df600eda1de177ff4':
TIF: Address comments on hardware manager related system APIs
Change-Id: I0ef721b3b15a3c6358cb8f34cd2427bd311ce738
2016-03-31 17:49:09 +00:00
Dongwon Kang
3c9b4983a1
Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev
...
am: 8f647b5
* commit '8f647b5cdb1f776dbc5d2127fe72a6cf40f95813':
TIF: Add more class documentation on TvInputManager
Change-Id: Ie5035212f2d97a93aa2ca686bb814ffaf2175d1a
2016-03-31 17:48:49 +00:00
Dongwon Kang
775e3c288e
TIF: Update javadoc with a better wording
...
Change-Id: I656c8a94e9d0e5b3ee9ab2b948d51573f5c4e1b2
2016-03-31 10:33:32 -07:00
Dongwon Kang
8904a1a1df
Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev
2016-03-31 17:01:36 +00:00
Dongwon Kang
8f647b5cdb
Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev
2016-03-31 16:46:35 +00:00
Hangyu Kuang
d853da5425
Update mediamuxer documentation that it does not support muxing B-frames.
...
Bug:27597166
Change-Id: I79c971f68d55b19838c1de2be012aaf373c735c4
2016-03-31 16:38:18 +00:00
Tomasz Mikolajewski
3720f795ce
Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev am: e1d0cab
...
am: f2c62df
* commit 'f2c62df0365c23357bed8178e7651908a730c782':
Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.
Change-Id: I59b4cb74bacbafc22a7e0305813a039d132f65bd
2016-03-31 03:58:25 +00:00
Tomasz Mikolajewski
f2c62df036
Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev
...
am: e1d0cab
* commit 'e1d0cabb5f4ccc43d7fa1d84a02a87a8683f8537':
Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.
Change-Id: Ic637439d4d49829f46c64ecced05c838e45fc211
2016-03-31 03:55:24 +00:00
Tomasz Mikolajewski
e1d0cabb5f
Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev
2016-03-31 03:47:41 +00:00