OSDN Git Service
Ray Essick [Wed, 9 Nov 2016 18:21:11 +0000 (18:21 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information
am:
21f2814260
Change-Id: Ib71918ef91b50ec3a7b93b6c40e0af18df9fc5d2
Lajos Molnar [Wed, 2 Nov 2016 23:20:25 +0000 (23:20 +0000)]
IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process
am:
4fb1e42a16
Change-Id: I8878bbd684459fc2381c6b0a07ff451efab45dd8
Lajos Molnar [Wed, 2 Nov 2016 21:59:03 +0000 (14:59 -0700)]
IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process
This was disabled by a previous commit.
Bug:
32436178
Change-Id: I9f9c6a372a039226d61f3651be3af207fed63e60
Ray Essick [Wed, 2 Nov 2016 21:17:06 +0000 (14:17 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information
several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.
This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.
Bug:
32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Ib46cd1b5a3e1707c343d395f235bedb82764e184
Lajos Molnar [Mon, 31 Oct 2016 19:05:36 +0000 (19:05 +0000)]
stagefright: remove allottedSize equality check in IOMX::useBuffer
am:
58388aa7be
Change-Id: I828fa720f61e8f823ddec7c33b0db05683b76058
Lajos Molnar [Thu, 27 Oct 2016 00:41:56 +0000 (17:41 -0700)]
stagefright: remove allottedSize equality check in IOMX::useBuffer
This was meant for buffers shared cross-process, but we are not gaining
anything from this check even if it was at the correct place.
Bug:
32436178
Change-Id: I6919e8ac6e35092273e171f49f6711ba577ba2e6
Marco Nelissen [Sat, 15 Oct 2016 02:09:51 +0000 (02:09 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am:
b6cf6d6a30 am:
4c31eb2675 -s ours
am:
db358e20c6
Change-Id: I69d377350a4ec37bf910b4676553dff504524e65
Marco Nelissen [Sat, 15 Oct 2016 02:09:36 +0000 (02:09 +0000)]
DO NOT MERGE Fix divide by zero am:
bc08b17c57 am:
7525a44f22 -s ours
am:
9c6eda244c
Change-Id: I85cbe982109b75eaec1e1a17ba7868a4ffeb8aa6
Marco Nelissen [Sat, 15 Oct 2016 02:05:19 +0000 (02:05 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am:
b6cf6d6a30
am:
4c31eb2675 -s ours
Change-Id: Ibc0f32ba1c4701f8c30f82b5b6c281ded3c628c7
Marco Nelissen [Sat, 15 Oct 2016 02:05:05 +0000 (02:05 +0000)]
DO NOT MERGE Fix divide by zero am:
bc08b17c57
am:
7525a44f22 -s ours
Change-Id: I52724e5697ec42b4ad1f0b2c2550408cd19b5143
Marco Nelissen [Sat, 15 Oct 2016 02:01:07 +0000 (02:01 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev
am:
b6cf6d6a30
Change-Id: Iabf62a27be889aad1ca4587c874571c2740914dd
Marco Nelissen [Sat, 15 Oct 2016 02:01:06 +0000 (02:01 +0000)]
DO NOT MERGE Fix divide by zero
am:
bc08b17c57
Change-Id: I47cdf22bd60fd62ffcf5118c5c846c409eca960a
Marco Nelissen [Sat, 15 Oct 2016 01:56:00 +0000 (01:56 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev
Marco Nelissen [Fri, 14 Oct 2016 22:48:36 +0000 (22:48 +0000)]
Merge "Fix divide by zero" into lmp-dev am:
ef6934cdf9 am:
cd1950301d am:
79a5c7031e
am:
d066317386
Change-Id: I403238ef299fae85216a190035fd4335451560af
Marco Nelissen [Fri, 14 Oct 2016 22:48:21 +0000 (22:48 +0000)]
Fix divide by zero am:
12416c4125 -s ours am:
e1fff04cd9 am:
fee873d950
am:
45c32466f8
Change-Id: Id452573484ab3a0fc29b38282c5d06678ce07e66
Marco Nelissen [Fri, 14 Oct 2016 22:45:11 +0000 (22:45 +0000)]
Merge "Fix divide by zero" into lmp-dev am:
ef6934cdf9 am:
cd1950301d
am:
79a5c7031e
Change-Id: I469e756acfb69299e2ade43d3123cdb3e9872a0d
Marco Nelissen [Fri, 14 Oct 2016 22:44:50 +0000 (22:44 +0000)]
Fix divide by zero am:
12416c4125 -s ours am:
e1fff04cd9
am:
fee873d950
Change-Id: I2209f54ecafbb7a514c83407ecef52e87721429d
Marco Nelissen [Fri, 14 Oct 2016 22:41:04 +0000 (22:41 +0000)]
Merge "Fix divide by zero" into lmp-dev am:
ef6934cdf9
am:
cd1950301d
Change-Id: I299c0895349b4aa9439814d5040dceb3e2485ee8
Marco Nelissen [Fri, 14 Oct 2016 22:40:50 +0000 (22:40 +0000)]
Fix divide by zero am:
12416c4125 -s ours
am:
e1fff04cd9
Change-Id: I6f5a0824341993c97d0cefc5e43e6b3e26c9b9ab
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
DO NOT MERGE Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I935bf2a6f29c5c7990acbb0cc8386f40144b14fc
Marco Nelissen [Fri, 14 Oct 2016 22:36:51 +0000 (22:36 +0000)]
Merge "Fix divide by zero" into lmp-dev
am:
ef6934cdf9
Change-Id: I7e4de9437a7ba41e239a1906e58465cf312a6539
Marco Nelissen [Fri, 14 Oct 2016 22:36:50 +0000 (22:36 +0000)]
Fix divide by zero
am:
12416c4125 -s ours
Change-Id: Iaa88e621286dbe41deddd2e2fa62b30bfbdfaa21
Marco Nelissen [Fri, 14 Oct 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Fix divide by zero" into lmp-dev
Marco Nelissen [Thu, 13 Oct 2016 23:42:06 +0000 (23:42 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours
am:
2f6c5b05f9
Change-Id: I8da8b15efed6263ca8afd5acbda500a8fc9c12a6
Marco Nelissen [Thu, 13 Oct 2016 23:41:49 +0000 (23:41 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours
am:
a49626e9f9
Change-Id: I02a6038cff8444cefba8c8c35bf132ddbd3a6b9c
Marco Nelissen [Thu, 13 Oct 2016 23:38:30 +0000 (23:38 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944
am:
8f8e719106 -s ours
Change-Id: I18196452f6a19fe21fc4cad76c8df2165a044353
Marco Nelissen [Thu, 13 Oct 2016 23:38:17 +0000 (23:38 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e
am:
93590752b1 -s ours
Change-Id: I37e4ad9cca606117a774e544f44304ec46d496e3
Marco Nelissen [Thu, 13 Oct 2016 23:35:32 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours
am:
172fa07944
Change-Id: Ice1b8c59d1546f09c33fe1e077b30a8bab3fd137
Marco Nelissen [Thu, 13 Oct 2016 23:35:17 +0000 (23:35 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours
am:
609964004e
Change-Id: I77963b757d4d603903d14505139916718af13687
Marco Nelissen [Thu, 13 Oct 2016 23:33:31 +0000 (23:33 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours
am:
391b2806b5 -s ours
Change-Id: I3c550edd11e9c03937b7b9323de9e567574f6bac
Marco Nelissen [Thu, 13 Oct 2016 23:33:18 +0000 (23:33 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours
am:
76bc4166ce -s ours
Change-Id: I27a5014657a36dd1626578e17ebc36f6362ca4bd
Marco Nelissen [Thu, 13 Oct 2016 23:30:30 +0000 (23:30 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be
am:
913b7564c4 -s ours
Change-Id: I9698f264d5285632c8f7f7d83726da35499f290e
Marco Nelissen [Thu, 13 Oct 2016 23:30:16 +0000 (23:30 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e
am:
1b3f61ceaf -s ours
Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e
Marco Nelissen [Thu, 13 Oct 2016 23:28:29 +0000 (23:28 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126
am:
a5477b11be
Change-Id: I23bc38094b99e0563a4aeeb7df08631212d0b73a
Marco Nelissen [Thu, 13 Oct 2016 23:28:17 +0000 (23:28 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9
am:
55ce7e5d1e
Change-Id: I792667b35aacfa1b910a332d855f002615041408
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev
am:
ec206acb99
Change-Id: Id2100166f21c42cacdfb26c82fe32a07c95caa82
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
am:
2c28e5b126
Change-Id: Ic69824aeaf760eb6b5e79fef78be41c2cb4d749e
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
DO NOT MERGE Fix divide by zero
am:
febbd52cd9
Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a
Marco Nelissen [Thu, 13 Oct 2016 23:25:46 +0000 (23:25 +0000)]
DO NOT MERGE Fix divide by zero
am:
2e211d38a3
Change-Id: I774eeec61319489b2976d6bd1474c7d8f7ef4e93
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
Marco Nelissen [Thu, 13 Oct 2016 23:21:06 +0000 (23:21 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev
Marco Nelissen [Thu, 13 Oct 2016 23:19:54 +0000 (23:19 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 02:01:36 +0000 (02:01 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939 am:
25a681e678 am:
73895e0b02 am:
c4605f157b
am:
78188fec0f
Change-Id: I171ee6509854311dd71183c1b2226d8f4fa02171
rago [Thu, 13 Oct 2016 02:01:21 +0000 (02:01 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9 am:
f4a63f6765 am:
ecfd198cda am:
bae68c9e15
am:
d36ebed01e
Change-Id: Icc846170a93c7f1aa348645609f57b28e8a8c76c
Ricardo Garcia [Thu, 13 Oct 2016 01:55:06 +0000 (01:55 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939 am:
25a681e678 am:
73895e0b02
am:
c4605f157b
Change-Id: Ic6f21e4536be81b17fd41ebe78515a3a93ea9a8f
rago [Thu, 13 Oct 2016 01:54:51 +0000 (01:54 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9 am:
f4a63f6765 am:
ecfd198cda
am:
bae68c9e15
Change-Id: I8e71eeb1a3b6c9adaa494578327e3984364b7ace
Ricardo Garcia [Thu, 13 Oct 2016 01:48:06 +0000 (01:48 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939 am:
25a681e678
am:
73895e0b02
Change-Id: I5770281efd6e83a2cb0ed40b16436625b3c10da8
rago [Thu, 13 Oct 2016 01:47:50 +0000 (01:47 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9 am:
f4a63f6765
am:
ecfd198cda
Change-Id: Ie96acf726e282e014339b2817ad6aa0634378ca9
Pawin Vongmasa [Thu, 13 Oct 2016 01:41:07 +0000 (01:41 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours am:
54c0001dc9 -s ours am:
253e3ae0ba am:
42e8d24ca9 -s ours
am:
0bed5b7803
Change-Id: Id96fd8055b8f4e22b8d90fc827eb02698aef4d4e
Ricardo Garcia [Thu, 13 Oct 2016 01:41:05 +0000 (01:41 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939
am:
25a681e678
Change-Id: I658364d7223918d5757d61e2e9ce9f905e6a7627
rago [Thu, 13 Oct 2016 01:40:51 +0000 (01:40 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9
am:
f4a63f6765
Change-Id: I6a360ed595632dbb9d8e370c4561ec41d07c173f
Pawin Vongmasa [Thu, 13 Oct 2016 01:40:51 +0000 (01:40 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours am:
d676f1bfeb am:
0ce582e5c4 -s ours
am:
e843c53efa
Change-Id: Ib3ceca0ff50fdd4f6bf586d39ef84474ae0e6769
Pawin Vongmasa [Thu, 13 Oct 2016 01:33:37 +0000 (01:33 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours am:
54c0001dc9 -s ours am:
253e3ae0ba
am:
42e8d24ca9 -s ours
Change-Id: If2db282f155963e46adcff5fcc05bfc8eba5d59a
Ricardo Garcia [Thu, 13 Oct 2016 01:33:30 +0000 (01:33 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9
am:
24566f2939
Change-Id: Ibfc04cf102256f0a114b9670550beee44254be14
Pawin Vongmasa [Thu, 13 Oct 2016 01:33:22 +0000 (01:33 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours am:
d676f1bfeb
am:
0ce582e5c4 -s ours
Change-Id: Ib4c116449fa9a43f7a4c1b46c793c5de2d0cbac3
rago [Thu, 13 Oct 2016 01:33:18 +0000 (01:33 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a
am:
bcc7230bb9
Change-Id: If5d6fefb276341472d827bac3f349561f7d1d990
Pawin Vongmasa [Thu, 13 Oct 2016 01:27:04 +0000 (01:27 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours am:
54c0001dc9 -s ours
am:
253e3ae0ba
Change-Id: I74873bdd367f238277c74fec12edf7275ee14435
Ricardo Garcia [Thu, 13 Oct 2016 01:26:59 +0000 (01:26 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e
am:
6732f45ee9
Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729
Pawin Vongmasa [Thu, 13 Oct 2016 01:26:48 +0000 (01:26 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours
am:
d676f1bfeb
Change-Id: I0f8ec51bbc0e26aae780f20668f5ac03d5a8da42
rago [Thu, 13 Oct 2016 01:26:47 +0000 (01:26 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e
am:
f060479b9a
Change-Id: I69eb3819f246e6d807af099f9a0260146cd06fd2
Pawin Vongmasa [Thu, 13 Oct 2016 01:20:04 +0000 (01:20 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours am:
37e3ea354a am:
ea136eb981 -s ours
am:
2456e12801
Change-Id: Ic7b4cf9994060ed34e4ad3c13f09a5f28f635ab1
Pawin Vongmasa [Thu, 13 Oct 2016 01:20:03 +0000 (01:20 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours
am:
54c0001dc9 -s ours
Change-Id: I6bb100ce240464dff699c5d37227a93e085a2f74
Ricardo Garcia [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
am:
eee86b009e
Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728
rago [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
Fix potential NULL dereference in Visualizer effect
am:
874f9e0b8e
Change-Id: I382b8cc3799b52e085aac0ccec7dcb668a4933ec
Pawin Vongmasa [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
0338b14e28 -s ours am:
648b682eeb am:
d558903f8c -s ours
am:
ad1141b06b
Change-Id: Id96e179a59d415070f5975742e50e9746e011e54
Pawin Vongmasa [Thu, 13 Oct 2016 01:19:47 +0000 (01:19 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours
am:
7b9756261d -s ours
Change-Id: I016c0378320af03c05a01059de8c6edeabd84130
Ricardo Garcia [Thu, 13 Oct 2016 01:13:46 +0000 (01:13 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Pawin Vongmasa [Thu, 13 Oct 2016 01:13:01 +0000 (01:13 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours am:
37e3ea354a
am:
ea136eb981 -s ours
Change-Id: I933c4482446d58c554cefc5c5d7befe90f4a54c6
Pawin Vongmasa [Thu, 13 Oct 2016 01:13:00 +0000 (01:13 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev am:
622fd04e88 am:
862b281476 -s ours
am:
5e94f64995
Change-Id: I4ea01684881d277d30b8e55fe463a0eb1638d236
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:59 +0000 (01:12 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42
am:
d18d8fac61 -s ours
Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
0338b14e28 -s ours am:
648b682eeb
am:
d558903f8c -s ours
Change-Id: I306a576ddbc84dedb781e9b257429ef9381ac48b
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56
am:
f1e84ca858 -s ours
Change-Id: I7b0abee027d5cc3e697b3afcbf8412641f963ad3
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
25d34cacde am:
428493c16d -s ours
am:
c2af35e25d
Change-Id: I3ecb5174b9cdcfea100980f10390655c33681e31
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:30 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235
am:
b512f4ab42
Change-Id: Ic852128c935782783fc03175be9968da6e894e90
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:29 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours
am:
37e3ea354a
Change-Id: Ica84145fb5bba2067aeaa3311d66395aea25e860
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:29 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev am:
622fd04e88
am:
862b281476 -s ours
Change-Id: I8f450dd56bdf98e4a7bbe3cc61df2557f9f3f2d9
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:17 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
0338b14e28 -s ours
am:
648b682eeb
Change-Id: I8a304efd3e38c9b3a5f1d6c507250bf7ce26319a
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:16 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86
am:
2c76c56d56
Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:16 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
25d34cacde
am:
428493c16d -s ours
Change-Id: I52e1635153f8969caed1f4be5394ba7bdcf09985
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
am:
8caef85235
Change-Id: I9b4b155c4a720b27120428ea995833c426a65fef
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
am:
b6ba3d7e47 -s ours
Change-Id: Iab547a3c17869e99ec58022b11a27eeb2777c729
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev
am:
622fd04e88
Change-Id: I9a6424ca1f7724e5513e0251f650382b3a49f1f7
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
0338b14e28 -s ours
Change-Id: Idc7eaeacd94e4499b75aaa1213bf6848ae9206c1
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
de84a76b86
Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:45 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
25d34cacde
Change-Id: I92443c3bee4174f9c6d493911d84d022dbb1972f
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:52 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:49 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:33 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
rago [Sat, 8 Oct 2016 01:16:09 +0000 (18:16 -0700)]
Fix potential NULL dereference in Visualizer effect
Bug:
30229821
Test: fixing CL. Existing unit tests still pass.
Change-Id: I6e4abd759d5d2abc3b391e92e2e18f060cab7af0
Lajos Molnar [Wed, 12 Oct 2016 01:29:22 +0000 (01:29 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189 am:
1c44a2ed66 am:
efe63962a7 am:
6616cf9e18 am:
998d7dc3bb -s ours
am:
3fbd0b0be9
Change-Id: I5f29661f51db448baa5d961a389ae794fce981ed
Lajos Molnar [Wed, 12 Oct 2016 01:23:21 +0000 (01:23 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189 am:
1c44a2ed66 am:
efe63962a7 am:
6616cf9e18
am:
998d7dc3bb -s ours
Change-Id: Ic8b000116797f546e3c8448259b2e20f25cb31d1
Lajos Molnar [Tue, 11 Oct 2016 23:16:13 +0000 (23:16 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189 am:
1c44a2ed66 am:
efe63962a7
am:
6616cf9e18
Change-Id: If2b68293e43057d517989755f64e56bdfab20b8e
Lajos Molnar [Tue, 11 Oct 2016 23:10:12 +0000 (23:10 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189 am:
1c44a2ed66
am:
efe63962a7
Change-Id: Id22c6f78db4d457c281ab9db7c214236c2bdb18d
Lajos Molnar [Tue, 11 Oct 2016 23:04:42 +0000 (23:04 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189
am:
1c44a2ed66
Change-Id: I5ef2909336c4264e22c4216b64fccc46ea654c19
Lajos Molnar [Tue, 11 Oct 2016 22:58:40 +0000 (22:58 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102
am:
d9f6b22189
Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5
Lajos Molnar [Tue, 11 Oct 2016 22:53:10 +0000 (22:53 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
am:
afb20c3102
Change-Id: Ia68b31d3e1781cb24e0c16f669a6b26644f33d46
Lajos Molnar [Tue, 11 Oct 2016 22:53:10 +0000 (22:53 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
am:
ae52fd383a
Change-Id: I5c510313cdea7f6d118e2999fc78ac0c7f6df4a0
Lajos Molnar [Tue, 11 Oct 2016 15:41:51 +0000 (08:41 -0700)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.
Bug:
31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be
Lajos Molnar [Tue, 11 Oct 2016 15:41:51 +0000 (08:41 -0700)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.
Bug:
31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
DO NOT MERGE Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32