OSDN Git Service
Marco Nelissen [Mon, 13 Mar 2017 23:09:59 +0000 (23:09 +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
Change-Id: I39d07c6a978c2e0c2b4c6f8bc02135c1acbb3ba5
Marco Nelissen [Mon, 13 Mar 2017 23:09:44 +0000 (23:09 +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
Change-Id: I2dc56447dd0386046bc765110a545b967237e63b
Marco Nelissen [Mon, 13 Mar 2017 23:09:29 +0000 (23:09 +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
Change-Id: Ia373be05422e21dc98702e04a25a5f530031aaad
Marco Nelissen [Mon, 13 Mar 2017 23:06:24 +0000 (23:06 +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
Change-Id: I265078e7cab77a8865862f3b0319bfb0746ee814
Marco Nelissen [Mon, 13 Mar 2017 23:05:43 +0000 (23:05 +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
Change-Id: I0d1fd31c2cbfb05a70cc7941df7c06846999a6cc
Marco Nelissen [Mon, 13 Mar 2017 23:05:29 +0000 (23:05 +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
Change-Id: I445e63688e03fa8088e6d8f10132f613e1377c92
Marco Nelissen [Mon, 13 Mar 2017 23:01:30 +0000 (23:01 +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
Change-Id: Ia7e87aa7baaf9bbff299ff70af5c77b90a922229
Marco Nelissen [Mon, 13 Mar 2017 23:01:14 +0000 (23:01 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3
am:
89349b8d29
Change-Id: I156d984af4dc64fa69d3b07661e8f2e7e86ca7e5
Marco Nelissen [Mon, 13 Mar 2017 23:00:59 +0000 (23:00 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2
am:
8f2b91f0a1
Change-Id: Ib43ba6aeba921b0d2c5b8649ac1e7015c48a7884
Marco Nelissen [Mon, 13 Mar 2017 22:57:31 +0000 (22:57 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e
am:
98ee832c7e
Change-Id: Ie82d1dfa473886b9b166804da985bce439c90900
Marco Nelissen [Mon, 13 Mar 2017 22:57:14 +0000 (22:57 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df
am:
4ba3934ec3
Change-Id: I6babc4703d1462a30d3075cfb6a3fbfdffac5724
Marco Nelissen [Mon, 13 Mar 2017 22:56:58 +0000 (22:56 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c
am:
d270a899c2
Change-Id: I64b30e83c6825a83ff628477a58d607eded0ec7d
Marco Nelissen [Mon, 13 Mar 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37
am:
d935c7f16e
Change-Id: I272acb1f5178ccaf43fa12ed096bb4bb03834213
Marco Nelissen [Mon, 13 Mar 2017 22:52:42 +0000 (22:52 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8
am:
8867ca40df
Change-Id: Id8e824b0411c463ee4278a8a8e61ea4be4053046
Marco Nelissen [Mon, 13 Mar 2017 22:52:27 +0000 (22:52 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e
am:
5b0ca6a92c
Change-Id: I2da6bc9ff1d3503c62042391fce0a0957f11433b
Marco Nelissen [Mon, 13 Mar 2017 22:48:27 +0000 (22:48 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea
am:
3285770d37
Change-Id: Id82c89fed96d3cfa11d68ba5d791d5a360aa243c
Marco Nelissen [Mon, 13 Mar 2017 22:48:12 +0000 (22:48 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab
am:
3c4401fce8
Change-Id: Ib6bd99193a44fbd801906d234c42b3fa3d33fb9a
Marco Nelissen [Mon, 13 Mar 2017 22:47:58 +0000 (22:47 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3
am:
8a3cc1963e
Change-Id: I72dd260e2ee0f9560c9322c3aaf7b93c8008607e
Marco Nelissen [Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6
am:
c2e69851ea
Change-Id: I2720c4439848f9aab8d7fa4f93b548793d129a4f
Marco Nelissen [Mon, 13 Mar 2017 22:43:40 +0000 (22:43 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938
am:
9e4a0e1fab
Change-Id: I17a5c0765c31c92a25e7c89a330aa656adc03baf
Marco Nelissen [Mon, 13 Mar 2017 22:43:26 +0000 (22:43 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8
am:
36c2e14da3
Change-Id: Ie6d46a6979bc89e2485fa4d2a25b21fc601e9783
Marco Nelissen [Mon, 13 Mar 2017 22:39:25 +0000 (22:39 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0
am:
bbca2719c6
Change-Id: If5ae485e1be0df3d4f61edf689d5b4c1520077b8
Marco Nelissen [Mon, 13 Mar 2017 22:39:10 +0000 (22:39 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e
am:
9e8dfb5938
Change-Id: I875cb7bba1bc6f6f443923a04629ae44a9d41140
Marco Nelissen [Mon, 13 Mar 2017 22:38:56 +0000 (22:38 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c
am:
f71b76cae8
Change-Id: I3306be5d7bb3867287732757dd14170527488b68
Marco Nelissen [Mon, 13 Mar 2017 22:34:54 +0000 (22:34 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev
am:
b264ece2c0
Change-Id: Id65ef33cb965b6fbdec95d9429ee05b134fd14f3
Marco Nelissen [Mon, 13 Mar 2017 22:34:40 +0000 (22:34 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev
am:
012e5fd39e
Change-Id: I2ad3e1364472558cf48c51fb3e2a08002d74c32d
Marco Nelissen [Mon, 13 Mar 2017 22:34:26 +0000 (22:34 +0000)]
Merge "Fix out of bounds access" into klp-dev
am:
360cbbd72c
Change-Id: I9ea32d31b1281689c4b5997a6c328630031c1795
Marco Nelissen [Mon, 13 Mar 2017 22:31:24 +0000 (22:31 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:30:25 +0000 (22:30 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:28:40 +0000 (22:28 +0000)]
Merge "Fix out of bounds access" into klp-dev
Marco Nelissen [Fri, 3 Mar 2017 21:37:27 +0000 (13:37 -0800)]
Fix NPDs in h263 decoder
Bug:
35269635
Test: decoded PoC with and without patch
Change-Id: I636a14360c7801cc5bca63c9cb44d1d235df8fd8
Andy Hung [Fri, 10 Mar 2017 23:00:32 +0000 (23:00 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d
am:
2a381e6f2f
Change-Id: Id9435fdd365f1eb5f1cf759e47cd675549f83a20
Marco Nelissen [Fri, 10 Mar 2017 19:28:44 +0000 (11:28 -0800)]
Fix out of bounds access
Bug:
34618607
Change-Id: I84f0ef948414d0b2d54e8948b6c30b8ae4da2b36
Andy Hung [Fri, 10 Mar 2017 22:56:31 +0000 (22:56 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0
am:
5a18b3d70d
Change-Id: I90e4e976fd9a07f06a32233ae245134fe372d234
Andy Hung [Fri, 10 Mar 2017 22:53:03 +0000 (22:53 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours
am:
b1c01ac1a0
Change-Id: I271a41d905cafdb3f4fa2c9fc4fbd183fd0af08b
Andy Hung [Fri, 10 Mar 2017 22:49:30 +0000 (22:49 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2
am:
78ec332732
Change-Id: I50a7b9f86a494bff6aa43e719e5c819eb0c191ae
Andy Hung [Fri, 10 Mar 2017 22:49:29 +0000 (22:49 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e
am:
3995196b9d -s ours
Change-Id: I4fa4eb204b244593d03c8bfa7f1169ee047c6652
Andy Hung [Fri, 10 Mar 2017 22:46:29 +0000 (22:46 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours
am:
fe66ce6f1e
Change-Id: I1c49e3520b11aebc987242540b8a3047db72e269
Andy Hung [Fri, 10 Mar 2017 22:46:29 +0000 (22:46 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451
am:
3fb4149ed2
Change-Id: I9101bb9cc966e9d99c78427697b6c570a7da753d
Andy Hung [Fri, 10 Mar 2017 22:42:59 +0000 (22:42 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours
am:
9fe1d60957 -s ours
Change-Id: I06683878d8e39e9d9dcae9f897124c36f6b968bf
Andy Hung [Fri, 10 Mar 2017 22:42:59 +0000 (22:42 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334
am:
5562d70451
Change-Id: Ia73c4a1d2911cf930700bf796fc7ee18d94500fe
Andy Hung [Fri, 10 Mar 2017 22:39:59 +0000 (22:39 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1
am:
6d4b5fc334
Change-Id: Ie47307f09c5fcb49f81a2d034c42d69b8417c9a6
Andy Hung [Fri, 10 Mar 2017 22:39:58 +0000 (22:39 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a
am:
de6072164a -s ours
Change-Id: I33a81bea7f8e210dbadade3f9bd63a3decbfb478
Andy Hung [Fri, 10 Mar 2017 22:36:28 +0000 (22:36 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57
am:
737754e97a
Change-Id: Ide9fb3f4955a31ade22f99c299f441d8413c1b88
Andy Hung [Fri, 10 Mar 2017 22:36:28 +0000 (22:36 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9
am:
5dc0e88cc1
Change-Id: Id24ba3565e66b9e4e6e738d840ad3400ff133a4c
Andy Hung [Fri, 10 Mar 2017 22:32:59 +0000 (22:32 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev
am:
e0da30dc57
Change-Id: Ia8aee821949f27b81e5c0ddca2e39aa9e478a432
Andy Hung [Fri, 10 Mar 2017 22:32:59 +0000 (22:32 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev
am:
51a3483ec9
Change-Id: I6fe5fb0a7142218b16c84bc1966a84ac920fd70a
Andy Hung [Fri, 10 Mar 2017 22:29:51 +0000 (22:29 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev
Andy Hung [Fri, 10 Mar 2017 22:29:43 +0000 (22:29 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev
Marco Nelissen [Thu, 9 Mar 2017 23:01:55 +0000 (15:01 -0800)]
Fix integer overflow and divide-by-zero
Bug:
35763994
Test: ran CTS with and without fix
Change-Id: If835e97ce578d4fa567e33e349e48fb7b2559e0e
Wonsik Kim [Thu, 16 Feb 2017 01:54:52 +0000 (01:54 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543
am:
dbeeaf29d0
Change-Id: I69aa294ccdcc83aa5da29a16368e7ecb7280ab61
Wonsik Kim [Thu, 16 Feb 2017 01:51:21 +0000 (01:51 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025
am:
1dfa590543
Change-Id: I766507dac31afdee5755897fb201a961fba66793
Wonsik Kim [Thu, 16 Feb 2017 01:47:51 +0000 (01:47 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours
am:
292dc7e025
Change-Id: I50fda0957b316040f2dc4be9b3abe8818f02a3d5
Wonsik Kim [Thu, 16 Feb 2017 01:44:50 +0000 (01:44 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc
am:
55d8132edd -s ours
Change-Id: Ib1c0af161a2113c2c5f47d091c024ee34cb389e5
Wonsik Kim [Thu, 16 Feb 2017 01:44:21 +0000 (01:44 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0
am:
83485b615e
Change-Id: I3d18f79b2d7a22122756e0cf4af2b7d46dfe808b
Wonsik Kim [Thu, 16 Feb 2017 01:41:21 +0000 (01:41 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours
am:
1760d73fbc
Change-Id: Icecef8789c79bb5b61e05062a2839b2462653004
Wonsik Kim [Thu, 16 Feb 2017 01:41:21 +0000 (01:41 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799
am:
787a5136f0
Change-Id: Ie4050fea30e11b772d6a60833ffcf6c000778461
Wonsik Kim [Thu, 16 Feb 2017 01:38:20 +0000 (01:38 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours
am:
da9246fa5e -s ours
Change-Id: I72b4c927264c5c796b7d52dfe961a5ed15a03fdb
Wonsik Kim [Thu, 16 Feb 2017 01:37:50 +0000 (01:37 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02
am:
a5e72ec799
Change-Id: I3c4fc719cae8632fb7223db29ea035ed1a80616a
Wonsik Kim [Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503
am:
daaabdcaac -s ours
Change-Id: I20ff9fb7d3d5f3be5e9c21d0335ed15844a5dd15
Wonsik Kim [Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046
am:
4f428b7c02
Change-Id: Ia3e7fe8b1f39448f865508da3d5836b3159273cb
Wonsik Kim [Thu, 16 Feb 2017 01:31:19 +0000 (01:31 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e
am:
afaa438503
Change-Id: Ife5d8803e38a6d62f820929c6eb83b93f8ec64c1
Wonsik Kim [Thu, 16 Feb 2017 01:31:19 +0000 (01:31 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5
am:
89f501d046
Change-Id: I81e3dbdd87d61a9d624d576458b4adcb8cf13fc1
Wonsik Kim [Thu, 16 Feb 2017 01:28:51 +0000 (01:28 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders
am:
dd447c354e
Change-Id: I0f2bde22c3e3b19d364ffce46f2e7c67f4016d75
Wonsik Kim [Thu, 16 Feb 2017 01:28:50 +0000 (01:28 +0000)]
codecs: handle onReset() for a few encoders
am:
5443b57cc5
Change-Id: Ifd851c8840abc615eecf0da1f6b32f30cfb4e0b2
Wonsik Kim [Fri, 10 Feb 2017 05:29:40 +0000 (14:29 +0900)]
codecs: handle onReset() for a few encoders
Test: Run PoC binaries
Bug:
34749392
Bug:
34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd
Wonsik Kim [Fri, 10 Feb 2017 05:29:40 +0000 (14:29 +0900)]
DO NOT MERGE codecs: handle onReset() for a few encoders
Test: Run PoC binaries
Bug:
34749392
Bug:
34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd
Andy Hung [Tue, 14 Feb 2017 02:48:39 +0000 (18:48 -0800)]
DO NOT MERGE AudioFlinger: Check framecount overflow when creating track
Test: Native POC
Bug:
34749571
Change-Id: I7529658e52ac7e64d162eb5338f10fb25eaa8fe7
Andy Hung [Tue, 14 Feb 2017 02:48:39 +0000 (18:48 -0800)]
AudioFlinger: Check framecount overflow when creating track
Test: Native POC
Bug:
34749571
Change-Id: I7529658e52ac7e64d162eb5338f10fb25eaa8fe7
(cherry picked from commit
1883f69de5f2c4e71df58d5b71d7c39f9779b50c)
Jean-Michel Trivi [Tue, 14 Feb 2017 21:04:05 +0000 (21:04 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a am:
e5c0e7e10b am:
3ffe48ed29
am:
3db88c0f00
Change-Id: Iea1d0fd06e77bd7daafc85704206cb36fd2274e2
Jean-Michel Trivi [Tue, 14 Feb 2017 21:01:34 +0000 (21:01 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a am:
e5c0e7e10b
am:
3ffe48ed29
Change-Id: I8a948de8ac007e44edff58df707dc56cd483d4f3
Jean-Michel Trivi [Tue, 14 Feb 2017 20:59:05 +0000 (20:59 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a
am:
e5c0e7e10b
Change-Id: I8958232051fe10132f9cb44acb1c97685b169c09
Jean-Michel Trivi [Tue, 14 Feb 2017 20:56:27 +0000 (20:56 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81
am:
b9e070af6a
Change-Id: I1676f829b5571abad93c9f4ce156811a55787024
Jean-Michel Trivi [Tue, 14 Feb 2017 20:53:56 +0000 (20:53 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0
am:
b0896dfc81
Change-Id: I1996ca7d273dcf04729c8cc6ed7898899240b3c2
Jean-Michel Trivi [Tue, 14 Feb 2017 20:51:25 +0000 (20:51 +0000)]
EffectBundle: check nb channels to write speaker angles
am:
e5a54485e0
Change-Id: I131f8d196034854f562a175874bce19b29904664
Jean-Michel Trivi [Tue, 14 Feb 2017 00:31:20 +0000 (16:31 -0800)]
EffectBundle: check nb channels to write speaker angles
When speaker angles are queried, the size of the array for the
returned data is 3x the number of channels (where really it
should be max(2, nbChannels)). The code assumed it was at
least 3x2 (where 2 is the number of virtual speakers this
effect supports) and would thus crash when called for a mono
channel mask.
Test: see repro steps in bug
Bug:
32591350
Change-Id: I33d4bff6b2e19a9fc4284a85a446804878d3a410
Marco Nelissen [Mon, 13 Feb 2017 23:16:26 +0000 (23:16 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce am:
e541fa1764 am:
7f3980c0ca am:
ea2023406b am:
3fc94bc146 am:
497f2ccce4 am:
917033735e am:
3b122332a1
am:
89cbb8482b
Change-Id: Ice33011bc5fcd9bcdc87fbf1fab3c25cb65decb4
Marco Nelissen [Mon, 13 Feb 2017 23:16:09 +0000 (23:16 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev am:
50358a80b1 am:
86d5e962ce
am:
24058e96b3
Change-Id: Idb55e28f9cc23699d145f145c92e1c9c2e290d86
Marco Nelissen [Mon, 13 Feb 2017 23:13:53 +0000 (23:13 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce am:
e541fa1764 am:
7f3980c0ca am:
ea2023406b am:
3fc94bc146 am:
497f2ccce4 am:
917033735e
am:
3b122332a1
Change-Id: I4d44954a3453c2a21e5b67aeea32d41fede01ba9
Marco Nelissen [Mon, 13 Feb 2017 23:13:36 +0000 (23:13 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev am:
50358a80b1
am:
86d5e962ce
Change-Id: I59f1dc2a12d44018e3e8b74bcc6d9c775f896381
Marco Nelissen [Mon, 13 Feb 2017 23:11:22 +0000 (23:11 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce am:
e541fa1764 am:
7f3980c0ca am:
ea2023406b am:
3fc94bc146 am:
497f2ccce4
am:
917033735e
Change-Id: Iacd7eff2b865515af5e29cc7fb5fb517f213aabc
Marco Nelissen [Mon, 13 Feb 2017 23:11:07 +0000 (23:11 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev
am:
50358a80b1
Change-Id: I9f0220c41cf629652329ed624469f6442186eca3
Marco Nelissen [Mon, 13 Feb 2017 23:08:44 +0000 (23:08 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce am:
e541fa1764 am:
7f3980c0ca am:
ea2023406b am:
3fc94bc146
am:
497f2ccce4
Change-Id: I2df07a6aa02a7c56a47c777e0eacbc6d560055de
Marco Nelissen [Mon, 13 Feb 2017 22:19:40 +0000 (14:19 -0800)]
resolve merge conflicts of
79cf158c51 to mnc-dev
Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643
Marco Nelissen [Mon, 13 Feb 2017 21:51:48 +0000 (21:51 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce am:
e541fa1764 am:
7f3980c0ca am:
ea2023406b
am:
3fc94bc146
Change-Id: Ic4fd03ad338902c15048dd32e8a2f27d162d6255
Marco Nelissen [Mon, 13 Feb 2017 21:51:31 +0000 (21:51 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am:
65433ff04d am:
86bd734f58 am:
7902138f2e am:
a23c9a47ab
am:
f8a2e81bc4
Change-Id: I64518f5a3860f66d3e232589f8c9ef643e572053
Marco Nelissen [Mon, 13 Feb 2017 21:49:17 +0000 (21:49 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce am:
e541fa1764 am:
7f3980c0ca
am:
ea2023406b
Change-Id: I68fa183d94f46f7578f8b0718da9a3efd9b4946c
Marco Nelissen [Mon, 13 Feb 2017 21:49:03 +0000 (21:49 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am:
65433ff04d am:
86bd734f58 am:
7902138f2e
am:
a23c9a47ab
Change-Id: I4cfef0f49e467337c36b9283d2959ddd68e41bd3
Marco Nelissen [Mon, 13 Feb 2017 21:46:48 +0000 (21:46 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce am:
e541fa1764
am:
7f3980c0ca
Change-Id: Iaa2a11e1924fdcfe83ca8c8e9a7925850ceb53be
Marco Nelissen [Mon, 13 Feb 2017 21:46:33 +0000 (21:46 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am:
65433ff04d am:
86bd734f58
am:
7902138f2e
Change-Id: I2d9be870193a986d9cd21d7527c4069cd1f184ed
Marco Nelissen [Mon, 13 Feb 2017 21:43:48 +0000 (21:43 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am:
b6aa3901ce
am:
e541fa1764
Change-Id: Ia2962471693b1c4302d4535a0f95dd8d914c3cb8
Marco Nelissen [Mon, 13 Feb 2017 21:43:31 +0000 (21:43 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am:
65433ff04d
am:
86bd734f58
Change-Id: I3729ea0064642ac10292561d450565ee735af369
Marco Nelissen [Mon, 13 Feb 2017 21:41:14 +0000 (21:41 +0000)]
Merge "Fix overflow check and check read result" into klp-dev
am:
b6aa3901ce
Change-Id: I80ef33d8f0593fa723077e91a5ca406f27b0b746
Marco Nelissen [Mon, 13 Feb 2017 21:40:59 +0000 (21:40 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev
am:
65433ff04d
Change-Id: I6be526b6ed9df22c9699445efaa4f0ed2ae266b4
Marco Nelissen [Mon, 13 Feb 2017 21:36:48 +0000 (21:36 +0000)]
Merge "Fix overflow check and check read result" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:35:18 +0000 (21:35 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev
Marco Nelissen [Mon, 6 Feb 2017 22:12:30 +0000 (14:12 -0800)]
Fix overflow check and check read result
Bug:
33861560
Test: build
Change-Id: Ia85519766e19a6e37237166f309750b3e8323c4e
Eino-Ville Talvala [Fri, 3 Feb 2017 00:08:41 +0000 (00:08 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf
am:
e1b8152064
Change-Id: Iaf13b317fe79e26a84050913a4bfe9bbcbe07a8b
Eino-Ville Talvala [Fri, 3 Feb 2017 00:08:33 +0000 (00:08 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9
am:
0dcc9bb368
Change-Id: I05eeb35f91513b4b9b9d0d696a1ed9b110eb2aef
Eino-Ville Talvala [Fri, 3 Feb 2017 00:06:38 +0000 (00:06 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0
am:
31670090bf
Change-Id: I623d276cad5ce38f1ce3cd98d38f74683b2d5924
OSDN Git Service
