OSDN Git Service
Wei Jia [Wed, 25 May 2016 18:45:07 +0000 (18:45 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am:
b016207fc2 am:
e2ca751723
am:
3d1df4f411 -s ours
* commit '
3d1df4f411a531fb30cc8563cb39e732041d22ad':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: Id6ce35c59190c3d94129e8ec4c1f2aef108fa71a
Wei Jia [Wed, 25 May 2016 18:37:08 +0000 (18:37 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am:
b016207fc2
am:
e2ca751723
* commit '
e2ca7517232e2df2dc16d358809d7e4723827c42':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: Ia1dd264fc19f8c82a59a5e2656375f2c2c4403ff
Wei Jia [Wed, 25 May 2016 18:29:43 +0000 (18:29 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
am:
b016207fc2
* commit '
b016207fc2442420e8d3a8633575ffe4fc29fef3':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: I81cdae1a917cfcd712e800cf3edfd168b1c89c32
Wei Jia [Fri, 28 Aug 2015 17:35:35 +0000 (10:35 -0700)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
GenericSource: return error when no track exists.
SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.
Bug:
21657957
Bug:
23705695
Bug:
22802344
Bug:
28799341
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
(cherry picked from commit
0386c91b8a910a134e5898ffa924c1b6c7560b13)
Marco Nelissen [Mon, 23 May 2016 22:54:45 +0000 (22:54 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3
am:
e816dcc0b3 -s ours
* commit '
e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996':
DO NOT MERGE limit mediaserver memory
Change-Id: Ia2bb13dbcbe30984d86c1a625ded2db5ddbbca2d
Marco Nelissen [Mon, 23 May 2016 22:50:37 +0000 (22:50 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14
am:
38ab87c3e3
* commit '
38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a':
DO NOT MERGE limit mediaserver memory
Change-Id: I053031830618e20ff830ae3c097abba10ae73cfc
Marco Nelissen [Mon, 23 May 2016 22:46:23 +0000 (22:46 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
am:
f8429c0c14
* commit '
f8429c0c147b081ff6f06f55f8fa2f36fc60063e':
DO NOT MERGE limit mediaserver memory
Change-Id: Ia88648ff82be88a90c98ded3061a6f04db74c03b
Marco Nelissen [Mon, 23 May 2016 22:36:20 +0000 (22:36 +0000)]
Merge "limit mediaserver memory" into lmp-dev
Marco Nelissen [Mon, 23 May 2016 22:35:11 +0000 (22:35 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
Marco Nelissen [Fri, 13 May 2016 17:43:19 +0000 (10:43 -0700)]
DO NOT MERGE limit mediaserver memory
Limit mediaserver using rlimit, to prevent it from bringing down the system
via the low memory killer.
Default max is 65% of total RAM, but can be customized via system property.
Bug:
28471206
Bug:
28615448
Change-Id: I14fac1e12b5f3983be08a21bfbfc54feedbf3f16
Marco Nelissen [Mon, 23 May 2016 14:43:28 +0000 (14:43 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791 am:
9897bd43a6
am:
8fd8bfdfbd -s ours
* commit '
8fd8bfdfbd930cdc669c4fc33d7d251f12ec7e5e':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: I97bc664b28a9e96051d0bc63c4cc4501bd2f901b
Marco Nelissen [Mon, 23 May 2016 14:40:27 +0000 (14:40 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791
am:
9897bd43a6
* commit '
9897bd43a614c28e6c52dcbce817d9ef6f201ccc':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: Ia9f97994af54fff11644f7d59821e8ddf6fb54f1
Marco Nelissen [Mon, 23 May 2016 14:37:29 +0000 (14:37 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
am:
fddbb1a791
* commit '
fddbb1a791975adfa1323377b09606ad44122ff2':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: Idf65c8e5520e1c2a4571ea434f0114ae13334e7b
Marco Nelissen [Mon, 23 May 2016 14:32:55 +0000 (14:32 +0000)]
Merge "Check malloc result to avoid NPD" into lmp-dev
Marco Nelissen [Mon, 23 May 2016 14:32:45 +0000 (14:32 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
Marco Nelissen [Fri, 13 May 2016 17:39:23 +0000 (10:39 -0700)]
limit mediaserver memory
Limit mediaserver using rlimit, to prevent it from bringing down the system
via the low memory killer.
Default max is 65% of total RAM, but can be customized via system property.
Bug:
28471206
Bug:
28615448
Change-Id: Ic84137435d1ef0a6883e9789a4b4f399e4283f05
Jeff Tinker [Fri, 13 May 2016 21:20:29 +0000 (21:20 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev am:
eb37c37c59 am:
883b244f45
am:
31a3aa5628
* commit '
31a3aa56287d63aaf1ac804cc04154ed779032ff':
Fix security vulnerability in libstagefright
Change-Id: I4d666e42bfc64e384b9fd8c8fad07d645be6a19a
Jeff Tinker [Fri, 13 May 2016 21:17:31 +0000 (21:17 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev am:
eb37c37c59
am:
883b244f45
* commit '
883b244f4567fe0cd099f0583940e531eb0e2af4':
Fix security vulnerability in libstagefright
Change-Id: Idd0798f74590e2546c4f0d1b0940ccf7e42f5a17
Jeff Tinker [Fri, 13 May 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev
am:
eb37c37c59
* commit '
eb37c37c594604d0e6acbf14be6e04e065fab226':
Fix security vulnerability in libstagefright
Change-Id: Icaecc46c13c06e6eff0167bbc1af4c580d161f62
Jeff Tinker [Fri, 13 May 2016 21:08:15 +0000 (21:08 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev
Marco Nelissen [Wed, 11 May 2016 18:11:20 +0000 (11:11 -0700)]
Check malloc result to avoid NPD
Bug:
28471206
Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
Marco Nelissen [Wed, 11 May 2016 18:11:20 +0000 (11:11 -0700)]
DO NOT MERGE Check malloc result to avoid NPD
Bug:
28471206
Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
Pawin Vongmasa [Fri, 13 May 2016 19:48:56 +0000 (19:48 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow. am:
87277aac64 am:
2a68d5279d
am:
5dfa5f268e
* commit '
5dfa5f268e97d862744ffddc4596577495022bea':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I30bba39d44061c72485419ac8686fba2427e3328
Pawin Vongmasa [Fri, 13 May 2016 19:46:20 +0000 (19:46 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow. am:
87277aac64
am:
2a68d5279d
* commit '
2a68d5279d714188c50a32819ae0d0ed2535a763':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I00c30eb03aab08cb86afa34ab3e7a86a176b4dda
Pawin Vongmasa [Fri, 13 May 2016 19:43:42 +0000 (19:43 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow.
am:
87277aac64
* commit '
87277aac64a21461b657298dcdcb809737347980':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I87166daa0493721d44a10531466b59080b65f153
Jeff Tinker [Fri, 13 May 2016 18:48:11 +0000 (11:48 -0700)]
Fix security vulnerability in libstagefright
bug:
28175045
Change-Id: Icee6c7eb5b761da4aa3e412fb71825508d74d38f
Pawin Vongmasa [Wed, 11 May 2016 23:08:21 +0000 (16:08 -0700)]
h264bsdActivateParamSets: Prevent multiplication overflow.
Report MEMORY_ALLOCATION_ERROR if pStorage->picSizeInMbs would
exceed UINT32_MAX bytes.
Bug:
28532266
Change-Id: Ia6f11efb18818afcdb5fa2a38a14f2a2d8c8447a
Marco Nelissen [Tue, 3 May 2016 23:25:22 +0000 (23:25 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev am:
71095f174e am:
4b817b51e2
am:
2d4cf313fa
* commit '
2d4cf313fa141d11cfae7c31797da114598d8ed7':
Clear unused pointer field when sending across binder
Change-Id: I0d1569e886ff40a43423cdbf83ed5d04e35f2d07
Marco Nelissen [Tue, 3 May 2016 23:23:01 +0000 (23:23 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev am:
71095f174e
am:
4b817b51e2
* commit '
4b817b51e2998719037f362c7b70ee71c76abeb8':
Clear unused pointer field when sending across binder
Change-Id: I6d09ecb88cf32f2c720dd0ec66964ec94ad210da
Marco Nelissen [Tue, 3 May 2016 23:20:38 +0000 (23:20 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev
am:
71095f174e
* commit '
71095f174e8b88e008623b4cacd4ec0581b9015c':
Clear unused pointer field when sending across binder
Change-Id: I5d6dee2901dca6c63ed41abf5d1165ac85a69d7e
Marco Nelissen [Tue, 3 May 2016 23:15:43 +0000 (23:15 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev
Marco Nelissen [Mon, 2 May 2016 21:12:34 +0000 (14:12 -0700)]
Clear unused pointer field when sending across binder
Bug:
28377502
Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98
Marco Nelissen [Fri, 22 Apr 2016 19:01:04 +0000 (19:01 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into lmp-dev
Marco Nelissen [Fri, 22 Apr 2016 18:17:18 +0000 (18:17 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:
c002126cb0 am:
e25ff0130e
am:
f54f5b54bd -s ours
* commit '
f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6':
DO NOT MERGE More OMX struct checking
Change-Id: I4c079e3f5ac920005dcbba2af992312fbf35f5bc
Marco Nelissen [Fri, 22 Apr 2016 18:15:07 +0000 (18:15 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:
c002126cb0
am:
e25ff0130e
* commit '
e25ff0130ef9fa184afb87e92c184172c8a96f71':
DO NOT MERGE More OMX struct checking
Change-Id: Ia9767e906a247c330031837c3b0b6415e319c836
Marco Nelissen [Fri, 22 Apr 2016 18:12:58 +0000 (18:12 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev
am:
c002126cb0
* commit '
c002126cb05b1d640c0a0b51bc0de810a62ab2b1':
DO NOT MERGE More OMX struct checking
Change-Id: I206ad72ac3ed1da96b417dd9cbe170e0a0dd1d66
Marco Nelissen [Fri, 22 Apr 2016 17:45:56 +0000 (17:45 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev
Marco Nelissen [Fri, 22 Apr 2016 14:54:04 +0000 (07:54 -0700)]
DO NOT MERGE More OMX struct checking
These were lost due to bad merges.
Bug:
27207275
Change-Id: Ia0f403d7aef79a8e0ac618eb49b34dbf9faa25c2
Marco Nelissen [Fri, 22 Apr 2016 14:55:10 +0000 (07:55 -0700)]
DO NOT MERGE More OMX struct checking
These were lost due to bad merges.
Bug:
27207275
Change-Id: Idc7a9fc75376a88b91e9e259d664d6ee54c77330
Pawin Vongmasa [Thu, 21 Apr 2016 18:59:33 +0000 (18:59 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789. am:
70dec4dc7d am:
a1e309beb9
am:
63e9b57353
* commit '
63e9b573530837702e42e00900407bbe9fdae952':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: Idcf74c810152b7160cf99aa25fe664c6b40f0750
Pawin Vongmasa [Thu, 21 Apr 2016 18:57:16 +0000 (18:57 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789. am:
70dec4dc7d
am:
a1e309beb9
* commit '
a1e309beb98e8fb35422102717af4f973ef1f34b':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: I1dd3ffd9a489453d0f66c0344f52c6efecf31b2e
Pawin Vongmasa [Thu, 21 Apr 2016 18:55:02 +0000 (18:55 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
am:
70dec4dc7d
* commit '
70dec4dc7d1d813afaff58fb26b0fd7127e897bf':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: Ie3a265ed0dc34c544b0793dce06434ec64f9bacf
Pawin Vongmasa [Wed, 20 Apr 2016 22:51:48 +0000 (15:51 -0700)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Detail: Before the original fix
(Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9) for
28076789, the
code allowed a time-to-sample table size to be 0. The change
made in that fix disallowed such situation, which in fact should
be allowed. This current patch allows it again while maintaining
the security of the previous fix.
Bug:
28288202
Bug:
28076789
Change-Id: I1c9a60c7f0cfcbd3d908f24998dde15d5136a295
Wonsik Kim [Mon, 18 Apr 2016 05:01:48 +0000 (05:01 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am:
7cab953 am:
f249b0f
am:
9345299 -s ours
* commit '
9345299e27e68b524c4b606d178802a4e7289aa1':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: I50f3feb751614bf8ef8f7e0c3214ef9d1c0632f9
Wonsik Kim [Mon, 18 Apr 2016 04:56:57 +0000 (04:56 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am:
7cab953
am:
f249b0f
* commit '
f249b0fe1d2602d07da8bfeb64bc64518a0ec46a':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: I87ec36dcfaccae4fa8d7cb247651704c7ef0e4d3
Wonsik Kim [Mon, 18 Apr 2016 04:52:07 +0000 (04:52 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev
am:
7cab953
* commit '
7cab953629b615cfe5fec8f56266996bc17307b5':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: Icbd07fb9f62bb4f1381f6573188d32c8f126dc90
Wonsik Kim [Mon, 18 Apr 2016 04:40:03 +0000 (04:40 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into lmp-dev
Wonsik Kim [Mon, 18 Apr 2016 04:39:54 +0000 (04:39 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev
Pawin Vongmasa [Sat, 16 Apr 2016 00:11:25 +0000 (00:11 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527 am:
e896c41
am:
a0970c9
* commit '
a0970c9faabdaca647cb22b78432511de3220399':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I7d7e410e25d8a5b1066251cae8cddfa050b07f71
Pawin Vongmasa [Sat, 16 Apr 2016 00:09:00 +0000 (00:09 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527
am:
e896c41
* commit '
e896c41d85a15de06c74885fe040f3f57b63cd5d':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7
Pawin Vongmasa [Sat, 16 Apr 2016 00:06:36 +0000 (00:06 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
am:
5964527
* commit '
59645279f48b3ae83ab42445148ea236c5dc72c4':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I37ea7cd16f1e0fcf2ce14d6687de080a7c0931c1
Pawin Vongmasa [Sat, 16 Apr 2016 00:01:22 +0000 (00:01 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
Pawin Vongmasa [Wed, 13 Apr 2016 23:25:12 +0000 (16:25 -0700)]
SampleTable.cpp: Prevent corrupted stts block from causing
excessive memory allocation.
Details:
DataSource.h
- Added function getVector() for reading from a data source into
a Vector object, whose capacity grows only as much as needed
(in case of EOS or reading error).
SampleTable.h
- Changed the type of mTimeToSample from uint32_t* to
Vector<uint32_t>.
SampleTable.cpp
- In setTimeToSample, modified the code to use getVector()
instead of readAt(). If the input source has a corrupt
time-to-sample table size that is too big, EOS will be reached
before the whole table is read, and the return value from
getVector() will be false.
- Also, tightened the bound for the provided time-to-sample table
size to guarantee that the table does not take more than
UINT_MAX32 bytes in memory.
Bug:
28076789
Change-Id: Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9
Marco Nelissen [Wed, 13 Apr 2016 22:25:40 +0000 (22:25 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713 am:
d504c68
am:
9f3762d
* commit '
9f3762d8c76b778c8f600486a464838731105b09':
h264dec: check for overflows when calculating allocation size.
Change-Id: Iefdde609316ffa6fb9037f24d3865980633cd4b9
Marco Nelissen [Wed, 13 Apr 2016 22:21:11 +0000 (22:21 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713
am:
d504c68
* commit '
d504c68310bf86e24321a7260c2ecdd9962c8b3b':
h264dec: check for overflows when calculating allocation size.
Change-Id: Iabbe0fcaf14241d1aa01184c61f1ecb134c16fe8
Marco Nelissen [Wed, 13 Apr 2016 22:17:37 +0000 (22:17 +0000)]
h264dec: check for overflows when calculating allocation size.
am:
a3dd713
* commit '
a3dd713893658baf50df88b261aba83bb0c40687':
h264dec: check for overflows when calculating allocation size.
Change-Id: Ie1acdd0ddaddce72f9072abf288db29ab3d75fc1
Marco Nelissen [Fri, 8 Apr 2016 17:04:48 +0000 (10:04 -0700)]
h264dec: check for overflows when calculating allocation size.
Bug:
27855419
Change-Id: Idabedca52913ec31ea5cb6a6109ab94e3fb2badd
Wonsik Kim [Fri, 8 Apr 2016 01:21:00 +0000 (01:21 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev am:
52636f8 am:
9f83485
am:
eedc29f -s ours
* commit '
eedc29f89632a98ada144ed149550c172d8094e0':
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Change-Id: I3390e470da8952969f6347176f885bf112074d46
Wonsik Kim [Fri, 8 Apr 2016 01:21:00 +0000 (01:21 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev am:
f81eab3 am:
eec4dd5
am:
d3e0de0 -s ours
* commit '
d3e0de0d55027eeb2744d464a6ad0cdb7d47f826':
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Change-Id: I0a9e8410a11b4139298371c04ce7f161f3dce158
Wonsik Kim [Fri, 8 Apr 2016 01:17:12 +0000 (01:17 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev am:
52636f8
am:
9f83485
* commit '
9f834853a28d20ee9b218b0c8e68ff38b48f5743':
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Change-Id: I6cd36d4986fb6c96b7e01d9cdff3e7cd77f0f951
Wonsik Kim [Fri, 8 Apr 2016 01:17:11 +0000 (01:17 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev am:
f81eab3
am:
eec4dd5
* commit '
eec4dd5f859d6e8d0d77f03c1ad27ba720bf2e04':
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Change-Id: I85cbc2e7d30332bf163599b36a518387796658c6
Wonsik Kim [Fri, 8 Apr 2016 01:13:27 +0000 (01:13 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
am:
52636f8
* commit '
52636f8462b2a24f77524ca912e3579c33ac113e':
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Change-Id: I63431cdcbe2903ca51b43ce4cddc13a0c62f6bae
Wonsik Kim [Fri, 8 Apr 2016 01:13:26 +0000 (01:13 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev
am:
f81eab3
* commit '
f81eab31874a6cf40e1f265b0c47cbe6b137d407':
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Change-Id: Ie9c95c1847cc3e2a1a9ef3aeafbeb0aedf262a42
Wonsik Kim [Fri, 8 Apr 2016 01:05:03 +0000 (01:05 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
Wonsik Kim [Fri, 8 Apr 2016 01:04:52 +0000 (01:04 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec" into lmp-dev
Wonsik Kim [Fri, 8 Apr 2016 01:04:20 +0000 (01:04 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in hevcdec" into lmp-dev
Wonsik Kim [Fri, 8 Apr 2016 01:04:05 +0000 (01:04 +0000)]
Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev
Wonsik Kim [Fri, 8 Apr 2016 01:03:55 +0000 (01:03 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev
Wonsik Kim [Thu, 7 Apr 2016 08:45:02 +0000 (17:45 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Bug:
27793163
Bug:
27793367
Change-Id: Iec3de8a237ee2379d87a8371c13e543878c6652c
Wonsik Kim [Thu, 7 Apr 2016 08:45:02 +0000 (17:45 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Bug:
27793163
Bug:
27793367
Change-Id: Iec3de8a237ee2379d87a8371c13e543878c6652c
Marco Nelissen [Thu, 7 Apr 2016 21:37:36 +0000 (21:37 +0000)]
Merge "Check mp3 output buffer size" into klp-dev am:
bc736f6 am:
44ef399
am:
a70a752
* commit '
a70a752e110d436c24195037e3ade612fe2d15bd':
Check mp3 output buffer size
Change-Id: Ic909905135d8871ebbef12515b69761bf3e42452
Marco Nelissen [Thu, 7 Apr 2016 21:34:42 +0000 (21:34 +0000)]
Merge "Check mp3 output buffer size" into klp-dev am:
bc736f6
am:
44ef399
* commit '
44ef399573ddf6be54f4ab1c049a9d022a44bb60':
Check mp3 output buffer size
Change-Id: Ie3514d66b68a9add1e4c24b940f41df9cf31fb6e
Marco Nelissen [Thu, 7 Apr 2016 21:30:22 +0000 (21:30 +0000)]
Merge "Check mp3 output buffer size" into klp-dev
am:
bc736f6
* commit '
bc736f650daeacce241c1f1e9c1b3ac28b5befe1':
Check mp3 output buffer size
Change-Id: Iecf266fb05e72b245db1acf3bdc380c771ccabf8
Marco Nelissen [Thu, 7 Apr 2016 21:24:52 +0000 (21:24 +0000)]
Merge "Check mp3 output buffer size" into klp-dev
Marco Nelissen [Thu, 7 Apr 2016 20:35:40 +0000 (20:35 +0000)]
AudioSource: initialize variables am:
a2f5b80 am:
67e0eb7
am:
9c67287
* commit '
9c67287c64a8535b86aa4a46ca4fdbc9859b40b5':
AudioSource: initialize variables
Change-Id: I55e1d069317e6a0e9da0ff8babead6d0248287dd
Marco Nelissen [Thu, 7 Apr 2016 20:32:12 +0000 (20:32 +0000)]
AudioSource: initialize variables am:
a2f5b80
am:
67e0eb7
* commit '
67e0eb763d50b7811176f97553934dcc8dca4328':
AudioSource: initialize variables
Change-Id: Ia3456efeff3fa722b93510a2428ec88e86394bce
Marco Nelissen [Thu, 7 Apr 2016 20:28:42 +0000 (20:28 +0000)]
AudioSource: initialize variables
am:
a2f5b80
* commit '
a2f5b80a54ac3cd0f7dcfbb4d87eaf2f5ab99557':
AudioSource: initialize variables
Change-Id: I8038fc4d98c868070139d8d26832cbc32af7144a
Marco Nelissen [Tue, 5 Apr 2016 21:20:11 +0000 (14:20 -0700)]
AudioSource: initialize variables
to prevent info leak
Bug:
27855172
Change-Id: I3d33e0a9cc5cf8a758d7b0794590b09c43a24561
Marco Nelissen [Wed, 23 Mar 2016 22:36:36 +0000 (15:36 -0700)]
Check mp3 output buffer size
Bug:
27793371
Change-Id: I0fe40a4cfd0a5b488f93d3f3ba6f9495235926ac
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Bug:
27833616
Change-Id: I0fd599b3da431425d89236ffdd9df423c11947c0
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
codecs: check OMX buffer size before use in (h263|h264)dec
Bug:
27833616
Change-Id: I0fd599b3da431425d89236ffdd9df423c11947c0
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in hevcdec
Bug:
27833616
Change-Id: Ic4045a3f56f53b08d0b1264b2a91b8f43e91b738
Wonsik Kim [Wed, 30 Mar 2016 08:13:00 +0000 (17:13 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec
Bug:
27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
Wonsik Kim [Wed, 30 Mar 2016 08:13:00 +0000 (17:13 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Bug:
27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
Wei Jia [Fri, 25 Mar 2016 21:34:50 +0000 (21:34 +0000)]
Merge "SampleTable: reduce unnecessary logging message." into klp-dev am:
f305afb
am:
e678675
* commit '
e678675e63e927d6b16123d40981c3a36e95d0b0':
SampleTable: reduce unnecessary logging message.
Wei Jia [Fri, 25 Mar 2016 21:32:13 +0000 (21:32 +0000)]
Merge "SampleTable: reduce unnecessary logging message." into klp-dev
am:
f305afb
* commit '
f305afb6eeeebd066f34c2b2c514bd4342182200':
SampleTable: reduce unnecessary logging message.
Wei Jia [Fri, 25 Mar 2016 21:22:40 +0000 (21:22 +0000)]
Merge "SampleTable: reduce unnecessary logging message." into klp-dev
Marco Nelissen [Fri, 25 Mar 2016 17:23:28 +0000 (17:23 +0000)]
Fix AMR decoder am:
d061b5b
am:
988aae8
* commit '
988aae8467be145c0513b8f5abb0f76f87112492':
Fix AMR decoder
Marco Nelissen [Fri, 25 Mar 2016 17:18:37 +0000 (17:18 +0000)]
Fix AMR decoder
am:
d061b5b
* commit '
d061b5b120082c9445670ebc95c5edade9ea4505':
Fix AMR decoder
Marco Nelissen [Fri, 25 Mar 2016 15:26:18 +0000 (08:26 -0700)]
Fix AMR decoder
Previous change caused EOS to be ignored.
Bug:
27843673
Related-to-bug:
27662364
Change-Id: Ia148a88abc861a9b393f42bc7cd63d8d3ae349bc
Wei Jia [Thu, 24 Mar 2016 17:58:04 +0000 (10:58 -0700)]
SampleTable: reduce unnecessary logging message.
Bug:
23247055
Change-Id: Ida0021160532623c6e72bd5bb0bb2a24332d1c34
Wei Jia [Thu, 24 Mar 2016 17:08:05 +0000 (17:08 +0000)]
SampleTable: add logging. am:
c27cee3
am:
6f12959
* commit '
6f129593720f80ecce9fa1d9f6d4012b197411b7':
SampleTable: add logging.
Wei Jia [Thu, 24 Mar 2016 17:05:45 +0000 (17:05 +0000)]
SampleTable: add logging.
am:
c27cee3
* commit '
c27cee30d9359fa83e33b4f87f88e6bb9ef66341':
SampleTable: add logging.
Wei Jia [Thu, 24 Mar 2016 16:41:24 +0000 (09:41 -0700)]
SampleTable: add logging.
Bug:
23247055
Change-Id: Id45f9815c1b3cdfaae664508204a6ce1c1da4532
Wonsik Kim [Tue, 22 Mar 2016 22:48:18 +0000 (22:48 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev am:
4f99823
am:
a573cea -s ours
* commit '
a573cea08c59f0b40a572930c22a0debeca664b9':
DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.
Wonsik Kim [Tue, 22 Mar 2016 22:44:30 +0000 (22:44 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev
am:
4f99823
* commit '
4f99823535e09f1a72231b48551b3162d1c5060e':
DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.
Wonsik Kim [Tue, 22 Mar 2016 22:31:16 +0000 (22:31 +0000)]
Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev
Wonsik Kim [Tue, 22 Mar 2016 22:31:01 +0000 (22:31 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev
Robert Shih [Tue, 22 Mar 2016 20:59:08 +0000 (20:59 +0000)]
Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am:
4fa31b5
am:
6ee73da
* commit '
6ee73dabbf1774517d5d4afcefad4e9f71c6df9b':
NuPlayerStreamListener: NULL and bounds check before memcpy
Robert Shih [Tue, 22 Mar 2016 20:56:01 +0000 (20:56 +0000)]
Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev
am:
4fa31b5
* commit '
4fa31b5d858e11df241d6518cb06eea5b0adb3d6':
NuPlayerStreamListener: NULL and bounds check before memcpy
OSDN Git Service
