OSDN Git Service
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: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: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 [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: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:49:47 +0000 (13:49 +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
Change-Id: Id2b44ecf0ce68d609f2a1270662a910a19f57a66
Ricardo Garcia [Wed, 7 Jun 2017 13:47:14 +0000 (13:47 +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
Change-Id: I3d1c813830c1a6abd834b08273b25415bed55d9b
Ricardo Garcia [Wed, 7 Jun 2017 13:44:14 +0000 (13:44 +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
Change-Id: I47e42971d14e7810a1af829826758bb684abce13
Ricardo Garcia [Wed, 7 Jun 2017 13:41:14 +0000 (13:41 +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
Change-Id: Ia434e713d3571890388e3560fef74c5f6594bed5
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:19:10 +0000 (05:19 +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 am:
eb7c508001 -s ours am:
8342e031ba -s ours am:
26151c1ac2 -s ours
am:
e4f5cdce47 -s ours
Change-Id: Iddbea1d12cecd6fabcb14410f89d3e2ac20cfc43
Pawin Vongmasa [Wed, 7 Jun 2017 05:16:39 +0000 (05:16 +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 am:
eb7c508001 -s ours am:
8342e031ba -s ours
am:
26151c1ac2 -s ours
Change-Id: I4824b21c74a63ef8737566683120fa8f7d868058
Pawin Vongmasa [Wed, 7 Jun 2017 05:14:08 +0000 (05:14 +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 am:
eb7c508001 -s ours
am:
8342e031ba -s ours
Change-Id: I1c17a2dfff3ce6986db59eb33efadbcb37c164ab
Pawin Vongmasa [Wed, 7 Jun 2017 05:11:39 +0000 (05:11 +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
am:
eb7c508001 -s ours
Change-Id: I42bfc18d2ee72c2c0e423404521b35c125a8fe19
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
Pawin Vongmasa [Wed, 7 Jun 2017 02:18:23 +0000 (02:18 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684 am:
11b3066c06
am:
5f0883c02a -s ours
Change-Id: I8f884d17ccd8c58a86d389633be80da08cd0e8d7
Pawin Vongmasa [Wed, 7 Jun 2017 02:15:55 +0000 (02:15 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684
am:
11b3066c06
Change-Id: I53089abb23af74febf92aa8c70ca807cb3213a63
Pawin Vongmasa [Wed, 7 Jun 2017 02:13:23 +0000 (02:13 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62
am:
adfbbe1684
Change-Id: I2c5cb01a4d8fbeaed1dbadc5cb1ab3b4a0f7d60e
Pawin Vongmasa [Wed, 7 Jun 2017 02:11:25 +0000 (02:11 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev
am:
ec2549aa62
Change-Id: Ifa4eeaf32cd5a7d5ab77c0e20d3ab5d5b811def5
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
TreeHugger Robot [Wed, 7 Jun 2017 01:04:43 +0000 (01:04 +0000)]
Merge "Check the buffer index from acquireBuffer" into nyc-dev
Andy Hung [Tue, 6 Jun 2017 21:15:26 +0000 (21:15 +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 am:
4d76e5bcd6 am:
f21d5b4580 am:
f0221a7dbe
am:
b26594e6ae
Change-Id: I4e3f2f389f80c4dd3f8775ce265f2059ff637f0d
Andy Hung [Tue, 6 Jun 2017 21:09:53 +0000 (21:09 +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 am:
4d76e5bcd6 am:
f21d5b4580
am:
f0221a7dbe
Change-Id: I15e7d315c71147e7798e8c81737000a3d0706f2d
Andy Hung [Tue, 6 Jun 2017 21:07:54 +0000 (21:07 +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 am:
4d76e5bcd6
am:
f21d5b4580
Change-Id: Ic809905d53a2443bc868894a029fd4625f006e87
Andy Hung [Tue, 6 Jun 2017 21:06:26 +0000 (21:06 +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
am:
4d76e5bcd6
Change-Id: If11f64ffbed4b890772eb2be984bb65c877199e4
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
Ray Essick [Tue, 6 Jun 2017 21:03:26 +0000 (21:03 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0 am:
1c1d3116d9
am:
f7350dd989
Change-Id: I811d91df28a5eb49f72e0add5c58165066a50891
Wei Jia [Tue, 6 Jun 2017 21:02:54 +0000 (21:02 +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 am:
a0f88fe10b am:
3905eac9c0 am:
1c724844d8
am:
ab6bb51371
Change-Id: Id7b3bf6e2a884982305b253d84c045287471c29a
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
Ray Essick [Tue, 6 Jun 2017 20:58:50 +0000 (20:58 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0
am:
1c1d3116d9
Change-Id: Id18428135190a66889802987c27289ba7fe6a806
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
Wei Jia [Tue, 6 Jun 2017 20:58:22 +0000 (20:58 +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 am:
a0f88fe10b am:
3905eac9c0
am:
1c724844d8
Change-Id: I962848bfd282a20a733be8b3e24a33df542a5f95
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
Ray Essick [Tue, 6 Jun 2017 20:53:43 +0000 (20:53 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c
am:
b9f302c2f0
Change-Id: I840dd96ff4825becf34a89dde03778c6fd61aeef
Wei Jia [Tue, 6 Jun 2017 20:53:21 +0000 (20:53 +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 am:
a0f88fe10b
am:
3905eac9c0
Change-Id: I51707915c0b284a597cfd56a72b4c09cc6158ab7
Ray Essick [Tue, 6 Jun 2017 20:50:19 +0000 (20:50 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7
am:
be560fcb1c
Change-Id: Ia48ab3048f31dbf53c2c5dd78044fc9dd1b855bf
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
Wei Jia [Tue, 6 Jun 2017 20:49:51 +0000 (20:49 +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
am:
a0f88fe10b
Change-Id: I08ea2f520efb37c10fb25a193175fb5f7c0263a3
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
Wei Jia [Tue, 6 Jun 2017 20:45:12 +0000 (20:45 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593 am:
8772f84f2c am:
fc97c43c79 am:
c572616245 am:
0c2592782f am:
a4a232c7d4
am:
d8de34f60c
Change-Id: If0555114cd444c5340c5dbbd1e110a5d063ff210
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
Wei Jia [Tue, 6 Jun 2017 20:40:06 +0000 (20:40 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593 am:
8772f84f2c am:
fc97c43c79 am:
c572616245 am:
0c2592782f
am:
a4a232c7d4
Change-Id: I24e7e5e6d178dbfacd156ca1ae99e22297d61b48
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
Wei Jia [Tue, 6 Jun 2017 20:29:47 +0000 (20:29 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593 am:
8772f84f2c am:
fc97c43c79 am:
c572616245
am:
0c2592782f
Change-Id: Ib17e3a67871a039b1665742c5cb6b74e931a88ec
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:14 +0000 (20:21 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593 am:
8772f84f2c am:
fc97c43c79
am:
c572616245
Change-Id: If16b6f9fc5b859fd913bbbf2a03afff59b8ac26c
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
OSDN Git Service
