OSDN Git Service
Mikhail Naganov [Mon, 14 Aug 2017 19:37:51 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556 am:
e52a6ab853 am:
c6905d1c9c am:
fe49081e58 am:
716c720b91
Change-Id: Ifa87b4d3d4e53a60c3fe949f960800bda9e9366d
Mikhail Naganov [Mon, 14 Aug 2017 19:37:45 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556 am:
e52a6ab853 am:
c6905d1c9c am:
fe49081e58
Change-Id: I82385f42511cdd6c7b4408ede3fbd3dd21273f83
Mikhail Naganov [Mon, 14 Aug 2017 19:37:39 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556 am:
e52a6ab853 am:
c6905d1c9c
Change-Id: I88ef8effb22c7e01ae8d2668e3c832fe0febc90c
Mikhail Naganov [Mon, 14 Aug 2017 19:37:35 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556 am:
e52a6ab853
Change-Id: I62cb512c152a15b8ea82da277f0e4e93acc66a8a
Mikhail Naganov [Mon, 14 Aug 2017 19:37:30 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556
Change-Id: I4f5a7068fb53ffacecbd5707771d57488ea307cf
Mikhail Naganov [Mon, 14 Aug 2017 19:37:24 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36
Change-Id: Ib9efffefd4952e675a13f51951a4d02f00c6abe6
Mikhail Naganov [Mon, 14 Aug 2017 19:37:19 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1
Change-Id: Ia0244b37df369a27b4bad024eef06cc56b5e64a2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:13 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104
Change-Id: I9127fb8696af5ef68ca122545ef6da09bba360c2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:08 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e
Change-Id: I13d92901d6f54840bb2ff8a9802cdf94b690b8e2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:03 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe
Change-Id: Iaaaead614bb1a1dbc62f0443e7e3e0d7d4fb9012
Mikhail Naganov [Mon, 14 Aug 2017 19:36:57 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9
Change-Id: I8dfe1cdebec08b9ad5d3c7b19b8891158ac51132
Mikhail Naganov [Mon, 14 Aug 2017 19:36:51 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd
Change-Id: Ie44dd9c0d77ebcbc1b33603f06bb3fd3d86c6174
Mikhail Naganov [Tue, 25 Jul 2017 00:25:47 +0000 (17:25 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb
Bug:
63662938
Bug:
63526567
Test: Added CTS tests
Change-Id: I8ed398cd62a9f461b0590e37f593daa3d8e4dbc4
Marco Nelissen [Fri, 4 Aug 2017 23:40:18 +0000 (23:40 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours am:
0a78268055 -s ours am:
8d68455f69 -s ours am:
369ad623bc -s ours am:
920df6ca00 -s ours
am:
e21ab964c1 -s ours
Change-Id: I00ac4a069a160f16600d081e2be3e97f7513a92f
Marco Nelissen [Fri, 4 Aug 2017 23:34:15 +0000 (23:34 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours am:
0a78268055 -s ours am:
8d68455f69 -s ours am:
369ad623bc -s ours
am:
920df6ca00 -s ours
Change-Id: Ic6d99e347dc5e7230827b9aa0a360e23c17ab881
Marco Nelissen [Fri, 4 Aug 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours am:
0a78268055 -s ours am:
8d68455f69 -s ours
am:
369ad623bc -s ours
Change-Id: If89325cfb1e4ab00a3c87901d1d6c44d0e6c321c
Marco Nelissen [Fri, 4 Aug 2017 23:21:45 +0000 (23:21 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours am:
0a78268055 -s ours
am:
8d68455f69 -s ours
Change-Id: I0d67f4871aea0df136ef7e26bfb7e7b9d0eadfc1
Marco Nelissen [Fri, 4 Aug 2017 23:15:46 +0000 (23:15 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours
am:
0a78268055 -s ours
Change-Id: Ifedba1a55e58651c9f4f93864ad52b8bf1f78461
Marco Nelissen [Fri, 4 Aug 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours
am:
84b2e0717c -s ours
Change-Id: Ib5f483ddb67d18c95c720088f9b0ed1c64b65979
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
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
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
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
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
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
TreeHugger Robot [Fri, 4 Aug 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Skip track if verification fails" into klp-dev
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
Dongwon Kang [Thu, 3 Aug 2017 21:19:24 +0000 (21:19 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28 am:
7e9fe019ff
am:
58db80184a
Change-Id: Ib156d3acbe9ebdd1407ad5896b3ece25f6c9a9ea
Dongwon Kang [Thu, 3 Aug 2017 21:14:54 +0000 (21:14 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28
am:
7e9fe019ff
Change-Id: I89c184722d4c937b0ea99204fe11bcd5a1f170af
Dongwon Kang [Thu, 3 Aug 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c
am:
8dd4d58d28
Change-Id: Ie7d200d4c74a91ce8f4a7c8d4e91ff71d0d1d12e
Wei Jia [Thu, 3 Aug 2017 21:08:24 +0000 (21:08 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c am:
2df7cd6571
am:
64e7c6089f
Change-Id: I08e269ad2cc21c8411d79b8ca4901aa1c9cce580
Wei Jia [Thu, 3 Aug 2017 21:03:22 +0000 (21:03 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c
am:
2df7cd6571
Change-Id: Idf2a4fa0b847e8ef6fefdb55fc4fc11d5fcde342
Dongwon Kang [Thu, 3 Aug 2017 21:03:21 +0000 (21:03 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70
am:
20ff47b39c
Change-Id: I75981256fe8a29ff53e6018064d705ec6d1be71e
Wei Jia [Thu, 3 Aug 2017 20:57:24 +0000 (20:57 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95
am:
b31373e62c
Change-Id: I4266df6693d6f6e261e5959f8006f658be57d656
Dongwon Kang [Thu, 3 Aug 2017 20:57:21 +0000 (20:57 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56
am:
73c41f9d70
Change-Id: I12556bc1f16c13abfe7018a9c21258c73e46c7a0
Dongwon Kang [Thu, 3 Aug 2017 20:51:21 +0000 (20:51 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
am:
a7a43d9b56
Change-Id: If7a317b2a9de1daaafb83aeb466c52ef494b972d
Wei Jia [Thu, 3 Aug 2017 20:51:20 +0000 (20:51 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f
am:
fa7be9da95
Change-Id: Icc90b2c750e5d75697579cb98532d0667280dced
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
Dongwon Kang [Thu, 3 Aug 2017 20:45:51 +0000 (20:45 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e am:
995ffd91a4
am:
464af3dc2e
Change-Id: Ia1cd21978199447253de057599b26c8d187d31cf
TreeHugger Robot [Thu, 3 Aug 2017 20:44:43 +0000 (20:44 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 20:39:51 +0000 (20:39 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e
am:
995ffd91a4
Change-Id: If56ea7ccce2d7689a2dd674f04ab303f4aed2226
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
Dongwon Kang [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9
am:
5b6106b02e
Change-Id: I4dbc87895ab8bb7ac44c8f8a1c82efeee73786d1
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
Dongwon Kang [Thu, 3 Aug 2017 20:27:49 +0000 (20:27 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d
am:
3b8c1df6e9
Change-Id: I73dc7e47baecddf4d9df119b324aad3fe0bbf144
Wei Jia [Thu, 3 Aug 2017 20:27:48 +0000 (20:27 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376
am:
96114e7c5d
Change-Id: I8616480a004aa44e947939db7e5b8cce1b7ec72a
Wei Jia [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
MPEG4Source: fix fragmented read.
am:
6b401a3376
Change-Id: I14b767357500d6680379c34ad74efdab1d7bb6ee
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
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
Dongwon Kang [Thu, 3 Aug 2017 19:58:37 +0000 (19:58 +0000)]
Merge "Skip track if verification fails" into mnc-dev
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)
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
Chong Zhang [Tue, 18 Jul 2017 22:54:44 +0000 (22:54 +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 am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65
am:
0ac0157213
Change-Id: I77a86457602647bd6eeeb16582497df3ab4274aa
Chong Zhang [Tue, 18 Jul 2017 22:52:48 +0000 (22:52 +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 am:
fb7c6d9173 am:
ee1f46846d
am:
8486817a65
Change-Id: I94eb3461b170d5695111ce12208713221e5ebb17
Chong Zhang [Tue, 18 Jul 2017 22:49:46 +0000 (22:49 +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 am:
fb7c6d9173
am:
ee1f46846d
Change-Id: I7c171b235bdb3349b43824616fedde741e626fde
Chong Zhang [Tue, 18 Jul 2017 22:47:44 +0000 (22:47 +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
am:
fb7c6d9173
Change-Id: Ib8172b10fb3e8df9310662555976cc93d90c87a4
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
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
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
Chong Zhang [Tue, 18 Jul 2017 22:41:12 +0000 (22:41 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709
am:
d7c144c545
Change-Id: I123cc98202640afedae7854ef00daa02061f1be0
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
Chong Zhang [Tue, 18 Jul 2017 22:39:12 +0000 (22:39 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19
am:
a29bd6a709
Change-Id: If392d8e94a7973026ae9f26beae944bfe7256c16
Chong Zhang [Tue, 18 Jul 2017 22:37:46 +0000 (22:37 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789
am:
e1e8ea6a19
Change-Id: I10c20451e88d85fd8a9a2ba24456708ca3612f53
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
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
Chong Zhang [Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a
am:
0b542a3789
Change-Id: Ice81acc494ab5405f281f6132c39a7b64fe3e94d
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
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
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
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
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
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
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
Wei Jia [Tue, 18 Jul 2017 19:40:51 +0000 (19:40 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7 am:
d8192c9149
am:
6f7295a384
Change-Id: I7f6837cd4aced5a6d83aaf0279cc3908f80a4027
Wei Jia [Tue, 18 Jul 2017 19:39:21 +0000 (19:39 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7
am:
d8192c9149
Change-Id: I25ed67aa5671f7484dc99d3d79e0ed33125117f6
Wei Jia [Tue, 18 Jul 2017 19:36:19 +0000 (19:36 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44
am:
1a1bb632e7
Change-Id: I7cd886d0bbe96dcf8aafe082649d2a9a7c1c303e
Wei Jia [Tue, 18 Jul 2017 19:33:18 +0000 (19:33 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b
am:
50280c1b44
Change-Id: Ie10440f1e789a5b8853726cd91d7705228c3b19f
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Sat, 15 Jul 2017 00:39:40 +0000 (00:39 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev
Wei Jia [Sat, 15 Jul 2017 00:23:05 +0000 (00:23 +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 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0
am:
bd6594eaf2
Change-Id: I864241ad497a7a59f870103f23e1306fa1dc519d
Wei Jia [Sat, 15 Jul 2017 00:18:37 +0000 (00:18 +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 am:
1feb9dca54 am:
29b801537c -s ours
am:
e68844ffb0
Change-Id: I6546b41a2da12c64db52ed9081ebf20c53eec469
Wei Jia [Sat, 15 Jul 2017 00:14:35 +0000 (00:14 +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 am:
1feb9dca54
am:
29b801537c -s ours
Change-Id: I0b3318fac39fae495963b005d22a3d954798b5f9
Wei Jia [Sat, 15 Jul 2017 00:10:36 +0000 (00:10 +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
am:
1feb9dca54
Change-Id: I1ee61709a12f2045eb946dad3946fa8aafee2caf
Wei Jia [Sat, 15 Jul 2017 00:10:36 +0000 (00:10 +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 am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697
am:
eb81b99c4a
Change-Id: I708670b95e61a05ef2592fd0fef2615e54aebb1d
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
Wei Jia [Sat, 15 Jul 2017 00:06:35 +0000 (00:06 +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 am:
6757de98ca am:
a32f7beef6 -s ours
am:
04e0e9c697
Change-Id: Ib0e54fbe12d38aa3c2517e7dff4863e2fa2cb4cb
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
Wei Jia [Sat, 15 Jul 2017 00:02:02 +0000 (00:02 +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 am:
6757de98ca
am:
a32f7beef6 -s ours
Change-Id: If81402f72f73362e4f642b77a433be09675d2b55
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
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +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
am:
6757de98ca
Change-Id: I0ef1aea5d384a742e4b9acc7c55b60ad1bba1079
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437
am:
d1ce7bb7c8
Change-Id: Ib2d891e80b63e42c76ae037f3d41bc5eb4ab3cb5
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