OSDN Git Service
Ray Essick [Mon, 13 Mar 2017 17:16:37 +0000 (17:16 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6 am:
3754af193c
am:
0d9990d9f0
Change-Id: I709642fdd65cabaeffe4549c1685d2e23e45ed66
Ray Essick [Mon, 13 Mar 2017 17:11:36 +0000 (17:11 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6
am:
3754af193c
Change-Id: I19532dd565f3d1e21427336db5efd7137ddeb92a
Ray Essick [Mon, 13 Mar 2017 17:07:05 +0000 (17:07 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625
am:
8e1aef08e6
Change-Id: I3e4606ccac6574a786470fcb3ccab962273334c0
Ray Essick [Mon, 13 Mar 2017 17:03:05 +0000 (17:03 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev
am:
d4c1d61625
Change-Id: I1d495aadf1ea82b715680596b086a1f29dd1f37c
Ray Essick [Mon, 13 Mar 2017 16:56:49 +0000 (16:56 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev
Andy Hung [Fri, 10 Mar 2017 23:18:02 +0000 (23:18 +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 am:
d331c1ec6a -s ours am:
e5b8a38673 am:
39ff645bd2 am:
08d8cd5db3
am:
a1bd4556d5
Change-Id: I8b43db2164e6ab3775d1e0c5759c1403b1da39c1
Andy Hung [Fri, 10 Mar 2017 23:14:33 +0000 (23:14 +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 am:
d331c1ec6a -s ours am:
e5b8a38673 am:
39ff645bd2
am:
08d8cd5db3
Change-Id: I61786c730e796767a4a0e1d241d5dedc4eeb5e22
Andy Hung [Fri, 10 Mar 2017 23:11:02 +0000 (23:11 +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 am:
d331c1ec6a -s ours am:
e5b8a38673
am:
39ff645bd2
Change-Id: I8aa4b21fbe4b54c8a08c3a1fb07c481a525cf19a
Andy Hung [Fri, 10 Mar 2017 23:08:00 +0000 (23:08 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9 am:
12b5b3b008 am:
dfecfdb28f am:
3c93457cfc
am:
a447516329
Change-Id: I63259b73f31fbd64d79a5cfb426767f2f18e0904
Andy Hung [Fri, 10 Mar 2017 23:07:31 +0000 (23:07 +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 am:
d331c1ec6a -s ours
am:
e5b8a38673
Change-Id: I6db8823cd46490d70fd7f9a0a6cc7ac1a3890321
Andy Hung [Fri, 10 Mar 2017 23:04:32 +0000 (23:04 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9 am:
12b5b3b008 am:
dfecfdb28f
am:
3c93457cfc
Change-Id: I93dfca6c08ba2c9096b1c297c33e0a773d16d054
Andy Hung [Fri, 10 Mar 2017 23:04:02 +0000 (23:04 +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
am:
d331c1ec6a -s ours
Change-Id: I002064f85d1b2f40f5f01e3327cfc9e7db70769d
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
Andy Hung [Fri, 10 Mar 2017 23:00:31 +0000 (23:00 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9 am:
12b5b3b008
am:
dfecfdb28f
Change-Id: I0b4de04aab9058db4beb6346c00208b697ed4f78
Andy Hung [Fri, 10 Mar 2017 22:56:31 +0000 (22:56 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9
am:
12b5b3b008
Change-Id: I9a46a6aaa2ff3afc4be729f7877703d1bf97faa7
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:53:00 +0000 (22:53 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732
am:
9262496af9
Change-Id: I8df7a4c1308afb39a1f1a37a588e70e049a868fa
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 "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: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: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: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: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 "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9
am:
5dc0e88cc1
Change-Id: Id24ba3565e66b9e4e6e738d840ad3400ff133a4c
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: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: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: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
Ray Essick [Fri, 24 Feb 2017 00:08:09 +0000 (16:08 -0800)]
Validate lengths in HEVC metadata parsing
Add code to validate the size parameter passed to
HecvParameterSets::addNalUnit(). Previously vulnerable
to decrementing an unsigned past 0, yielding a huge result value.
Bug:
35467107
Test: ran POC, no crash, emitted new "bad length" log entry
Change-Id: Ia169b9edc1e0f7c5302e3c68aa90a54e8863d79e
Wonsik Kim [Thu, 16 Feb 2017 02:13:25 +0000 (02:13 +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 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32 am:
5b83000768
am:
e45718e94a
Change-Id: I62f8274399590f8278599052c5589bb32dd9869f
Wonsik Kim [Thu, 16 Feb 2017 02:09:56 +0000 (02:09 +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 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32
am:
5b83000768
Change-Id: I2b76f334a0bc07f3fd4cc5db96efb996e894c069
Wonsik Kim [Thu, 16 Feb 2017 02:06:18 +0000 (02:06 +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 am:
3b57c387ed -s ours am:
437d60bffb
am:
028e36fe32
Change-Id: I29ac629e641033bca6bd0ff47ef72ddec1c885bc
Wonsik Kim [Thu, 16 Feb 2017 02:02:54 +0000 (02:02 +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 am:
3b57c387ed -s ours
am:
437d60bffb
Change-Id: Ic71554bdaf82a64d2c10cc6ef194068366211bf1
Wonsik Kim [Thu, 16 Feb 2017 02:02:53 +0000 (02:02 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f am:
c5343a578c
am:
9224cc83f7
Change-Id: Iaef9a2b69240cc6517dc78bf85b68b4e23e51c9c
Wonsik Kim [Thu, 16 Feb 2017 01:58:22 +0000 (01:58 +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
am:
3b57c387ed -s ours
Change-Id: I1fa21c62180e7078289c291a58177cfb6adf6b00
Wonsik Kim [Thu, 16 Feb 2017 01:57:52 +0000 (01:57 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f
am:
c5343a578c
Change-Id: Ia4576778d6266485f524fcc4c84dfbdb9750e1be
Wonsik Kim [Thu, 16 Feb 2017 01:55:45 +0000 (01:55 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610
am:
e80b15a63f
Change-Id: I64b7684e3306b35b96b92cd71fae359d8bb613f5
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:22 +0000 (01:51 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4
am:
2430ff6610
Change-Id: I4099ab29c596f5ad2f03e0c018b0c2fddb078ed7
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:52 +0000 (01:47 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e
am:
58f7175ed4
Change-Id: Ib5d28de651178b0ab7cd3e44793a6078d904ff4c
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:16:37 +0000 (21:16 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a am:
e5c0e7e10b am:
3ffe48ed29 am:
3db88c0f00 am:
9169ca1b88 am:
654e9f9282 am:
8e86da478b am:
7ea7597648
am:
5c9fcda34e
Change-Id: Ifd55ddfad86981b0795d7c7b2ad2a34ab5684356
Jean-Michel Trivi [Tue, 14 Feb 2017 21:14:05 +0000 (21:14 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a am:
e5c0e7e10b am:
3ffe48ed29 am:
3db88c0f00 am:
9169ca1b88 am:
654e9f9282 am:
8e86da478b
am:
7ea7597648
Change-Id: I55d87412172c5f44b98b7b053d20c29b507575eb
Jean-Michel Trivi [Tue, 14 Feb 2017 21:11:37 +0000 (21:11 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a am:
e5c0e7e10b am:
3ffe48ed29 am:
3db88c0f00 am:
9169ca1b88 am:
654e9f9282
am:
8e86da478b
Change-Id: Ied6c11a5f125299fa88b33a80de241820dc876e1
Jean-Michel Trivi [Tue, 14 Feb 2017 21:09:35 +0000 (21:09 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a am:
e5c0e7e10b am:
3ffe48ed29 am:
3db88c0f00 am:
9169ca1b88
am:
654e9f9282
Change-Id: Id2db864022671e15c0667c97d536efb7c419da89
Jean-Michel Trivi [Tue, 14 Feb 2017 21:07:02 +0000 (21:07 +0000)]
EffectBundle: check nb channels to write speaker angles am:
e5a54485e0 am:
b0896dfc81 am:
b9e070af6a am:
e5c0e7e10b am:
3ffe48ed29 am:
3db88c0f00
am:
9169ca1b88
Change-Id: I444281056ba5770276b76900055c6e27daaeba63
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:32:59 +0000 (23:32 +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 am:
3ce7b4ddca am:
96fbe3c2e5 am:
d625f8dcab am:
d572632948
am:
72ff526520
Change-Id: Ieea7de2af84049c034885fbae3a84286117e54d7
Marco Nelissen [Mon, 13 Feb 2017 23:32:45 +0000 (23:32 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev am:
50358a80b1 am:
86d5e962ce am:
24058e96b3 am:
c9d4267bf0 am:
199f36c95a am:
fb800b98ed am:
f70b522d31
am:
20d68e02bc
Change-Id: I8c9a62ef7afcd47d31b12643446f492c969fcd7e
Marco Nelissen [Mon, 13 Feb 2017 23:30:29 +0000 (23:30 +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 am:
3ce7b4ddca am:
96fbe3c2e5 am:
d625f8dcab
am:
d572632948
Change-Id: I9912fd09527b9fcd6923e7c91b7dcfdade1c87f4
Marco Nelissen [Mon, 13 Feb 2017 23:30:14 +0000 (23:30 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev am:
50358a80b1 am:
86d5e962ce am:
24058e96b3 am:
c9d4267bf0 am:
199f36c95a am:
fb800b98ed
am:
f70b522d31
Change-Id: Iae87f698c8b8a46de2d578767883b6ee0c7b4ed3
Marco Nelissen [Mon, 13 Feb 2017 23:24:25 +0000 (23:24 +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 am:
3ce7b4ddca am:
96fbe3c2e5
am:
d625f8dcab
Change-Id: Ib9b2676a88278443f67a5c4473d5faa9bdd2caa4
Marco Nelissen [Mon, 13 Feb 2017 23:24:09 +0000 (23:24 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev am:
50358a80b1 am:
86d5e962ce am:
24058e96b3 am:
c9d4267bf0 am:
199f36c95a
am:
fb800b98ed
Change-Id: Ie8cc581c6c3bf76b375a2cdb4095e4152b359b2d
Marco Nelissen [Mon, 13 Feb 2017 23:21:57 +0000 (23:21 +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 am:
3ce7b4ddca
am:
96fbe3c2e5
Change-Id: Ic83f4cdc78ae34a6dc2de5cd3eb5247cb7af626a
Marco Nelissen [Mon, 13 Feb 2017 23:21:38 +0000 (23:21 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev am:
50358a80b1 am:
86d5e962ce am:
24058e96b3 am:
c9d4267bf0
am:
199f36c95a
Change-Id: I6e7307dcff161e32794ba15368bd00a5f625fd09
Marco Nelissen [Mon, 13 Feb 2017 23:18:54 +0000 (23:18 +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
am:
3ce7b4ddca
Change-Id: I3d6ab417df4d0b58ebb8a0df4e5344d2cdf2d2c0
Marco Nelissen [Mon, 13 Feb 2017 23:18:38 +0000 (23:18 +0000)]
resolve merge conflicts of
79cf158c51 to mnc-dev am:
50358a80b1 am:
86d5e962ce am:
24058e96b3
am:
c9d4267bf0
Change-Id: I3c49d0414ac2d6db50dab923b9350daae96cdd1d
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
OSDN Git Service
