OSDN Git Service
Wei Jia [Fri, 14 Jul 2017 23:42:34 +0000 (23:42 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c
am:
74952e9616 -s ours
Change-Id: I7fb63cc1f5e74e9c909cf493960c7191af11ea93
Wei Jia [Fri, 14 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours
am:
3092ed372c
Change-Id: I5f2b961f635981103348353c76ce8c58d3badfd2
Wei Jia [Fri, 14 Jul 2017 23:34:31 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
am:
61df326a5e -s ours
Change-Id: I0bf4804b128f23a8e8dbf2ed291d18a63468b488
Wei Jia [Fri, 14 Jul 2017 23:26:43 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev
Wei Jia [Fri, 14 Jul 2017 23:26:09 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
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)]
DO NOT MERGE: 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)
Wei Jia [Wed, 15 Feb 2017 01:07:24 +0000 (17:07 -0800)]
DO NOT MERGE: 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 [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
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: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: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: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 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 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
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: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
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
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: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:38:44 +0000 (13:38 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca
am:
6d2092f734
Change-Id: Ic8ace5d6ed81df5d8298d9031e635501ecf2b590
Ricardo Garcia [Wed, 7 Jun 2017 13:35:43 +0000 (13:35 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c
am:
a7e658fcca
Change-Id: I4070499668b42017c46e2556246fc973f7e638a4
Ricardo Garcia [Wed, 7 Jun 2017 13:32:43 +0000 (13:32 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69
am:
1f7d80772c
Change-Id: I7a978b70b1330b619ac0ed46f3c191912ce0ffd1
Ricardo Garcia [Wed, 7 Jun 2017 13:30:13 +0000 (13:30 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121
am:
966e572c69
Change-Id: Ida849f8cad82a997a108ad472b150c7be29baf42
Ricardo Garcia [Wed, 7 Jun 2017 13:27:12 +0000 (13:27 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0
am:
0ef6d9c121
Change-Id: I420ab9888c2b542ca66fbb65fd2bf7ea7ff3bb16
Ricardo Garcia [Wed, 7 Jun 2017 13:24:12 +0000 (13:24 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
am:
ef3a4aead0
Change-Id: I31e26961aaf4ca49c8c4bfa3c4dccd03bab63286
Ricardo Garcia [Wed, 7 Jun 2017 13:19:48 +0000 (13:19 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
Pawin Vongmasa [Wed, 7 Jun 2017 05:09:08 +0000 (05:09 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f
am:
d158da44d5 -s ours
Change-Id: Id6a31d4db40a4ce7a51a0b3832b821406f112d02
Pawin Vongmasa [Wed, 7 Jun 2017 05:06:39 +0000 (05:06 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf
am:
fa0b15cf8f
Change-Id: I13e12ece1adb4babeea580a53a094a305e3819f3
Pawin Vongmasa [Wed, 7 Jun 2017 05:04:08 +0000 (05:04 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7
am:
8cb7994cbf
Change-Id: Ibf23434ea242faa85098c73747d1dc42ad5c85ba
Pawin Vongmasa [Wed, 7 Jun 2017 05:01:37 +0000 (05:01 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f
am:
54f81e8fe7
Change-Id: Ic1ee69858d27b8d695f075bd436faa04795f058f
Pawin Vongmasa [Wed, 7 Jun 2017 04:59:38 +0000 (04:59 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155
am:
668b7f4b8f
Change-Id: I9d59a91f2a63115978bc48087a721cd7e6d8facb
Pawin Vongmasa [Wed, 7 Jun 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev
am:
d050902155
Change-Id: I45700eef5e0a9eec1bcfdc4d810f20d2a5668531
TreeHugger Robot [Wed, 7 Jun 2017 04:51:35 +0000 (04:51 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev
TreeHugger Robot [Wed, 7 Jun 2017 02:05:17 +0000 (02:05 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev
rago [Mon, 5 Jun 2017 19:15:05 +0000 (12:15 -0700)]
Fix security vulnerability: Equalizer setParameter memory overflow
Bug:
37563371
Test: use POC on bug or cts security test
Change-Id: I9c9453a222b53fd5ef821330a34cb9e938e4d9c5
Andy Hung [Tue, 6 Jun 2017 21:04:22 +0000 (21:04 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4
am:
f043bb5da6
Change-Id: I2a3a4486ade55675ce06ad9b6e3a4c01d1a4647d
Andy Hung [Tue, 6 Jun 2017 21:02:53 +0000 (21:02 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb
am:
716d258db4
Change-Id: I30639642fdcb0f4724925f72533dcd17f6881714
Andy Hung [Tue, 6 Jun 2017 21:00:54 +0000 (21:00 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92
am:
ea83248dfb
Change-Id: I0ceea1282ab530f228b8e6f54678edf3bb2f9d69
Andy Hung [Tue, 6 Jun 2017 20:58:23 +0000 (20:58 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44
am:
1f44782e92
Change-Id: Idc429c80c4058fcd2232209afd5da70128cca837
Andy Hung [Tue, 6 Jun 2017 20:56:51 +0000 (20:56 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996
am:
b401a3bf44
Change-Id: Ie62820116b2250c7533975362e90ae8139933697
Andy Hung [Tue, 6 Jun 2017 20:55:13 +0000 (20:55 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev
am:
f5d6e98996
Change-Id: I1af8959b4866ca2e45e2ef2aeb54806ac09e5176
Andy Hung [Tue, 6 Jun 2017 20:50:11 +0000 (20:50 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev
Ray Essick [Tue, 6 Jun 2017 20:45:43 +0000 (20:45 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9
am:
2ad98cf1c7
Change-Id: Ib1856e8073d36b874ac3280b31d69da5afb7878f
Wei Jia [Tue, 6 Jun 2017 20:45:22 +0000 (20:45 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db am:
3e99d14712
am:
0cb6c1f2b3
Change-Id: I387bb015e84b6a32eef251860a9369c30eb7e8f6
Ray Essick [Tue, 6 Jun 2017 20:43:45 +0000 (20:43 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27
am:
40833da7b9
Change-Id: Icae7e002d54f1029a8b79a640fa2a9b89faf7a0d
Wei Jia [Tue, 6 Jun 2017 20:43:21 +0000 (20:43 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db
am:
3e99d14712
Change-Id: I94e629c939151fb0918a8e2290af3e402ac2d0af
Ray Essick [Tue, 6 Jun 2017 20:37:16 +0000 (20:37 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a
am:
70a63bdf27
Change-Id: If759d2cd6c4bd350ca54218c2a6ae3fd07c11548
Wei Jia [Tue, 6 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf
am:
1173c884db
Change-Id: Ie070371abe02527147724cdb620547c9f1ec1b2d
Ray Essick [Tue, 6 Jun 2017 20:28:12 +0000 (20:28 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5
am:
1a419c7b2a
Change-Id: Ibb5f76a8dac6cf37d4115d3c277687fa96b08660
Wei Jia [Tue, 6 Jun 2017 20:27:45 +0000 (20:27 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3
am:
36eb1039cf
Change-Id: I62be2937991b3d2d9fdf5c4cd543d669ba2edfab
Ray Essick [Tue, 6 Jun 2017 20:21:35 +0000 (20:21 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c
am:
5944b611e5
Change-Id: I7f5f93f57aa77cb87fdf5155881ed9463e50ef0f
Wei Jia [Tue, 6 Jun 2017 20:21:13 +0000 (20:21 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb
am:
5e9a9442a3
Change-Id: I48abb4d5dfa84f3759dc7990b79a7495562a1376
Ray Essick [Tue, 6 Jun 2017 20:15:34 +0000 (20:15 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev
am:
021575025c
Change-Id: I5a5dd6e53b177854de9121bf7650f334a4fc67e9
Wei Jia [Tue, 6 Jun 2017 20:15:14 +0000 (20:15 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev
am:
2da03f40eb
Change-Id: I51de2fdbad57019904bcbc005e0fa85b6a8f54ed
Wei Jia [Tue, 6 Jun 2017 20:15:13 +0000 (20:15 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593 am:
8772f84f2c
am:
fc97c43c79
Change-Id: Icfb77facdc3883b0741b98584d7bc08acc5d158a
TreeHugger Robot [Tue, 6 Jun 2017 20:10:08 +0000 (20:10 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev
Wei Jia [Tue, 6 Jun 2017 20:09:12 +0000 (20:09 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593
am:
8772f84f2c
Change-Id: Iba4acd8b582f0cada22685b0dd5abd26a8c1ccde
TreeHugger Robot [Tue, 6 Jun 2017 20:05:05 +0000 (20:05 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev
Wei Jia [Tue, 6 Jun 2017 20:03:12 +0000 (20:03 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev
am:
6aed93d593
Change-Id: I3fc4c73813fa895796747b63ee849988f94f671a
TreeHugger Robot [Tue, 6 Jun 2017 19:52:49 +0000 (19:52 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev
Wei Jia [Tue, 6 Jun 2017 19:39:39 +0000 (19:39 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am:
3b1a9c3f1b
am:
2675f4cac9
Change-Id: Ia5f63cef5ead1153656f38b34ac4bc8ebb12ca59
Wei Jia [Tue, 6 Jun 2017 19:34:04 +0000 (19:34 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev
am:
3b1a9c3f1b
Change-Id: I2345da7f0816430a7a3eb1e42e411a41c4487a98
TreeHugger Robot [Tue, 6 Jun 2017 19:24:27 +0000 (19:24 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev
Wei Jia [Tue, 6 Jun 2017 19:17:01 +0000 (19:17 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am:
da924b45e1 am:
fdfad5899d am:
f3383881ff -s ours am:
486e62c5dd -s ours am:
98a5397265
am:
bb3d5445c9 -s ours
Change-Id: I7e16e397d557dd1ff164840fba537ad26627a401
Jeff Tinker [Tue, 6 Jun 2017 19:16:09 +0000 (19:16 +0000)]
Fix integer overflow in mediadrmserver am:
eb21712f81 am:
5250bc1bec
am:
d1a854a073
Change-Id: I212669c64a748fed506b8b4a90a568aa91d01787
Wei Jia [Tue, 6 Jun 2017 19:11:01 +0000 (19:11 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am:
da924b45e1 am:
fdfad5899d am:
f3383881ff -s ours am:
486e62c5dd -s ours
am:
98a5397265
Change-Id: I8ba30c335c44dbf14c07eab2f656f249af424abf
Jeff Tinker [Tue, 6 Jun 2017 19:10:38 +0000 (19:10 +0000)]
Fix integer overflow in mediadrmserver am:
eb21712f81
am:
5250bc1bec
Change-Id: Ic300845c6fd6aa383ee6661812e489f885ada14c
Wei Jia [Tue, 6 Jun 2017 19:06:01 +0000 (19:06 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am:
da924b45e1 am:
fdfad5899d am:
f3383881ff -s ours
am:
486e62c5dd -s ours
Change-Id: I8f9016674ff88f70bc421604c1fae0bd208979d9
Jeff Tinker [Tue, 6 Jun 2017 19:05:36 +0000 (19:05 +0000)]
Fix integer overflow in mediadrmserver
am:
eb21712f81
Change-Id: I0caf94590f85f444a4705f62792c27a447fa8b69
Wei Jia [Tue, 6 Jun 2017 18:59:39 +0000 (18:59 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am:
da924b45e1 am:
fdfad5899d
am:
f3383881ff -s ours
Change-Id: Ida0671401c4323f61ff63c4954522171efa2bcca
Wei Jia [Tue, 6 Jun 2017 18:54:07 +0000 (18:54 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am:
da924b45e1
am:
fdfad5899d
Change-Id: Ibfeec763c09ce978dd44d7cade7cb848b31aa528
Wei Jia [Tue, 6 Jun 2017 18:48:36 +0000 (18:48 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev
am:
da924b45e1
Change-Id: I346cc9a7df899bb760abb7eb99f684f0d40ceced
Wei Jia [Tue, 6 Jun 2017 18:39:58 +0000 (18:39 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev
OSDN Git Service
