OSDN Git Service

android-x86/frameworks-av.git
7 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 20:45:52 +0000 (20:45 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e
am: 218692ec4f

Change-Id: I5abf7e89e0476f46492ca3166ff2245d70e87068

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

Change-Id: Id86327d63b5b8aa3edc62b7e6c15689b6ef4afa7

7 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

7 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

7 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5
Dongwon Kang [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5
am: 1e3070e56d

Change-Id: Iefa80b90d92ab9f14364eeb77b5cb2608f919496

7 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

7 years agoMerge "Skip track if verification fails" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)]
Merge "Skip track if verification fails" into mnc-dev
am: 6168d8eba5

Change-Id: Ic098164694aaea4a455e95f5fe4e662bfa832ce7

7 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

7 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 agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:45:47 +0000 (22:45 +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 am: 2b1df0008a
am: b38111a0db

Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:43:44 +0000 (22:43 +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
am: 2b1df0008a

Change-Id: I2a8d904849b71156cda43aa7e44c377b34a17f10

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: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
Chong Zhang [Tue, 18 Jul 2017 22:26:47 +0000 (22:26 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a

Change-Id: I5515052572a4c271ebd277b3a4c6380f5327a166

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: fix crash due to bad timestamp index" into mnc-dev
Chong Zhang [Tue, 18 Jul 2017 22:22:12 +0000 (22:22 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
am: 7da8bef65e

Change-Id: I71d87fce28528a608792b2087951d302c8ddfc21

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:30:50 +0000 (19:30 +0000)]
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c
am: 93ae13644b

Change-Id: I16649e1417e36610e0731da5c47c90a9de169d13

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

Change-Id: Icb93a3b48a1674066fbf0b07bf11cda56ab22436

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 [Sat, 15 Jul 2017 00:06:35 +0000 (00:06 +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 am: 3627617c2b
am: 671c88a807

Change-Id: Idf5e9e2fd694682031a3b98e53469a3d617c375d

7 years agoMerge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
Wei Jia [Sat, 15 Jul 2017 00:02:04 +0000 (00:02 +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
am: 3627617c2b

Change-Id: I6f4f806ac57f4bf75bc0963f477372d4afa8bfc3

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 lmp...
Wei Jia [Fri, 14 Jul 2017 23:54:33 +0000 (23:54 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e  -s ours am: 3092ed372c am: 74952e9616  -s ours am: 162672a9f6
am: 9215fa05fe

Change-Id: Ia3dc7340a54e5dc27ce7bf6781052d7cb506d966

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 lmp...
Wei Jia [Fri, 14 Jul 2017 23:50:35 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e  -s ours am: 3092ed372c am: 74952e9616  -s ours
am: 162672a9f6

Change-Id: Ibb5582e0c402221d6af88592ef261aeaafaf5f10

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 mnc...
Wei Jia [Fri, 14 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am: 80059d44c4
am: 72840f2216

Change-Id: I787c9a7bae1a0e5bf635ceb9ab3df59faea78f31

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 mnc-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 mnc-dev
am: 80059d44c4

Change-Id: I1d598f9f0bc506f2ea20b82d070ed69ec35876ee

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:30:04 +0000 (20:30 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808 am: 4324bdc8f7 am: acbb8e7dd1 am: c6358fa910 am: 62948f53a2 am: a9565fba8b
am: be01ebd598

Change-Id: Id3aa2f4891fd79411edb719a6b6abd741d1110bc

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

Change-Id: Ia37bc6340f420113445c58c3d0f92d73e9d29148

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 am: a67eacace7
Venkatarama Avadhani [Wed, 21 Jun 2017 16:41:12 +0000 (16:41 +0000)]
Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3

Change-Id: Id5c3640af7130aeadf6e5f810cdb2f79690a6428

7 years agoChange MPEG2 reinit Error Handling
Venkatarama Avadhani [Wed, 21 Jun 2017 16:38:41 +0000 (16:38 +0000)]
Change MPEG2 reinit Error Handling
am: a67eacace7

Change-Id: I7ba8378fe66c57f595fee2368408cc426d3e5eaf

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:30:15 +0000 (17:30 +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 am: 346941bcde  -s ours
am: af5d0135db  -s ours

Change-Id: I362165b142646d6cf2e8748bcbce5473bb0a40a7

7 years agoTrack: Check buffer size of static tracks am: cf39f0e67a am: 6790e790ef am: 6235afe24...
Andy Hung [Mon, 19 Jun 2017 17:23:43 +0000 (17:23 +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
am: 346941bcde  -s ours

Change-Id: I7e6d7a47ab766367c6ebba0ab30ca7f46e971dbc

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 agoMerge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab am...
Andy Hung [Mon, 19 Jun 2017 17:08:42 +0000 (17:08 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab am: a3416fc6b4 am: 42f2fab126 am: 483cf88382
am: f89b2427ad

Change-Id: I6d32c77c6e4cdd2868c9b58254a36e26fa10695a

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 agoMerge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab am...
Andy Hung [Mon, 19 Jun 2017 17:02:11 +0000 (17:02 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab am: a3416fc6b4 am: 42f2fab126
am: 483cf88382

Change-Id: I745c19ce57ca9055b5cb11a9ac5072b0b8954cd6

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 05:00:38 +0000 (05:00 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09
am: 040485c1bc

Change-Id: I0feb497a42b3e2d10a1f226da308c29b0da46c81

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

Change-Id: Ifebdfcfd50c5167bbce4f4680d426ba69b0cbc6a

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 am: 74a2af11b9
Venkatarama Avadhani [Sat, 17 Jun 2017 02:27:27 +0000 (02:27 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am: 74a2af11b9
am: 0817640c9f

Change-Id: If72152b0e19ab8942d56d99819f5670950770a91

7 years agoMerge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev
Venkatarama Avadhani [Sat, 17 Jun 2017 02:25:11 +0000 (02:25 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev
am: 74a2af11b9

Change-Id: Ia57de4d0172426c590f562d57fbba5fff7ec55bf

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:07:09 +0000 (00:07 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am: 1159ffd5e3 am: f242b890c4 am: 24ef54ecb8 am: a35816475b am: 1ce123cf91 am: d06e47540d am: 103b751e55
am: 0851e2f4c6

Change-Id: I8401f004580f03d23a7423468f6966aba768e783

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

Change-Id: I3d03741eca351ad131d5bae700a5024fda36e1be

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