OSDN Git Service
Wei Jia [Fri, 14 Jul 2017 23:38:29 +0000 (23:38 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e
am:
2aa463e371
Change-Id: Iba2670e0f394c1a8058008904d7cc4f01fe317a7
Wei Jia [Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev
am:
02772b134e
Change-Id: If99cab67ff6f06551da5b6202d7d36c2854ff3a9
Wei Jia [Fri, 14 Jul 2017 23:27:21 +0000 (23:27 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev
Ray Essick [Tue, 11 Jul 2017 02:12:48 +0000 (02:12 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd
am:
c36cdf16a9
Change-Id: I113d6d04f01f61be1e5837c13bf9d51731caab55
Eric Laurent [Tue, 11 Jul 2017 02:12:29 +0000 (02:12 +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 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours
am:
880adb1f2e
Change-Id: Ie26a5a8a2a2459feec0b44f1a0573c2170d0e303
Ray Essick [Tue, 11 Jul 2017 02:10:46 +0000 (02:10 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev
am:
ce2cdf02bd
Change-Id: I06aec170231079b7a5155d25974db2d356aab410
Eric Laurent [Tue, 11 Jul 2017 02:10:25 +0000 (02:10 +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 am:
46da92fa8f am:
b1a72c8787
am:
db02180546 -s ours
Change-Id: Id1faed6d6b5fcb927f4f98b5ae0b37c8b0ab94a0
TreeHugger Robot [Mon, 10 Jul 2017 20:47:14 +0000 (20:47 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev
Eric Laurent [Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +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 am:
46da92fa8f
am:
b1a72c8787
Change-Id: I251baae005c3e276f409a754de251ce20a125e65
Eric Laurent [Mon, 10 Jul 2017 20:34:03 +0000 (20:34 +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
am:
46da92fa8f
Change-Id: Iea5b777e88e42ffb60ccd517794f8a8fdd9c1f23
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
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
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
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
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
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
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
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
TreeHugger Robot [Mon, 10 Jul 2017 19:52:17 +0000 (19:52 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev
Wei Jia [Wed, 15 Feb 2017 01:07:24 +0000 (17:07 -0800)]
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)
Venkatarama Avadhani [Wed, 21 Jun 2017 16:52:13 +0000 (16:52 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762
am:
f36fb2deb3
Change-Id: Ie0786d3f1896e42c9ee879e3f43943641bc503b1
Venkatarama Avadhani [Wed, 21 Jun 2017 16:49:43 +0000 (16:49 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51
am:
b56bc9e762
Change-Id: Id27edb4426a7c4c2fad7bac2582663667d58ad75
Venkatarama Avadhani [Wed, 21 Jun 2017 16:46:43 +0000 (16:46 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f
am:
4ff3666a51
Change-Id: Ide20e7836e3feff6eb5aa7ce5c533277af243b6b
Venkatarama Avadhani [Wed, 21 Jun 2017 16:44:12 +0000 (16:44 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3
am:
1c0389cc5f
Change-Id: I1331b4b2263d956de7de7e882cf38d4ddb743a8b
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
Venkatarama Avadhani [Wed, 21 Jun 2017 16:38:41 +0000 (16:38 +0000)]
Change MPEG2 reinit Error Handling
am:
a67eacace7
Change-Id: I7ba8378fe66c57f595fee2368408cc426d3e5eaf
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
Ray Essick [Mon, 19 Jun 2017 17:40:56 +0000 (10:40 -0700)]
DO NOT MERGE Check frame handle validity before freeing buffer.
in CameraSource::releaseRecordingFrame(), validate the
VideoNativeHandleMetadata field when received. Avoid releasing invalid
handles (and thus invalid memory) if this has been corrupted in user space.
Bug:
37662122
Test: poc before/after on nyc-mr2
Change-Id: If48c050a5c20552604a90f19130ad5837e80bf52
Andy Hung [Mon, 19 Jun 2017 17:54:52 +0000 (17:54 +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 am:
a816170b85 -s ours am:
adf9f84880 -s ours am:
bf5cbd0298 -s ours
am:
036d7252a2 -s ours
Change-Id: I11197aeda9bf78225b66d31794c239b36a35dbee
Andy Hung [Mon, 19 Jun 2017 17:49:49 +0000 (17:49 +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 am:
a816170b85 -s ours am:
adf9f84880 -s ours
am:
bf5cbd0298 -s ours
Change-Id: I2caa1c9b39dd2c898e1652a5375fb82231e2347e
Andy Hung [Mon, 19 Jun 2017 17:43:24 +0000 (17:43 +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 am:
a816170b85 -s ours
am:
adf9f84880 -s ours
Change-Id: I960496e28d2f1c4d07a7679cc52fa820219db201
Andy Hung [Mon, 19 Jun 2017 17:36:48 +0000 (17:36 +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
am:
a816170b85 -s ours
Change-Id: Icedb70113b6a28e84a040e0fecd281e63dbcade5
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
Andy Hung [Mon, 19 Jun 2017 17:30:14 +0000 (17:30 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846 am:
69b0154d59
am:
1d66db35e5
Change-Id: I962eeaea659e99f5a9f082ab2f479bbb4cface15
Andy Hung [Mon, 19 Jun 2017 17:24:11 +0000 (17:24 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846
am:
69b0154d59
Change-Id: Ifbb0da32f562fe5b1001e5dc2fcc3490305e694e
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
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
Andy Hung [Mon, 19 Jun 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4
am:
c343fd2846
Change-Id: I72c4c8d74ffaa8b8bc03a265ae3ff06796bbeb5b
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
Andy Hung [Mon, 19 Jun 2017 17:12:41 +0000 (17:12 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad
am:
7779f826d4
Change-Id: I6ec7ea434317d8d3c38314a9dc49f6b620e0db9f
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
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
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
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
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
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
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
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
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
Andy Hung [Mon, 19 Jun 2017 16:35:00 +0000 (16:35 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev
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
Dongwon Kang [Sat, 17 Jun 2017 05:11:40 +0000 (05:11 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f am:
7c70a5482c
am:
e4c62e4582
Change-Id: I164f086c1902fe315ae08c69b2a6287d4cbeb135
Dongwon Kang [Sat, 17 Jun 2017 05:09:10 +0000 (05:09 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f
am:
7c70a5482c
Change-Id: I975dd858eaf473a3cf9a22c206272c4017e3c95c
Dongwon Kang [Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033
am:
9262a0d58f
Change-Id: I8854738e25b4038062cc66b392693792ee3de72d
Dongwon Kang [Sat, 17 Jun 2017 05:03:39 +0000 (05:03 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc
am:
6e5ef73033
Change-Id: I6d7aef658319bc6bbd43076d43788d2235dd14f6
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
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
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
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
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
TreeHugger Robot [Sat, 17 Jun 2017 04:46:30 +0000 (04:46 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev
Venkatarama Avadhani [Sat, 17 Jun 2017 02:35:56 +0000 (02:35 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours am:
a51cfb3a00 -s ours
am:
d77a443db4 -s ours
Change-Id: I731f360c79bb811ce5aa6e37453f382daa0e696c
Venkatarama Avadhani [Sat, 17 Jun 2017 02:33:58 +0000 (02:33 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours
am:
a51cfb3a00 -s ours
Change-Id: I59edf5501a076577045c983477b7b18f53372a3a
Venkatarama Avadhani [Sat, 17 Jun 2017 02:31:57 +0000 (02:31 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e
am:
e2424e9895 -s ours
Change-Id: I2872c2aa5257d0828e1d6c6176844b9827a9f3a4
Venkatarama Avadhani [Sat, 17 Jun 2017 02:29:25 +0000 (02:29 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f
am:
41c60ea30e
Change-Id: I654945cc7d760d769e7edd024e78a5a883d9602f
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
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
TreeHugger Robot [Sat, 17 Jun 2017 02:19:39 +0000 (02:19 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev
Andy Hung [Sat, 17 Jun 2017 00:25:06 +0000 (00:25 +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 am:
aff0808bcf am:
109247df7a am:
a92d05fc1e
am:
85c8828a32
Change-Id: I2ac2e1e00639f686905900308b3f675925e44a9d
Andy Hung [Sat, 17 Jun 2017 00:19:16 +0000 (00:19 +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 am:
aff0808bcf am:
109247df7a
am:
a92d05fc1e
Change-Id: I73340a812c24ea421d68fa88f6b18cfa4867a0a5
Andy Hung [Sat, 17 Jun 2017 00:13:12 +0000 (00:13 +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 am:
aff0808bcf
am:
109247df7a
Change-Id: I4f55d2cdd5ef430742e3b6e3680603d2a9618593
Andy Hung [Sat, 17 Jun 2017 00:11:10 +0000 (00:11 +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
am:
aff0808bcf
Change-Id: I4c7698da6176547fd9ebc23ae52e2e9e53e83f61
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
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
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
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
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
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
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
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
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
Venkatarama Avadhani [Fri, 16 Jun 2017 22:59:01 +0000 (22:59 +0000)]
Notify Errors Appropriately from SoftMPEG2 am:
eae3ad0585
am:
7392f40d44
Change-Id: Ib9f0eb58ecafb2a3e2c6af2177314eb023c145b7
Venkatarama Avadhani [Fri, 16 Jun 2017 22:57:01 +0000 (22:57 +0000)]
Notify Errors Appropriately from SoftMPEG2
am:
eae3ad0585
Change-Id: Ic3f7d31db3feca479bb5aa8e6d2ce1686ec1361f
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
Andy Hung [Tue, 13 Jun 2017 00:22:46 +0000 (17:22 -0700)]
Track: Check buffer size of static tracks
Merged-In: Ia7edd9a802905214a27961dbcec6352f6ef98f73
Test: Native POC
Bug:
38340117
Change-Id: I633caf563d3607dbe4b9be10be1687efce33469c
Venkatarama Avadhani [Thu, 13 Apr 2017 03:56:04 +0000 (09:26 +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
Change-Id: If02499d306aa9b6df64a7f25d43d1bdf318a10cd
Andy Hung [Tue, 14 Feb 2017 02:50:48 +0000 (18:50 -0800)]
AudioFlinger: Fix memory allocation for client-less tracks
Test: Ringtone with BT
Bug:
35350587
Bug:
38340117
Change-Id: If247d319d58f8f4d18b49f58ec950491871ebb2d
(cherry picked from commit
afb31487f3156a7284d2f0d06646c7bc00d99537)
Dongwon Kang [Mon, 12 Jun 2017 19:58:58 +0000 (12:58 -0700)]
MPEG4Extractor: check size for yrrc box
Test: stagefright -s poc_file
Bug:
62133227
Change-Id: Iafefac39764ce01b4dde414b9f152c9ea71810e9
Wei Jia [Wed, 7 Jun 2017 18:18:44 +0000 (18:18 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e am:
b95bbe95b5 -s ours am:
92f7d06bb1
am:
f7f4d438cb
Change-Id: Ifcdfe3ef74d376b31ed323c005db06182eda043c
Wei Jia [Wed, 7 Jun 2017 18:16:42 +0000 (18:16 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e am:
b95bbe95b5 -s ours
am:
92f7d06bb1
Change-Id: I53de1bea488aae856123f2a5b8bc231b67a8cfcf
Wei Jia [Wed, 7 Jun 2017 18:13:36 +0000 (18:13 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e
am:
b95bbe95b5 -s ours
Change-Id: I72cbcb93e255b161e03107d75539987c9df4e4d4
Wei Jia [Wed, 7 Jun 2017 18:11:11 +0000 (18:11 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6
am:
d687ad050e
Change-Id: If7b8a7fb1c1bc986b2bb3909378e5540a9431a60
Wei Jia [Wed, 7 Jun 2017 18:09:12 +0000 (18:09 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2
am:
bc7ecc89b6
Change-Id: I649fcc18615bca5d29a95da1ec1d2dcca75c2774
Wei Jia [Wed, 7 Jun 2017 18:06:10 +0000 (18:06 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours
am:
7c86ed20b2
Change-Id: I8fc5b501fdc8efb1ee0417c0c5eb572e3fcea75d
Wei Jia [Wed, 7 Jun 2017 18:01:33 +0000 (18:01 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589
am:
ed429f11e0 -s ours
Change-Id: Iae4fac75f4798261dcd1d6e5f1fabe223a38efc1
Wei Jia [Wed, 7 Jun 2017 17:57:32 +0000 (17:57 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours
am:
b91cfc3589
Change-Id: I3c1f4067a7c0d505790fe0232a362bd8220762af
Wei Jia [Wed, 7 Jun 2017 17:54:02 +0000 (17:54 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
am:
8818bf1fbb -s ours
Change-Id: If42ca4975b0069a972e980524cbe2e7c9f0bad6f
Wei Jia [Fri, 8 Jan 2016 00:03:03 +0000 (16:03 -0800)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
Bug:
38391487
Bug:
24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit
56097a8ecc31ec308a1caa38f92b69f99324eada)
Ricardo Garcia [Wed, 7 Jun 2017 13:55:16 +0000 (13:55 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344 am:
51789f19de am:
7ba7584303
am:
5304cbcee8
Change-Id: Ia1b4a6a4b5f250c6c32c948f04e51dd7a0a2b393
Ricardo Garcia [Wed, 7 Jun 2017 13:52:47 +0000 (13:52 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344 am:
51789f19de
am:
7ba7584303
Change-Id: I665d0aae8dfbab97a0bb97bf8a9bddc55ede3cff
OSDN Git Service
