OSDN Git Service

android-x86/frameworks-av.git
8 years agoh264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d
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

8 years agoh264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64
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

8 years agoh264bsdActivateParamSets: Prevent multiplication overflow.
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

8 years agoh264bsdActivateParamSets: Prevent multiplication overflow.
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

8 years agoMerge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f...
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

8 years agoMerge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e
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

8 years agoMerge "Clear unused pointer field when sending across binder" into klp-dev
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

8 years agoMerge "Clear unused pointer field when sending across binder" into klp-dev
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

8 years agoClear unused pointer field when sending across binder
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

8 years agoMerge "DO NOT MERGE More OMX struct checking" into lmp-dev
Marco Nelissen [Fri, 22 Apr 2016 19:01:04 +0000 (19:01 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into lmp-dev

8 years agoMerge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126cb0 am: e25ff0130e
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

8 years agoMerge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126cb0
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

8 years agoMerge "DO NOT MERGE More OMX struct checking" into klp-dev
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

8 years agoMerge "DO NOT MERGE More OMX struct checking" into klp-dev
Marco Nelissen [Fri, 22 Apr 2016 17:45:56 +0000 (17:45 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev

8 years agoDO NOT MERGE More OMX struct checking
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

8 years agoDO NOT MERGE More OMX struct checking
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

8 years agoSampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d...
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

8 years agoSampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d
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

8 years agoSampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.
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

8 years agoSampleTable.cpp: Fixed a regression caused by a fix for bug
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into...
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

8 years agoMerge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory...
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

8 years agoMerge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory...
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

8 years agoMerge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory...
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

8 years agoMerge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory...
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

8 years agoSampleTable.cpp: Prevent corrupted stts block from causing
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

8 years agoh264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68
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

8 years agoh264dec: check for overflows when calculating allocation size. am: a3dd713
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

8 years agoh264dec: check for overflows when calculating allocation size.
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

8 years agoh264dec: check for overflows when calculating allocation size.
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec...
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in hevcdec" 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

8 years agoMerge "codecs: check OMX buffer size before use in (h263|h264)dec" 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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into...
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

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
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

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
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

8 years agoMerge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399
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

8 years agoMerge "Check mp3 output buffer size" into klp-dev am: bc736f6
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

8 years agoMerge "Check mp3 output buffer size" into klp-dev
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

8 years agoMerge "Check mp3 output buffer size" into klp-dev
Marco Nelissen [Thu, 7 Apr 2016 21:24:52 +0000 (21:24 +0000)]
Merge "Check mp3 output buffer size" into klp-dev

8 years agoAudioSource: initialize variables am: a2f5b80 am: 67e0eb7
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

8 years agoAudioSource: initialize variables am: a2f5b80
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

8 years agoAudioSource: initialize variables
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

8 years agoAudioSource: initialize variables
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

8 years agoCheck mp3 output buffer size
Marco Nelissen [Wed, 23 Mar 2016 22:36:36 +0000 (15:36 -0700)]
Check mp3 output buffer size

Bug: 27793371
Change-Id: I0fe40a4cfd0a5b488f93d3f3ba6f9495235926ac

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
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

8 years agocodecs: check OMX buffer size before use in (h263|h264)dec
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

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in hevcdec
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

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec
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

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
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

8 years agoMerge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb
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.

8 years agoMerge "SampleTable: reduce unnecessary logging message." into klp-dev
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.

8 years agoMerge "SampleTable: reduce unnecessary logging message." into klp-dev
Wei Jia [Fri, 25 Mar 2016 21:22:40 +0000 (21:22 +0000)]
Merge "SampleTable: reduce unnecessary logging message." into klp-dev

8 years agoFix AMR decoder am: d061b5b
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

8 years agoFix 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

8 years agoFix 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

8 years agoSampleTable: reduce unnecessary logging message.
Wei Jia [Thu, 24 Mar 2016 17:58:04 +0000 (10:58 -0700)]
SampleTable: reduce unnecessary logging message.

Bug: 23247055
Change-Id: Ida0021160532623c6e72bd5bb0bb2a24332d1c34

8 years agoSampleTable: add logging. am: c27cee3
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.

8 years agoSampleTable: 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.

8 years agoSampleTable: add logging.
Wei Jia [Thu, 24 Mar 2016 16:41:24 +0000 (09:41 -0700)]
SampleTable: add logging.

Bug: 23247055
Change-Id: Id45f9815c1b3cdfaae664508204a6ce1c1da4532

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into...
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.

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into...
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.

8 years agoMerge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev
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

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into...
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

8 years agoMerge "NuPlayerStreamListener: NULL and bounds check before memcpy" 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

8 years agoMerge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev
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

8 years agoMerge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev
Marco Nelissen [Tue, 22 Mar 2016 20:43:54 +0000 (20:43 +0000)]
Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev

8 years agoSoftAMR: check input buffer size to avoid overflow. am: 55e5218
Wei Jia [Tue, 22 Mar 2016 18:06:02 +0000 (18:06 +0000)]
SoftAMR: check input buffer size to avoid overflow. am: 55e5218
am: 4a9d762

* commit '4a9d762d2539fd2108803741da4366500253c564':
  SoftAMR: check input buffer size to avoid overflow.

8 years agoSoftAMR: check input buffer size to avoid overflow.
Wei Jia [Tue, 22 Mar 2016 18:03:02 +0000 (18:03 +0000)]
SoftAMR: check input buffer size to avoid overflow.
am: 55e5218

* commit '55e5218fd53f4da5c1fbad539ed960c04a883b0b':
  SoftAMR: check input buffer size to avoid overflow.

8 years agoSoftAMR: check output buffer size to avoid overflow. am: a3536c6
Wei Jia [Tue, 22 Mar 2016 17:45:00 +0000 (17:45 +0000)]
SoftAMR: check output buffer size to avoid overflow. am: a3536c6
am: 1d8b35d

* commit '1d8b35d7f0af76778ad355543b6f2eb88c6316e3':
  SoftAMR: check output buffer size to avoid overflow.

8 years agoSoftAMR: check output buffer size to avoid overflow.
Wei Jia [Tue, 22 Mar 2016 17:42:19 +0000 (17:42 +0000)]
SoftAMR: check output buffer size to avoid overflow.
am: a3536c6

* commit 'a3536c61c6b6c77e199cc207cbf1e5c5b063cf91':
  SoftAMR: check output buffer size to avoid overflow.

8 years agoSoftAMR: check input buffer size to avoid overflow.
Wei Jia [Sat, 19 Mar 2016 01:17:14 +0000 (18:17 -0700)]
SoftAMR: check input buffer size to avoid overflow.

Bug: 27662364
Change-Id: I47380545ea7d85845e141e722b0d84f498d27145

8 years agoSoftAMR: check output buffer size to avoid overflow.
Wei Jia [Thu, 17 Mar 2016 18:15:02 +0000 (11:15 -0700)]
SoftAMR: check output buffer size to avoid overflow.

Bug: 27662364
Change-Id: I7b26892c41d6f2e690e77478ab855c2fed1ff6b0

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.

Bug: 27569635
Change-Id: I469573f40e21dc9f4c200749d4f220e3a2d31761

8 years agocodecs: check OMX buffer size before use in VP8 encoder.
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
codecs: check OMX buffer size before use in VP8 encoder.

Bug: 27569635
Change-Id: I469573f40e21dc9f4c200749d4f220e3a2d31761

8 years agoMerge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62
Chien-Yu Chen [Mon, 21 Mar 2016 18:29:38 +0000 (18:29 +0000)]
Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62
am: e57ada1

* commit 'e57ada1277564469704810aa0ceb353787475c68':
  Camera3Device: Validate template ID

8 years agoMerge "Camera3Device: Validate template ID" into klp-dev
Chien-Yu Chen [Mon, 21 Mar 2016 18:24:47 +0000 (18:24 +0000)]
Merge "Camera3Device: Validate template ID" into klp-dev
am: ac5ef62

* commit 'ac5ef6284656864eca089da83edfd062ea8139b7':
  Camera3Device: Validate template ID

8 years agoMerge "Camera3Device: Validate template ID" into klp-dev
Chien-Yu Chen [Mon, 21 Mar 2016 18:15:07 +0000 (18:15 +0000)]
Merge "Camera3Device: Validate template ID" into klp-dev

8 years agoNuPlayerStreamListener: NULL and bounds check before memcpy
Robert Shih [Fri, 18 Mar 2016 21:34:57 +0000 (14:34 -0700)]
NuPlayerStreamListener: NULL and bounds check before memcpy

Bug: 27533704
Change-Id: I992a7709b92b1cbc3114c97bec48a3fc5b22ba6e

8 years agoCamera3Device: Validate template ID
Chien-Yu Chen [Wed, 9 Mar 2016 20:21:01 +0000 (12:21 -0800)]
Camera3Device: Validate template ID

Validate template ID before creating a default request.

Bug: 26866110
Bug: 27568958
Change-Id: Ifda457024f1d5c2b1382f189c1a8d5fda852d30d

8 years agoDO NOT MERGE Add VPX output buffer size check am: 1595f8a
Marco Nelissen [Fri, 18 Mar 2016 17:45:45 +0000 (17:45 +0000)]
DO NOT MERGE Add VPX output buffer size check am: 1595f8a
am: 5d44fff  -s ours

* commit '5d44fff74dea989e51236d89b5ca19f37cae2ef3':
  DO NOT MERGE Add VPX output buffer size check

8 years agoDO NOT MERGE Add VPX output buffer size check
Marco Nelissen [Fri, 18 Mar 2016 17:43:29 +0000 (17:43 +0000)]
DO NOT MERGE Add VPX output buffer size check
am: 1595f8a

* commit '1595f8ac7ab412e81e0565e1347edaeedf9f2832':
  DO NOT MERGE Add VPX output buffer size check

8 years agoAdd VPX output buffer size check
Marco Nelissen [Wed, 16 Mar 2016 17:32:05 +0000 (10:32 -0700)]
Add VPX output buffer size check

and handle dead observers more gracefully

Bug: 27597103
Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518

8 years agoDO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f
Marco Nelissen [Wed, 16 Mar 2016 17:53:16 +0000 (17:53 +0000)]
DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f
am: 50af72b  -s ours

* commit '50af72bcc5f5d84831d57333e64f439fcf125795':
  DO NOT MERGE Don't reject "thumbnail mode" setConfig

8 years agoDO NOT MERGE Add VPX output buffer size check
Marco Nelissen [Wed, 16 Mar 2016 17:32:05 +0000 (10:32 -0700)]
DO NOT MERGE Add VPX output buffer size check

and handle dead observers more gracefully

Bug: 27597103
Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518

8 years agoDO NOT MERGE Don\'t reject "thumbnail mode" setConfig
Marco Nelissen [Wed, 16 Mar 2016 17:51:01 +0000 (17:51 +0000)]
DO NOT MERGE Don\'t reject "thumbnail mode" setConfig
am: 09e024f

* commit '09e024fe9a8dd9646e053275dd636301a9d463f0':
  DO NOT MERGE Don't reject "thumbnail mode" setConfig

8 years agoMerge "DO NOT MERGE Don't reject "thumbnail mode" setConfig" into lmp-dev
Marco Nelissen [Wed, 16 Mar 2016 17:45:01 +0000 (17:45 +0000)]
Merge "DO NOT MERGE Don't reject "thumbnail mode" setConfig" into lmp-dev

8 years agoMerge "Fix initialization of AAC presentation struct" into lmp-dev
Marco Nelissen [Tue, 15 Mar 2016 20:19:56 +0000 (20:19 +0000)]
Merge "Fix initialization of AAC presentation struct" into lmp-dev

8 years agoDO NOT MERGE Don't reject "thumbnail mode" setConfig
Marco Nelissen [Fri, 11 Mar 2016 22:40:17 +0000 (14:40 -0800)]
DO NOT MERGE Don't reject "thumbnail mode" setConfig

Bug: 27207275
Change-Id: I35f6bf5b407869a9479feaf1b5beef7b68d04509