OSDN Git Service

android-x86/frameworks-av.git
6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7...
Lajos Molnar [Fri, 11 Aug 2017 21:06:20 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb

Change-Id: I3ca735e893a638f412656f64bb3e857b6c863790

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7...
Lajos Molnar [Fri, 11 Aug 2017 21:06:14 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46

Change-Id: Iddb5c897937a3acd8ee404a0d1f71ec5da22738e

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
Lajos Molnar [Fri, 11 Aug 2017 21:06:09 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7

Change-Id: I5cd909195abd8ba442120aee597774f96c9db32d

6 years agostagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Tue, 27 Jun 2017 20:58:07 +0000 (13:58 -0700)]
stagefright: avoid buffer overflow in base64 decoder

Bug: 62673128
Change-Id: Id5f04b772aaca3184879bd5bca453ad9e82c7f94

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303
am: 6d050827c3  -s ours

Change-Id: I192b34239fc52c5532a0ea4ce71fc110639d462f

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e
am: ff9e1b0303

Change-Id: I57d1b50eea3a31fae57bd20f856a0ebc53e73357

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d
am: 222dca470e

Change-Id: Icd722065f9256e7afec3e3d7f53c2aa5340856d8

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199
Marco Nelissen [Fri, 4 Aug 2017 22:45:10 +0000 (22:45 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199
am: 87f1a3041d

Change-Id: I8fc2acbf9bbddbc4a401f51595752351c06acc79

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef
Marco Nelissen [Fri, 4 Aug 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef
am: f233415199

Change-Id: I93a9b7b1f48953ec52d6c0f23e3141ddf6dc30f3

6 years agoMerge "Skip track if verification fails" into klp-dev
Marco Nelissen [Fri, 4 Aug 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Skip track if verification fails" into klp-dev
am: ab2c5046ef

Change-Id: Ica76922fc399fe0e5b6af23d613a2f6e5bc7820b

6 years agoMerge "Skip track if verification fails" into klp-dev
TreeHugger Robot [Fri, 4 Aug 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Skip track if verification fails" into klp-dev

6 years agoSkip track if verification fails
Marco Nelissen [Tue, 18 Jul 2017 21:57:11 +0000 (14:57 -0700)]
Skip track if verification fails

Bug: 62187433
Test: ran poc, CTS
Merged-In: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
Change-Id: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev
TreeHugger Robot [Thu, 3 Aug 2017 20:44:43 +0000 (20:44 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d
Wei Jia [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d
am: bbc5c8fc60

Change-Id: I0844a8bac332664d4d8e668257c470b0a89addfe

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376
Wei Jia [Thu, 3 Aug 2017 20:27:48 +0000 (20:27 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376
am: 96114e7c5d

Change-Id: I8616480a004aa44e947939db7e5b8cce1b7ec72a

6 years agoMPEG4Source: fix fragmented read.
Wei Jia [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
MPEG4Source: fix fragmented read.
am: 6b401a3376

Change-Id: I14b767357500d6680379c34ad74efdab1d7bb6ee

6 years agoMerge "Skip track if verification fails" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 19:58:37 +0000 (19:58 +0000)]
Merge "Skip track if verification fails" into mnc-dev

6 years agoMPEG4Source: fix fragmented read.
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.

Test: passed CTS test DecoderTest#testDecodeFragmented
Bug: 64314728
Bug: 36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit ba9af7792dfed6e9b1b216aab91a97e713eec891)

7 years agoFix memory leak in OggExtractor
Dongwon Kang [Thu, 20 Jul 2017 21:40:25 +0000 (14:40 -0700)]
Fix memory leak in OggExtractor

Test: added a temporal log and run poc
Bug: 63581671
Change-Id: I436a08e54d5e831f9fbdb33c26d15397ce1fbeba

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:41:13 +0000 (22:41 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820
am: 8d579abf97

Change-Id: I91ae5b377da3c8b253ef481ec66646dfcc7fa590

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:39:13 +0000 (22:39 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18
am: b226bba820

Change-Id: Iab6732cf5c86c6dec646df209e0f18b6c355780e

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:37:45 +0000 (22:37 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d
am: aafbda5a18

Change-Id: I22778c380e1aa3d268e8e32ff7eb2a458f46e7ef

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88
am: 5f3ac3898d

Change-Id: I22e4c53577164df13e5590d78dbd6796c1db06fe

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:26:46 +0000 (22:26 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88

Change-Id: I87cf81565eefd8ed299014e7aa1e10a00daefc31

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
Chong Zhang [Tue, 18 Jul 2017 22:20:12 +0000 (22:20 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
am: d371d08bcc

Change-Id: I6b7dcadbed62315968055d98dd2ffba3228016f9

7 years agoMerge "stagefright: fix crash due to bad timestamp index" into mnc-dev
Chong Zhang [Tue, 18 Jul 2017 22:16:14 +0000 (22:16 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
Chong Zhang [Tue, 18 Jul 2017 22:14:50 +0000 (22:14 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev

7 years agoSkip track if verification fails
Marco Nelissen [Tue, 18 Jul 2017 21:57:11 +0000 (14:57 -0700)]
Skip track if verification fails

Bug: 62187433
Test: ran poc, CTS
Change-Id: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c

7 years agoMediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6...
Wei Jia [Tue, 18 Jul 2017 19:25:49 +0000 (19:25 +0000)]
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8
am: e0f4963584

Change-Id: I318dd6a90b2af9c4e879e4ab47cfad110002532d

7 years agoMediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6...
Wei Jia [Tue, 18 Jul 2017 19:22:49 +0000 (19:22 +0000)]
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70
am: 0844e1a3e8

Change-Id: Ia6f8979298fdb783f4697734fd93fa4663d3da9b

7 years agoMediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6...
Wei Jia [Tue, 18 Jul 2017 19:20:19 +0000 (19:20 +0000)]
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f
am: 263d5a2a70

Change-Id: I24e4ade61cbc0a03d20aa4b79b21fe18baa10e43

7 years agoMediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6
Wei Jia [Tue, 18 Jul 2017 19:12:37 +0000 (19:12 +0000)]
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6
am: 03fa67202f

Change-Id: I9336683351fa531560fadbe554eb218fc663585f

7 years agoMediaPlayerService: fix access of mPlayer in client am: 502c2f4053
Wei Jia [Tue, 18 Jul 2017 19:05:35 +0000 (19:05 +0000)]
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6

Change-Id: If691af6c8d3c3849da52da943fd754ed9bd1fe0b

7 years agoMediaPlayerService: fix access of mPlayer in client
Wei Jia [Tue, 18 Jul 2017 19:01:03 +0000 (19:01 +0000)]
MediaPlayerService: fix access of mPlayer in client
am: 502c2f4053

Change-Id: Ib8920a866131f8db7bc0dce0472c257121297de6

7 years agoMediaPlayerService: fix access of mPlayer in client
Wei Jia [Fri, 14 Jul 2017 00:47:56 +0000 (17:47 -0700)]
MediaPlayerService: fix access of mPlayer in client

Test: poc doesn't crash
Bug: 38234812
Change-Id: I6f9be046ff66d2d5bed27bd712287e4ead550830

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983  -s ours am: 8700c26a91  -s ours am: b063a7ea18
am: 92fce7ece7  -s ours

Change-Id: I229ef1d97dc56703a19530f0202fe2f2e0f6ad74

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
Wei Jia [Fri, 14 Jul 2017 23:54:32 +0000 (23:54 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983  -s ours am: 8700c26a91  -s ours
am: b063a7ea18

Change-Id: I5075e05fa2c98f98197be580fc3640c884b9ba23

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
Wei Jia [Fri, 14 Jul 2017 23:50:31 +0000 (23:50 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983  -s ours
am: 8700c26a91  -s ours

Change-Id: I08991c3961f9a820050d697a78a65ca70e728458

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
Wei Jia [Fri, 14 Jul 2017 23:42:36 +0000 (23:42 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee
am: 5445ddc983  -s ours

Change-Id: I556cccb83776d729f76b392192207637357f2292

7 years agoMerge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp...
Wei Jia [Fri, 14 Jul 2017 23:42:34 +0000 (23:42 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e  -s ours am: 3092ed372c
am: 74952e9616  -s ours

Change-Id: I7fb63cc1f5e74e9c909cf493960c7191af11ea93

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
Wei Jia [Fri, 14 Jul 2017 23:38:32 +0000 (23:38 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f
am: b8dfff52ee

Change-Id: I3a6b2ea30ba7b97b92eea98d80dd05db42e0dc11

7 years agoMerge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp...
Wei Jia [Fri, 14 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e  -s ours
am: 3092ed372c

Change-Id: I5f2b961f635981103348353c76ce8c58d3badfd2

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev
Wei Jia [Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev
am: da84963c1f

Change-Id: I979beafef27724be51e567fabc64b2b49ebb1a3b

7 years agoMerge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
Wei Jia [Fri, 14 Jul 2017 23:34:31 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
am: 61df326a5e  -s ours

Change-Id: I0bf4804b128f23a8e8dbf2ed291d18a63468b488

7 years agoMerge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev
Wei Jia [Fri, 14 Jul 2017 23:26:43 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev

7 years agoMerge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
Wei Jia [Fri, 14 Jul 2017 23:26:09 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev
Wei Jia [Fri, 14 Jul 2017 23:25:32 +0000 (23:25 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev

7 years agostagefright: fix crash due to bad timestamp index
Chong Zhang [Mon, 10 Jul 2017 19:11:41 +0000 (12:11 -0700)]
stagefright: fix crash due to bad timestamp index

bug: 62872863
Change-Id: I7f8ae62173d8b4bef0d6c35166427871408ad9dd

7 years agoMerge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f...
Eric Laurent [Mon, 10 Jul 2017 20:22:05 +0000 (20:22 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808 am: 4324bdc8f7 am: acbb8e7dd1 am: c6358fa910
am: 62948f53a2

Change-Id: Ia99ed9e04cf2d90ee3f201efd9f238fb06e3be88

7 years agoMerge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f...
Eric Laurent [Mon, 10 Jul 2017 20:17:34 +0000 (20:17 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808 am: 4324bdc8f7 am: acbb8e7dd1
am: c6358fa910

Change-Id: Ic8ebb5b01026b6762afb1ea7f2bc26f51f5d189e

7 years agoMerge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f...
Eric Laurent [Mon, 10 Jul 2017 20:13:34 +0000 (20:13 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808 am: 4324bdc8f7
am: acbb8e7dd1

Change-Id: Ie2cd641decc7e654f021df75fd4f600f7255eea2

7 years agoMerge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f...
Eric Laurent [Mon, 10 Jul 2017 20:09:02 +0000 (20:09 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808
am: 4324bdc8f7

Change-Id: I161bc14d3059af24463cfa4f473305b516a3bcd8

7 years agoMerge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f
Eric Laurent [Mon, 10 Jul 2017 20:04:31 +0000 (20:04 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f
am: dc2efe3808

Change-Id: I7a613ea97315971ce0abfc34ce5f1fc4034d5ad8

7 years agoMerge "audio effects: filter reserved effect commands" into klp-dev
Eric Laurent [Mon, 10 Jul 2017 20:00:32 +0000 (20:00 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev
am: f57dc8b72f

Change-Id: Ia41a68044abc25ac120ad63a27281345dd959fb7

7 years agoMerge "audio effects: filter reserved effect commands" into klp-dev
TreeHugger Robot [Mon, 10 Jul 2017 19:52:17 +0000 (19:52 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev

7 years agostagefright: check aac_frame_length to prevent infinite loop
Chong Zhang [Sat, 8 Jul 2017 01:25:16 +0000 (18:25 -0700)]
stagefright: check aac_frame_length to prevent infinite loop

bug: 62673179
Change-Id: I5da44822ad2ff59d396d1df42f34cd0a5620e134

7 years agoDO NOT MERGE : MPEG4Extractor: ensure returned status is checked.
Wei Jia [Wed, 15 Feb 2017 01:07:24 +0000 (17:07 -0800)]
DO NOT MERGE : MPEG4Extractor: ensure returned status is checked.

Also fix handling of zero atom size in MPEG4Source::parseChunk.
IDataSource: ensure readAt returns correct status.
Test: manually test with mediaplayer.
Bug: 34718515
Change-Id: I1219ec579aa0876dc1230e36af46b158b84c6d77

(cherry picked from commit ff1fb4d5cdd3b2b28c69edd8cd3021e335ca381a)

7 years agoDO NOT MERGE: MPEG4Extractor: ensure returned status is checked.
Wei Jia [Wed, 15 Feb 2017 01:07:24 +0000 (17:07 -0800)]
DO NOT MERGE: MPEG4Extractor: ensure returned status is checked.

Also fix handling of zero atom size in MPEG4Source::parseChunk.
IDataSource: ensure readAt returns correct status.
Test: manually test with mediaplayer.
Bug: 34718515
Change-Id: I1219ec579aa0876dc1230e36af46b158b84c6d77

(cherry picked from commit ff1fb4d5cdd3b2b28c69edd8cd3021e335ca381a)

7 years agoDO NOT MERGE: MPEG4Extractor: ensure returned status is checked.
Wei Jia [Wed, 15 Feb 2017 01:07:24 +0000 (17:07 -0800)]
DO NOT MERGE: MPEG4Extractor: ensure returned status is checked.

Also fix handling of zero atom size in MPEG4Source::parseChunk.
IDataSource: ensure readAt returns correct status.
Test: manually test with mediaplayer.
Bug: 34718515
Change-Id: I1219ec579aa0876dc1230e36af46b158b84c6d77

(cherry picked from commit ff1fb4d5cdd3b2b28c69edd8cd3021e335ca381a)

7 years agoChange MPEG2 reinit Error Handling
Venkatarama Avadhani [Tue, 30 May 2017 10:31:11 +0000 (16:01 +0530)]
Change MPEG2 reinit Error Handling

Changing reinit handling to not notify error in case init fails.

Bug: 37237396
Test: ran poc before/after on nyc-mr2
Change-Id: I694a9d2ccee7622d9c736efac12c9ec8639911f4

7 years agoTrack: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef am: 6235afe24...
Andy Hung [Mon, 19 Jun 2017 17:18:47 +0000 (17:18 +0000)]
Track: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef am: 6235afe24e  -s ours am: abbc9ab006  -s ours am: 81c98dbb7e  -s ours
am: 3ab2ec59a1  -s ours

Change-Id: I005f78d30df5134d2d54b36a17ad768278a2c2b7

7 years agoTrack: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef am: 6235afe24...
Andy Hung [Mon, 19 Jun 2017 17:12:43 +0000 (17:12 +0000)]
Track: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef am: 6235afe24e  -s ours am: abbc9ab006  -s ours
am: 81c98dbb7e  -s ours

Change-Id: Ibb879c898fd820e2be6fcba55b0246a0645e62bf

7 years agoTrack: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef am: 6235afe24...
Andy Hung [Mon, 19 Jun 2017 17:08:43 +0000 (17:08 +0000)]
Track: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef am: 6235afe24e  -s ours
am: abbc9ab006  -s ours

Change-Id: I9a4455d512225d9e0c2f1588ed4e8c593e66df9c

7 years agoTrack: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef
Andy Hung [Mon, 19 Jun 2017 17:02:13 +0000 (17:02 +0000)]
Track: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef
am: 6235afe24e  -s ours

Change-Id: I950a142a05c0ff60026502078b95ca27b66f1fdd

7 years agoTrack: Check buffer size of static tracks am: cf39f0e67a
Andy Hung [Mon, 19 Jun 2017 16:56:43 +0000 (16:56 +0000)]
Track: Check buffer size of static tracks am: cf39f0e67a
am: 6790e790ef

Change-Id: I2cb0ce9e086e15b037f6de6086072d107fbaf571

7 years agoMerge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab am...
Andy Hung [Mon, 19 Jun 2017 16:56:42 +0000 (16:56 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab am: a3416fc6b4
am: 42f2fab126

Change-Id: Ifb95a65ef32c643b94554c3904b84678d5459625

7 years agoTrack: Check buffer size of static tracks
Andy Hung [Mon, 19 Jun 2017 16:50:40 +0000 (16:50 +0000)]
Track: Check buffer size of static tracks
am: cf39f0e67a

Change-Id: Iad9a3f69fa97d8da9db8f1fed864a2e15d5bbb2a

7 years agoMerge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab
Andy Hung [Mon, 19 Jun 2017 16:50:39 +0000 (16:50 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab
am: a3416fc6b4

Change-Id: Ib81560c9faa863c02cad8c5e2979a9d9551021ea

7 years agoMerge "Track: Check buffer size of static tracks" into lmp-dev
Andy Hung [Mon, 19 Jun 2017 16:45:42 +0000 (16:45 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev
am: 782a30d2ab

Change-Id: Ie27330ced83beccaed5a5a3d69ec6833be7e36e1

7 years agoMerge "Track: Check buffer size of static tracks" into lmp-dev
Andy Hung [Mon, 19 Jun 2017 16:35:00 +0000 (16:35 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev

7 years agoaudio effects: filter reserved effect commands
Eric Laurent [Fri, 16 Jun 2017 01:43:46 +0000 (18:43 -0700)]
audio effects: filter reserved effect commands

Block effect commands reserved for framework use when
received on server side IAudioEffect. Applications have no reason
to use these commands and they present a unnecessary attack surface.

Bug: 62019992
Test: run CTS tests for audio effects
Change-Id: Ie680d5d5650f99dbabf93891703e1cde2c2e852d

7 years agoMerge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace1...
Dongwon Kang [Sat, 17 Jun 2017 04:55:09 +0000 (04:55 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06
am: 18a671762d

Change-Id: I38d2d1c89bb6662745a77e5f4fc3ed6b81d40331

7 years agoMerge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873
Dongwon Kang [Sat, 17 Jun 2017 04:52:07 +0000 (04:52 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873
am: 2ace148c06

Change-Id: I461627340f5204d2574dc90c89461373b0c42407

7 years agoMerge "MPEG4Extractor: check size for yrrc box" into lmp-dev
Dongwon Kang [Sat, 17 Jun 2017 04:49:37 +0000 (04:49 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev
am: d971d18873

Change-Id: I8613293a4bbea17818f873274b80c318a8f3d5b8

7 years agoMerge "MPEG4Extractor: check size for yrrc box" into lmp-dev
TreeHugger Robot [Sat, 17 Jun 2017 04:46:30 +0000 (04:46 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev

7 years agoMerge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev
TreeHugger Robot [Sat, 17 Jun 2017 02:19:39 +0000 (02:19 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev

7 years agoAudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b89...
Andy Hung [Sat, 17 Jun 2017 00:02:09 +0000 (00:02 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b890c4 am: 24ef54ecb8 am: a35816475b am: 1ce123cf91
am: d06e47540d

Change-Id: I22405b81c7351961f8aca57289a15cc99e67525a

7 years agoAudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b89...
Andy Hung [Sat, 17 Jun 2017 00:00:08 +0000 (00:00 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b890c4 am: 24ef54ecb8 am: a35816475b
am: 1ce123cf91

Change-Id: I414a644145a6da9c9fe4e073d97aa07dd0272267

7 years agoAudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b89...
Andy Hung [Fri, 16 Jun 2017 23:58:10 +0000 (23:58 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b890c4 am: 24ef54ecb8
am: a35816475b

Change-Id: I77aa056b71679b0d0d6703a59f46c788e77d5351

7 years agoAudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b890c4
Andy Hung [Fri, 16 Jun 2017 23:54:39 +0000 (23:54 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b890c4
am: 24ef54ecb8

Change-Id: I0b413afa5c0e41fadcd0320f7481172cc2398018

7 years agoAudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3
Andy Hung [Fri, 16 Jun 2017 23:51:37 +0000 (23:51 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3
am: f242b890c4

Change-Id: I5bd38c33b13de93e641e50c39cdfe37dbae59923

7 years agoAudioFlinger: Fix memory allocation for client-less tracks
Andy Hung [Fri, 16 Jun 2017 23:49:37 +0000 (23:49 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks
am: 1159ffd5e3

Change-Id: Id200ee51632763d8fc5d2facace4a3b7dfbeadf0

7 years agoNotify Errors Appropriately from SoftMPEG2
Venkatarama Avadhani [Wed, 31 May 2017 05:07:57 +0000 (10:37 +0530)]
Notify Errors Appropriately from SoftMPEG2

This is to ensure that the framework realises that an error has
occured and does not call onQueueFilled if the error is fatal.

Bug: 36715268
Merged-In: If02499d306aa9b6df64a7f25d43d1bdf318a10cd
Change-Id: I6911d2e8899cc3a472b5ba5ecdcfbd92233ecfa6

7 years agoTrack: Check buffer size of static tracks
Andy Hung [Tue, 13 Jun 2017 00:22:46 +0000 (17:22 -0700)]
Track: Check buffer size of static tracks

Merged-In: Ia7edd9a802905214a27961dbcec6352f6ef98f73
Merged-In: I633caf563d3607dbe4b9be10be1687efce33469c
Test: Native POC
Bug: 38340117
Change-Id: I633caf563d3607dbe4b9be10be1687efce33469c

7 years agoTrack: Check buffer size of static tracks
Andy Hung [Tue, 13 Jun 2017 00:22:46 +0000 (17:22 -0700)]
Track: Check buffer size of static tracks

Merged-In: Ia7edd9a802905214a27961dbcec6352f6ef98f73
Test: Native POC
Bug: 38340117
Change-Id: I633caf563d3607dbe4b9be10be1687efce33469c

7 years agoAudioFlinger: Fix memory allocation for client-less tracks
Andy Hung [Tue, 14 Feb 2017 02:50:48 +0000 (18:50 -0800)]
AudioFlinger: Fix memory allocation for client-less tracks

Test: Ringtone with BT
Bug: 35350587
Bug: 38340117
Change-Id: If247d319d58f8f4d18b49f58ec950491871ebb2d
(cherry picked from commit afb31487f3156a7284d2f0d06646c7bc00d99537)

7 years agoMPEG4Extractor: check size for yrrc box
Dongwon Kang [Mon, 12 Jun 2017 19:58:58 +0000 (12:58 -0700)]
MPEG4Extractor: check size for yrrc box

Test: stagefright -s poc_file
Bug: 62133227
Change-Id: Iafefac39764ce01b4dde414b9f152c9ea71810e9

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Wed, 7 Jun 2017 18:01:33 +0000 (18:01 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am: 8818bf1fbb  -s ours am: b91cfc3589
am: ed429f11e0  -s ours

Change-Id: Iae4fac75f4798261dcd1d6e5f1fabe223a38efc1

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Wed, 7 Jun 2017 17:57:32 +0000 (17:57 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am: 8818bf1fbb  -s ours
am: b91cfc3589

Change-Id: I3c1f4067a7c0d505790fe0232a362bd8220762af

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Wed, 7 Jun 2017 17:54:02 +0000 (17:54 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
am: 8818bf1fbb  -s ours

Change-Id: If42ca4975b0069a972e980524cbe2e7c9f0bad6f

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Fri, 8 Jan 2016 00:03:03 +0000 (16:03 -0800)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.

Bug: 38391487
Bug: 24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit 56097a8ecc31ec308a1caa38f92b69f99324eada)

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:38:44 +0000 (13:38 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c am: a7e658fcca
am: 6d2092f734

Change-Id: Ic8ace5d6ed81df5d8298d9031e635501ecf2b590

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:35:43 +0000 (13:35 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c
am: a7e658fcca

Change-Id: I4070499668b42017c46e2556246fc973f7e638a4

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:32:43 +0000 (13:32 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69
am: 1f7d80772c

Change-Id: I7a978b70b1330b619ac0ed46f3c191912ce0ffd1

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:30:13 +0000 (13:30 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121
am: 966e572c69

Change-Id: Ida849f8cad82a997a108ad472b150c7be29baf42

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:27:12 +0000 (13:27 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0
am: 0ef6d9c121

Change-Id: I420ab9888c2b542ca66fbb65fd2bf7ea7ff3bb16

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
Ricardo Garcia [Wed, 7 Jun 2017 13:24:12 +0000 (13:24 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
am: ef3a4aead0

Change-Id: I31e26961aaf4ca49c8c4bfa3c4dccd03bab63286

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
Ricardo Garcia [Wed, 7 Jun 2017 13:19:48 +0000 (13:19 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am...
Pawin Vongmasa [Wed, 7 Jun 2017 05:09:08 +0000 (05:09 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7 am: 8cb7994cbf am: fa0b15cf8f
am: d158da44d5  -s ours

Change-Id: Id6a31d4db40a4ce7a51a0b3832b821406f112d02

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am...
Pawin Vongmasa [Wed, 7 Jun 2017 05:06:39 +0000 (05:06 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7 am: 8cb7994cbf
am: fa0b15cf8f

Change-Id: I13e12ece1adb4babeea580a53a094a305e3819f3