OSDN Git Service
Jeff Tinker [Fri, 17 Mar 2017 21:15:26 +0000 (21:15 +0000)]
Merge "Fix decoder instantiation during playback"
TreeHugger Robot [Fri, 17 Mar 2017 18:53:40 +0000 (18:53 +0000)]
Merge "Camera: Fix error check for HFR timestamp"
Jeff Tinker [Thu, 16 Mar 2017 06:41:23 +0000 (23:41 -0700)]
Fix decoder instantiation during playback
When a decoder is created while another decoder
is in use and the two decoders share a common
crypto instance, decryption results would become
indeterminate, which could cause the decoder to
hang. This change adds a notification to the
crypto instance so it can update state when its
ownership changes.
bug:
36209723
Test: playbacktests-debug-androidTest.apk as
described in the bug.
Change-Id: I453c260eace5543dd79a3569bf6a9592394c4113
Marco Nelissen [Fri, 17 Mar 2017 17:26:21 +0000 (17:26 +0000)]
Merge "Remove old software avc encoder" am:
fb20749bfa am:
b808809b5f
am:
3b21344aee -s ours
Change-Id: I1092933a14330e1d248ae5b7927ddd7e63768659
Marco Nelissen [Fri, 17 Mar 2017 17:15:28 +0000 (17:15 +0000)]
Merge "Remove old software avc encoder" am:
fb20749bfa
am:
b808809b5f
Change-Id: Id85003bd855316a6675f9c53575d56555f351fdc
Marco Nelissen [Fri, 17 Mar 2017 17:12:45 +0000 (17:12 +0000)]
Merge "Remove old software avc encoder"
am:
fb20749bfa
Change-Id: Iaedc1950b61aca0cb87e808606f6e743419b371d
Shuzhen Wang [Mon, 27 Feb 2017 07:29:04 +0000 (23:29 -0800)]
Camera: Fix error check for HFR timestamp
With Camera HAL sending empty metadata for HFR batching, service
shouldn't check matching timestamp for empty metadata.
Test: Manually test high speed recording
Bug:
35775704
Change-Id: I68f3c16ea9a91f15c70e406540764b02cb6951e1
Marco Nelissen [Fri, 17 Mar 2017 17:02:07 +0000 (17:02 +0000)]
Merge "Remove old software avc encoder"
Marco Nelissen [Thu, 16 Mar 2017 17:04:38 +0000 (10:04 -0700)]
Remove old software avc encoder
It hasn't been used since Lollipop
Test: build
Change-Id: I7652973b50426b3bcf8c10dcc77deb97366b003c
TreeHugger Robot [Fri, 17 Mar 2017 02:55:27 +0000 (02:55 +0000)]
Merge "MediaCas: add two sets of test plugins"
Chong Zhang [Tue, 3 Jan 2017 19:36:07 +0000 (11:36 -0800)]
MediaCas: add two sets of test plugins
- MockCasPlugin: does nothing other than API logging
- ClearKeyCasPlugin: implement a clear key CAS that carries content
keys in the clear in ECMs. It initializes from a test asset string
with a valid id. It outputs to clear buffers.
bug:
22804304
Change-Id: Ifc70b86c1ec80a45b75c7bdd1e558a59018ace5a
TreeHugger Robot [Fri, 17 Mar 2017 00:32:48 +0000 (00:32 +0000)]
Merge "Camera: Send shutter and result once per batch"
Mikhail Naganov [Thu, 16 Mar 2017 23:57:13 +0000 (23:57 +0000)]
Merge "audiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX"
Marco Nelissen [Thu, 16 Mar 2017 23:36:47 +0000 (23:36 +0000)]
Merge "Remove old software avc encoder"
Glenn Kasten [Thu, 16 Mar 2017 23:01:31 +0000 (23:01 +0000)]
Merge "Use static_assert instead of COMPILE_TIME_ASSERT_FUNCTION_SCOPE"
Marco Nelissen [Thu, 16 Mar 2017 17:04:38 +0000 (10:04 -0700)]
Remove old software avc encoder
It hasn't been used since Lollipop
Test: build
Change-Id: I7652973b50426b3bcf8c10dcc77deb97366b003c
Jeff Tinker [Thu, 16 Mar 2017 06:56:09 +0000 (06:56 +0000)]
Merge "Fix CTS post submit failures"
Jeff Tinker [Wed, 15 Mar 2017 18:17:00 +0000 (11:17 -0700)]
Fix CTS post submit failures
MediaCodecTest.android.media.cts.MediaCodecTest.testCryptoError
was failing due to incorrect error code translation introduced
by the drm hidl hal.
bug:
35137940
Change-Id: Ia5e16809872c19335b4b9c1a8ddd1e625a4781b4
Eric Laurent [Thu, 16 Mar 2017 02:05:50 +0000 (02:05 +0000)]
Merge "audio policy: add rule for ringtone duplication over speaker + SCO" am:
dc671c4e33 am:
42d5e65d2b
am:
6e51336da3
Change-Id: I67dd17852ae81df011eeb232daab5c1f290ab18a
Eric Laurent [Thu, 16 Mar 2017 02:03:18 +0000 (02:03 +0000)]
Merge "audio policy: add rule for ringtone duplication over speaker + SCO" am:
dc671c4e33
am:
42d5e65d2b
Change-Id: I84d1c0db37b1aa026b2473e50301bf26f4ef394d
Eric Laurent [Thu, 16 Mar 2017 02:01:17 +0000 (02:01 +0000)]
Merge "audio policy: add rule for ringtone duplication over speaker + SCO"
am:
dc671c4e33
Change-Id: Ic19309906b00121c4cd02ff8ed620416d5b9678f
Treehugger Robot [Thu, 16 Mar 2017 01:57:08 +0000 (01:57 +0000)]
Merge "audio policy: add rule for ringtone duplication over speaker + SCO"
Eric Laurent [Sat, 28 Jan 2017 01:41:53 +0000 (17:41 -0800)]
audio policy: add rule for ringtone duplication over speaker + SCO
Bug:
19171297
Test: make, testplans/79248
Change-Id: Ic539256e53782806d5dbbca5fb6ebe9f2ca5ec76
Ray Essick [Thu, 16 Mar 2017 01:02:16 +0000 (01:02 +0000)]
Merge "Name changes to Media Metrics Keys"
TreeHugger Robot [Thu, 16 Mar 2017 00:24:19 +0000 (00:24 +0000)]
Merge "ndk: AMediaMuxer_addTrack to translate error only for negative values"
TreeHugger Robot [Thu, 16 Mar 2017 00:16:36 +0000 (00:16 +0000)]
Merge "WebmFrameThread: clear mThread after join."
Wonsik Kim [Wed, 15 Mar 2017 22:15:39 +0000 (15:15 -0700)]
ndk: AMediaMuxer_addTrack to translate error only for negative values
Bug:
36260305
Test: cts-tradefed run cts-dev --module CtsMediaTestCases --test android.media.cts.NativeDecoderTest
Change-Id: Ic2b6ec0b8d8a1a9a100eafd3175bdffd80ab4b8d
Wonsik Kim [Wed, 15 Mar 2017 21:55:00 +0000 (14:55 -0700)]
WebmFrameThread: clear mThread after join.
Bug:
36260305
Test: cts-tradefed run cts-dev --module CtsMediaTestCases --test android.media.cts.NativeDecoderTest
Change-Id: Ifd0ce7d6df71e514b26a4cc2b1c4fe99eacf0f7e
TreeHugger Robot [Wed, 15 Mar 2017 20:55:40 +0000 (20:55 +0000)]
Merge "Move hybrid interface from libbinder to libhidl/transport."
Jeff Tinker [Wed, 15 Mar 2017 20:44:28 +0000 (20:44 +0000)]
Merge "Prevent findSession from creating new sessions"
Jeff Tinker [Wed, 15 Mar 2017 20:36:33 +0000 (20:36 +0000)]
Merge "Fix mediaserver crash due to NULL errorDetailMessage"
Glenn Kasten [Wed, 15 Mar 2017 20:19:19 +0000 (20:19 +0000)]
Merge "ToneGenerator: support output sample rates beyond 65535 Hz"
Glenn Kasten [Wed, 15 Mar 2017 20:08:58 +0000 (20:08 +0000)]
Merge "Fix build warnings and make build warnings be errors"
Hassan Shojania [Wed, 15 Mar 2017 16:45:13 +0000 (16:45 +0000)]
Merge "Modular DRM for MediaPlayer"
Ming Zhou [Wed, 15 Mar 2017 16:33:32 +0000 (16:33 +0000)]
Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function." am:
5052e9cf9f am:
4f6b158fec
am:
8431e9e25f
Change-Id: I25296af562787d5965b53b8350d5b2cb1536ac86
Ming Zhou [Wed, 15 Mar 2017 16:27:59 +0000 (16:27 +0000)]
Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function." am:
5052e9cf9f
am:
4f6b158fec
Change-Id: I0da8d148ca9ae47798f9347ccda1ba3a7cbca435
Ming Zhou [Wed, 15 Mar 2017 16:22:58 +0000 (16:22 +0000)]
Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function."
am:
5052e9cf9f
Change-Id: I4eaf334bd11e1b91d68d40c0958f14364ee9b471
Treehugger Robot [Wed, 15 Mar 2017 16:19:13 +0000 (16:19 +0000)]
Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function."
Ming Zhou [Mon, 19 Jan 2015 09:20:44 +0000 (17:20 +0800)]
parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function.
Change-Id: Iba8e74a0043877a167e4b290b2257fcd990076b8
Signed-off-by: Ming Zhou <b42586@freescale.com>
Reviewed-on: http://androidsource.ap.freescale.net/project/504
Reviewed-by: Jian Li <jian.li@nxp.com>
Robert Shih [Wed, 15 Mar 2017 01:18:47 +0000 (01:18 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8 am:
acc15f5a71 -s ours am:
9fd47e325d am:
11ae272995 am:
e80385d87d am:
81ccc52bb8 am:
6c104f5fa8
am:
275a0c75f8 -s ours
Change-Id: I5574e76d4355d833f9c32da56d6c94adee30827c
Robert Shih [Wed, 15 Mar 2017 01:18:35 +0000 (01:18 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29 am:
5770ac25f3 am:
bde48bfbcc am:
bdd4b82237 am:
b67638b64e -s ours
am:
651177dd00
Change-Id: Ib0758f355d2a3d9e1e6196c573f3f3847c6a7cdd
Robert Shih [Wed, 15 Mar 2017 01:14:20 +0000 (01:14 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8 am:
acc15f5a71 -s ours am:
9fd47e325d am:
11ae272995 am:
e80385d87d am:
81ccc52bb8
am:
6c104f5fa8
Change-Id: I63511d38ac5a54d3f32d0aa26046e238e8eba319
Robert Shih [Wed, 15 Mar 2017 01:14:04 +0000 (01:14 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29 am:
5770ac25f3 am:
bde48bfbcc am:
bdd4b82237
am:
b67638b64e -s ours
Change-Id: I6a9152a4d017cd317c81c19cfe286f644f6d7961
Robert Shih [Wed, 15 Mar 2017 00:50:36 +0000 (00:50 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8 am:
acc15f5a71 -s ours am:
9fd47e325d am:
11ae272995 am:
e80385d87d
am:
81ccc52bb8
Change-Id: I1b5cce748c008be83f239f097acc008202a8f01c
Robert Shih [Wed, 15 Mar 2017 00:45:35 +0000 (00:45 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8 am:
acc15f5a71 -s ours am:
9fd47e325d am:
11ae272995
am:
e80385d87d
Change-Id: Ic75e074b62226e158806050c9f032c4561867983
Robert Shih [Wed, 15 Mar 2017 00:45:34 +0000 (00:45 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29 am:
5770ac25f3 am:
bde48bfbcc
am:
bdd4b82237
Change-Id: Ie30544eaad64d5aa305b0bcd0ff1a14ca6ace841
Robert Shih [Wed, 15 Mar 2017 00:40:34 +0000 (00:40 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29 am:
5770ac25f3
am:
bde48bfbcc
Change-Id: If195d8356235b7aebeb0d4e242cbaf678ded067e
Robert Shih [Wed, 15 Mar 2017 00:40:34 +0000 (00:40 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8 am:
acc15f5a71 -s ours am:
9fd47e325d
am:
11ae272995
Change-Id: Iab5689785f643a7ea53eb279456429f1446a613d
Robert Shih [Wed, 15 Mar 2017 00:36:04 +0000 (00:36 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8 am:
acc15f5a71 -s ours
am:
9fd47e325d
Change-Id: I0329cb6982a4303aecafa69c38e73de1b7148586
Robert Shih [Wed, 15 Mar 2017 00:35:32 +0000 (00:35 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29
am:
5770ac25f3
Change-Id: I531cbbcdba72ef21b5938468bc3aa1eda067d55a
Robert Shih [Wed, 15 Mar 2017 00:30:32 +0000 (00:30 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960
am:
5f6b69ea29
Change-Id: I5b3ebe0b7272970e401b0bedcdcf65f92cf23687
Robert Shih [Wed, 15 Mar 2017 00:30:31 +0000 (00:30 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8
am:
acc15f5a71 -s ours
Change-Id: If271c8cc840e5447f9bfa882cba4ae76801cd17b
Robert Shih [Wed, 15 Mar 2017 00:25:32 +0000 (00:25 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861
am:
b38fd0baf8
Change-Id: I0d43d8afed17f5c64e731080002260ec2f05cfee
Robert Shih [Wed, 15 Mar 2017 00:25:31 +0000 (00:25 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5
am:
ced3c15960
Change-Id: I0e56cd59a6c8818f6fbd1f909c226970cd3b330e
Robert Shih [Wed, 15 Mar 2017 00:21:02 +0000 (00:21 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808
am:
db11181861
Change-Id: I857531fc1e7a6727de639813c63423758eb37017
Robert Shih [Wed, 15 Mar 2017 00:20:32 +0000 (00:20 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64
am:
5b937b03d5
Change-Id: I07fae26ec82b190b82c2949a4fbfc1d4e293fda5
Robert Shih [Wed, 15 Mar 2017 00:15:30 +0000 (00:15 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15
am:
5c1a7d4c64
Change-Id: Id2cc3152facf8147504b34c9ee575acfc3f67668
Robert Shih [Wed, 15 Mar 2017 00:15:30 +0000 (00:15 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours
am:
4066f0e808
Change-Id: Icaa568c50688db3157c524978deda0a52ca87e37
Pawin Vongmasa [Thu, 9 Mar 2017 15:02:01 +0000 (07:02 -0800)]
Move hybrid interface from libbinder to libhidl/transport.
Also, merge android.hardware.media.omx@1.0-impl into libstagefright_omx.
Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Manual use of Camera, Photos, Play Movies and YouTube apps.
Test: Manual use of screen mirroring.
Bug:
33854657
Change-Id: Ie927bcafd86dc7e9509bb8b76bb3b51f9a423cc7
Robert Shih [Wed, 15 Mar 2017 00:10:00 +0000 (00:10 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4
am:
b06f7c6e15
Change-Id: I9b5601e129a7162aa125feef425bdc93de4e4471
Robert Shih [Wed, 15 Mar 2017 00:09:59 +0000 (00:09 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890
am:
27ba2d85d6 -s ours
Change-Id: Ib80a0800bbcbb4033081ff9052681dbaf5406ab8
Robert Shih [Wed, 15 Mar 2017 00:04:31 +0000 (00:04 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec
am:
4eea0b3aa4
Change-Id: I4f3b1e4a100374da2e412082564fc6fb54dc122a
Robert Shih [Wed, 15 Mar 2017 00:04:30 +0000 (00:04 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours
am:
413ad04890
Change-Id: I160f5893987b330ae73e6675ffb2dc2fed2d1304
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c
am:
038fd6e5ec
Change-Id: I475073171089f82eac7816d479f9b720a887a0c9
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours
am:
1e4d8d67bc -s ours
Change-Id: Iab0b678707ea31ad02f0f9be5f02f5638c601826
Robert Shih [Tue, 14 Mar 2017 23:55:10 +0000 (23:55 +0000)]
FLACExtractor: copy protect mWriteBuffer
am:
8ee699977c
Change-Id: Icdfd99c85fb0f76cc607f8bb29430913cf72bad1
Robert Shih [Tue, 14 Mar 2017 23:54:28 +0000 (23:54 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd
am:
aca26c9d45 -s ours
Change-Id: Id436554a36de729ccd7a3220e32e155c423d0531
Robert Shih [Tue, 14 Mar 2017 23:49:57 +0000 (23:49 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0
am:
761abda1bd
Change-Id: I30bf5233b69619d260edb952248865adf5c55c83
Robert Shih [Tue, 14 Mar 2017 23:45:27 +0000 (23:45 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer
am:
13c77f4fe0
Change-Id: Ib7f8b77b3ba27fcd8e61e540eb39259cb287185c
TreeHugger Robot [Tue, 14 Mar 2017 23:29:20 +0000 (23:29 +0000)]
Merge "Check opaque size in CREATE_PLUGIN."
TreeHugger Robot [Tue, 14 Mar 2017 23:10:40 +0000 (23:10 +0000)]
Merge "audiohal: Restart audioserver if HAL services can't be obtained"
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
FLACExtractor: copy protect mWriteBuffer
Bug:
30895578
Bug:
34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
(cherry picked from commit
328cd66cc72ba7bc5452ed5a93f29ddcd73aa9f9)
Edwin Wong [Mon, 13 Mar 2017 23:38:20 +0000 (16:38 -0700)]
Check opaque size in CREATE_PLUGIN.
Check opaque size to be not greater than an abitrary 100K
and verify malloc succeeded.
Test: Play Movies & TV
Test: Netflix
Test: ANDROID_BUILD_TOP= ./android-gts/tools/gts-tradefed run gts
-m GtsMediaTestCases --test
com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P60
Test: Forcing opaque size to exceed limit and malloc to report failure;
both resulted in Netflix reporting an error and failing to play.
This is the expected result.
bug:
30202440
Change-Id: I9fdaf208471f2781ffbd656358b1bf1ef5b28ee8
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Bug:
30895578
Bug:
34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
Mikhail Naganov [Tue, 14 Mar 2017 20:35:37 +0000 (13:35 -0700)]
audiohal: Restart audioserver if HAL services can't be obtained
HAL services are crucial for the audioflinger to work.
If for some reason device or effect factories can't be obtained,
log a error message and crash af. If the problem with obtaining
services is transient, restarting af helps to restore audio.
Bug:
36153684
Change-Id: Iec17a6c6e19650cf1d1de1ec30caf05753b9bce1
Test: reproed the bug, checked that af restarts and finds devices
Eino-Ville Talvala [Tue, 14 Mar 2017 20:17:57 +0000 (20:17 +0000)]
Merge "CameraProviderManager: Handle transaction errors, HAL process death"
Mikhail Naganov [Tue, 14 Mar 2017 16:16:23 +0000 (09:16 -0700)]
audiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX
Makes the constant name consistent with non-Pixel HALs
Also, add missing lines in TypeConverter.
Change-Id: If60c08bc9102e9e4375b057ba2358079c913bda2
Test: make
Hassan Shojania [Tue, 14 Mar 2017 16:24:28 +0000 (09:24 -0700)]
Modular DRM for MediaPlayer
Bug:
34559906
Test: Manual through the test app
Change-Id: Iac811acbd8078c1f7549730f2fdb5ebfa8937c9f
Ray Essick [Mon, 13 Mar 2017 23:51:24 +0000 (23:51 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4 am:
1baad9ad99 am:
2ad7f9b172 am:
457bde5e35 am:
ed1109257a am:
9ab3187ff5 am:
530cf7afef am:
7b0b51c337
am:
c44d9d4896
Change-Id: I997f158d27379de88c32ea01fcb1c024eed8e642
Ray Essick [Mon, 13 Mar 2017 23:51:07 +0000 (23:51 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0 am:
a830539187 am:
e973c65525 am:
ae7fae1810 am:
d4d9c97a9d am:
b532a32912 am:
e4cce73b86 am:
ce559427fd am:
bb8e18154d
am:
44b13b68cf
Change-Id: I8bb138124374252fbd259e6b51234d05acc7a3a7
Jiwen Cai [Mon, 13 Mar 2017 23:50:21 +0000 (23:50 +0000)]
Merge "Refactor AImage/AImageReader"
Ray Essick [Mon, 13 Mar 2017 23:47:22 +0000 (23:47 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4 am:
1baad9ad99 am:
2ad7f9b172 am:
457bde5e35 am:
ed1109257a am:
9ab3187ff5 am:
530cf7afef
am:
7b0b51c337
Change-Id: I7c661b582f8511bc2e978ef6294a472ebee21dbd
Ray Essick [Mon, 13 Mar 2017 23:47:04 +0000 (23:47 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0 am:
a830539187 am:
e973c65525 am:
ae7fae1810 am:
d4d9c97a9d am:
b532a32912 am:
e4cce73b86 am:
ce559427fd
am:
bb8e18154d
Change-Id: I2ccabcce8115b1b9d1ad90ab14fc7eccc2ab0c15
Marco Nelissen [Mon, 13 Mar 2017 23:43:11 +0000 (23:43 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e am:
1db2ee3dbd am:
946a690f5c am:
5fef11c61a am:
3a3cc883c1 am:
d218b51912 am:
9305cf71d1 am:
7422dafea0 am:
731527f43f am:
4e083b91ae
am:
a5091c84c3
Change-Id: I36e38ee2a6b74422bbb28c5368f5518bc69f71df
Marco Nelissen [Mon, 13 Mar 2017 23:42:54 +0000 (23:42 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3 am:
89349b8d29 am:
176e7e8183 am:
0cbbb5c561 am:
2e1457123f am:
bd47b7e23c am:
33745e6537 am:
d79e9c79f7 am:
a83fb59933 am:
16b4299141
am:
12921733fe
Change-Id: I672d4984a25b98f09be2185545b274ae45cbf315
Ray Essick [Mon, 13 Mar 2017 23:42:51 +0000 (23:42 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4 am:
1baad9ad99 am:
2ad7f9b172 am:
457bde5e35 am:
ed1109257a am:
9ab3187ff5
am:
530cf7afef
Change-Id: I3ded31b95bff54d255eed96d7e6e1ccd083468f4
Ray Essick [Mon, 13 Mar 2017 23:42:34 +0000 (23:42 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0 am:
a830539187 am:
e973c65525 am:
ae7fae1810 am:
d4d9c97a9d am:
b532a32912 am:
e4cce73b86
am:
ce559427fd
Change-Id: Ide697c3ae0093839acb6a08e1617eef0f43677fe
Marco Nelissen [Mon, 13 Mar 2017 23:42:34 +0000 (23:42 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2 am:
8f2b91f0a1 am:
6e25e6f7a2 am:
f375fd0f70 am:
5d1ce82bb3 am:
4c5f8398f0 am:
31b147f2f7 am:
b9002a6643 am:
448e61d0d7 am:
b1f14803fe
am:
8368b2be1a
Change-Id: Id3d13a1a7187ceb11640117f98f9f94b8c527452
Marco Nelissen [Mon, 13 Mar 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e am:
1db2ee3dbd am:
946a690f5c am:
5fef11c61a am:
3a3cc883c1 am:
d218b51912 am:
9305cf71d1 am:
7422dafea0 am:
731527f43f
am:
4e083b91ae
Change-Id: I375a88ca9ba2e9ea807c7471b347a68f7631a91a
Marco Nelissen [Mon, 13 Mar 2017 23:38:21 +0000 (23:38 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3 am:
89349b8d29 am:
176e7e8183 am:
0cbbb5c561 am:
2e1457123f am:
bd47b7e23c am:
33745e6537 am:
d79e9c79f7 am:
a83fb59933
am:
16b4299141
Change-Id: I62dc6b12ffe41bb50dee56986c042047935058a9
Ray Essick [Mon, 13 Mar 2017 23:38:19 +0000 (23:38 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4 am:
1baad9ad99 am:
2ad7f9b172 am:
457bde5e35 am:
ed1109257a
am:
9ab3187ff5
Change-Id: Id973b57ec24481f0852bd3b468eb37b1c0c4fa9c
Ray Essick [Mon, 13 Mar 2017 23:38:03 +0000 (23:38 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0 am:
a830539187 am:
e973c65525 am:
ae7fae1810 am:
d4d9c97a9d am:
b532a32912
am:
e4cce73b86
Change-Id: Ic9e5b1baa7344129820e9cdb340ee2998892edf2
Marco Nelissen [Mon, 13 Mar 2017 23:38:03 +0000 (23:38 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2 am:
8f2b91f0a1 am:
6e25e6f7a2 am:
f375fd0f70 am:
5d1ce82bb3 am:
4c5f8398f0 am:
31b147f2f7 am:
b9002a6643 am:
448e61d0d7
am:
b1f14803fe
Change-Id: I68be1067743fa39062940a2346f5d3443edf4315
Marco Nelissen [Mon, 13 Mar 2017 23:33:04 +0000 (23:33 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e am:
1db2ee3dbd am:
946a690f5c am:
5fef11c61a am:
3a3cc883c1 am:
d218b51912 am:
9305cf71d1 am:
7422dafea0
am:
731527f43f
Change-Id: I617276f7d81fc3e6d231522ff064aa96b4d5b4e6
Marco Nelissen [Mon, 13 Mar 2017 23:32:48 +0000 (23:32 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3 am:
89349b8d29 am:
176e7e8183 am:
0cbbb5c561 am:
2e1457123f am:
bd47b7e23c am:
33745e6537 am:
d79e9c79f7
am:
a83fb59933
Change-Id: I3b1bf346e0f662bfc52abe774f0402659a035e75
Ray Essick [Mon, 13 Mar 2017 23:32:45 +0000 (23:32 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4 am:
1baad9ad99 am:
2ad7f9b172 am:
457bde5e35
am:
ed1109257a
Change-Id: I86d9fc749345ede7521eb2d6222e8aec17bcd9da
Marco Nelissen [Mon, 13 Mar 2017 23:32:32 +0000 (23:32 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2 am:
8f2b91f0a1 am:
6e25e6f7a2 am:
f375fd0f70 am:
5d1ce82bb3 am:
4c5f8398f0 am:
31b147f2f7 am:
b9002a6643
am:
448e61d0d7
Change-Id: I58ad7452682461b2685a4194151de145ab3f3adf
Ray Essick [Mon, 13 Mar 2017 23:32:31 +0000 (23:32 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0 am:
a830539187 am:
e973c65525 am:
ae7fae1810 am:
d4d9c97a9d
am:
b532a32912
Change-Id: Ibc2f3193bbec30007428900d55caff74876bb856
Marco Nelissen [Mon, 13 Mar 2017 23:28:33 +0000 (23:28 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e am:
1db2ee3dbd am:
946a690f5c am:
5fef11c61a am:
3a3cc883c1 am:
d218b51912 am:
9305cf71d1
am:
7422dafea0
Change-Id: I9981960bd9ddf47e41825de77bb0e4a7a0c29c37
Ray Essick [Mon, 13 Mar 2017 23:28:20 +0000 (23:28 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4 am:
1baad9ad99 am:
2ad7f9b172
am:
457bde5e35
Change-Id: I404c43a22e26d9e410c507c065acfb855e27944e
OSDN Git Service
