OSDN Git Service

android-x86/frameworks-av.git
6 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into cw-e-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into cw-e-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

6 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
Lajos Molnar [Tue, 15 Aug 2017 22:21:44 +0000 (22:21 +0000)]
[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8 am: 983ab59558 am: bd7625f2fe

Change-Id: I20360316ec2b796eb948bf169bb2e73b0f96a1cd

6 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
Lajos Molnar [Tue, 15 Aug 2017 22:21:39 +0000 (22:21 +0000)]
[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8 am: 983ab59558

Change-Id: I6ba96d5aeb9268ceac0a7287a650afcf459231ed

6 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
Lajos Molnar [Tue, 15 Aug 2017 22:21:33 +0000 (22:21 +0000)]
[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8

Change-Id: Ic9a15317becdbb4acf1343ac064f4e2c77b2b114

6 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
Lajos Molnar [Tue, 15 Aug 2017 22:21:28 +0000 (22:21 +0000)]
[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2

Change-Id: I674a5e8e1587de842352deb41279b6ea32045b60

6 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
Lajos Molnar [Tue, 15 Aug 2017 22:21:23 +0000 (22:21 +0000)]
[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300

Change-Id: I16d35492c1254579794d4398dee28dd556a1703d

6 years agoMerge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD
Lajos Molnar [Tue, 15 Aug 2017 22:10:32 +0000 (15:10 -0700)]
Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD

* commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6':
  stagefright: avoid buffer overflow in base64 decoder

Bug: 62673128
Change-Id: I2cfd6b4f7e30c111de54d9b42e7bc94a3a5aefba

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:25 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be

Change-Id: I9d48e3542f6ef811261f29afab91b8f0bcacf090

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:20 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93

Change-Id: Id63b9b26263436ac54269878d15897b6d6e4d41f

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:15 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017

Change-Id: Ic6c8672379bf0e84715d0da49ae4704ac0a2ea02

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:10 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f

Change-Id: I6a29a7a6f8db29380f6adcc0d4ed6b4c3935c309

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:05 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a

Change-Id: Idf513ba06641aacf48f457b3a8ae02721404b7c1

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:05:59 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52

Change-Id: Ic12354524144a6d1337be0a7c57efb4711cee660

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:05:53 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9

Change-Id: Ibbbdacd98e6362267e5f7b926a70c133a0a3d9f4

6 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
Dongwon Kang [Tue, 15 Aug 2017 22:05:47 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb

Change-Id: I12e72631c86a3d1cb5fadb89243c1acacc7c20a7

6 years agoCheck buffer size in useBuffer in software components
Dongwon Kang [Mon, 24 Jul 2017 20:59:51 +0000 (13:59 -0700)]
Check buffer size in useBuffer in software components

Test: No more crash from oob read/write with running poc.
Bug: 63522430
Change-Id: I232d256eacdfaa9347902fe9b42650999f0d2d85

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: b4d9e1b413...
Lajos Molnar [Tue, 15 Aug 2017 22:02:19 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: b4d9e1b413 am: 8710f4666e

Change-Id: I954737558188868ffe66a844acc4b268dc2918f4

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: b4d9e1b413
Lajos Molnar [Tue, 15 Aug 2017 22:02:12 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: b4d9e1b413

Change-Id: I9ba3a1d3deffa395ef454da57bfeb4200943f190

6 years agoMerge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:19:53 +0000 (00:19 +0000)]
Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174" into cw-e-dev

6 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev
Lajos Molnar [Tue, 15 Aug 2017 00:14:02 +0000 (00:14 +0000)]
Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev
am: 8ce83b6174

Change-Id: Iff4f767c0505a9f1ae7b94015a5e7909d02cc505

6 years ago[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:33 +0000 (00:13 +0000)]
[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645

Change-Id: Id2cdb321b7a4e40f9a1deb8b3c5216cb74c461fa

6 years agoMerge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp...
Lajos Molnar [Tue, 15 Aug 2017 00:13:07 +0000 (00:13 +0000)]
Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev
am: a0388f92c7

Change-Id: I92c20c87114bce30d61f3505187a9aa5782370c5

6 years agoMerge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc...
Lajos Molnar [Tue, 15 Aug 2017 00:03:30 +0000 (00:03 +0000)]
Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev
am: 0ae144f238

Change-Id: I84441edb8a52c7b9ee14cd504520cfb020ebf9dc

6 years agoMerge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev

6 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev

* changes:
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485
  Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6

6 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-e-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-e-dev

* changes:
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485 am: 2f35f02f96
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485
  Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6

6 years agoMerge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]
Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev

6 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-e-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]
Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-e-dev

* changes:
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283 am: d6636186d1
  Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283

6 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:52 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485 am: 2f35f02f96

Change-Id: I5e9113aeece0966a286ce3189f644158f035e206

6 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:47 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485

Change-Id: I9537087f5a039e122f3a91d7d9191b8771bad602

6 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:17 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283 am: d6636186d1

Change-Id: Id21f431331483f18ceb6b7c4661005064592b93c

6 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:09 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b am: c42e782644 am: 5c9fc68825

Change-Id: Ic6383879abe802dacbf667ba6b16add00f8fe7a9

6 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:05 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b am: c42e782644

Change-Id: Ia50926f618e0c9045196fbf8413901c28ccd1f73

6 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:00 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b

Change-Id: I068312923b05f1fb82d47331272515d294809317

6 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Android Build Merger (Role) [Mon, 14 Aug 2017 23:51:56 +0000 (23:51 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad

Change-Id: Ic6f76fbc3f7c128d8a6bad06bdf596e37701090f

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev
Lajos Molnar [Mon, 14 Aug 2017 23:51:53 +0000 (23:51 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev
am: 5293df6bb6

Change-Id: I54288e3fe8017dc920fead91513ea7ab6d22b849

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev
Lajos Molnar [Mon, 14 Aug 2017 23:51:52 +0000 (23:51 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev
am: 371e4fc283

Change-Id: I1e9abee95a7361acb06a447f0838a79c49b03d4e

6 years agoMerge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
Lajos Molnar [Mon, 14 Aug 2017 23:51:34 +0000 (23:51 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
am: cddbfe5496

Change-Id: Ic03f8dbd9b54cd9a4899b10cb554e294155dcc6d

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev
Lajos Molnar [Mon, 14 Aug 2017 23:45:21 +0000 (23:45 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev
am: 4773895ad6

Change-Id: I77c5d70f06f1a1d9297232eda7e885ba727f5a4c

6 years agoMerge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

6 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:50 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62 am: 6810ac8bcd

Change-Id: I5ddb4c86be53e4d975c4eb5abfeece0874a3a0fa

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:44 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62

Change-Id: I2c156d1e0f52aa28448448eb403478ed7759c512

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:39 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6

Change-Id: Ieb9ea8613b8f4ce3848344380cc79bbf252cb996

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:33 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918

Change-Id: I56303a18ee48e2032d1d937899bd73035f507eba

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:28 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3

Change-Id: I3f836425d32d5e5cd53162c5dcbb0150a6947a95

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:23 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1

Change-Id: I33ebb671bd8f8b036bd585b70fff42f3d61c078f

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400
Wei Jia [Mon, 14 Aug 2017 22:22:17 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400

Change-Id: I63d3ee56db210794a06b97f1283bebf978284f42

6 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4
Wei Jia [Mon, 14 Aug 2017 22:22:12 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4

Change-Id: If51ef2fb8858fa23a4503f031e9a9127c975ef36

6 years agoMPEG4Source: fix fragmented read.
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.

Test: passed CTS test DecoderTest#testDecodeFragmented
Bug: 64314728
Bug: 36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit ba9af7792dfed6e9b1b216aab91a97e713eec891)
(cherry picked from commit 6b401a337674f2f22b7589534700a33187899869)

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:37:30 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd am: bc1d023cc9 am: 03c1ecd9fe am: c4b06bbc1e am: 5c6acee104 am: fcc98fa3b1 am: 1f2d8b0b36 am: 698581c556

Change-Id: I4f5a7068fb53ffacecbd5707771d57488ea307cf

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:37:24 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd am: bc1d023cc9 am: 03c1ecd9fe am: c4b06bbc1e am: 5c6acee104 am: fcc98fa3b1 am: 1f2d8b0b36

Change-Id: Ib9efffefd4952e675a13f51951a4d02f00c6abe6

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:37:19 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd am: bc1d023cc9 am: 03c1ecd9fe am: c4b06bbc1e am: 5c6acee104 am: fcc98fa3b1

Change-Id: Ia0244b37df369a27b4bad024eef06cc56b5e64a2

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:37:13 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd am: bc1d023cc9 am: 03c1ecd9fe am: c4b06bbc1e am: 5c6acee104

Change-Id: I9127fb8696af5ef68ca122545ef6da09bba360c2

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:37:08 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd am: bc1d023cc9 am: 03c1ecd9fe am: c4b06bbc1e

Change-Id: I13d92901d6f54840bb2ff8a9802cdf94b690b8e2

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:37:03 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd am: bc1d023cc9 am: 03c1ecd9fe

Change-Id: Iaaaead614bb1a1dbc62f0443e7e3e0d7d4fb9012

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:36:57 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd am: bc1d023cc9

Change-Id: I8dfe1cdebec08b9ad5d3c7b19b8891158ac51132

6 years ago[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am...
Mikhail Naganov [Mon, 14 Aug 2017 19:36:51 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am: 804632afcd

Change-Id: Ie44dd9c0d77ebcbc1b33603f06bb3fd3d86c6174

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7...
Lajos Molnar [Fri, 11 Aug 2017 21:06:30 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861

Change-Id: Ib9c53dabc61f654791e92a7939eaed1e19f89df6

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7...
Lajos Molnar [Fri, 11 Aug 2017 21:06:25 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525

Change-Id: Ifd01cbe03ab9bea87ccbc6fa8ff1c119cfca57d8

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7...
Lajos Molnar [Fri, 11 Aug 2017 21:06:20 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb

Change-Id: I3ca735e893a638f412656f64bb3e857b6c863790

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7...
Lajos Molnar [Fri, 11 Aug 2017 21:06:14 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46

Change-Id: Iddb5c897937a3acd8ee404a0d1f71ec5da22738e

6 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
Lajos Molnar [Fri, 11 Aug 2017 21:06:09 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7

Change-Id: I5cd909195abd8ba442120aee597774f96c9db32d

6 years agostagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Tue, 27 Jun 2017 20:58:07 +0000 (13:58 -0700)]
stagefright: avoid buffer overflow in base64 decoder

Bug: 62673128
Change-Id: Id5f04b772aaca3184879bd5bca453ad9e82c7f94

6 years agoAdd EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb
Mikhail Naganov [Tue, 25 Jul 2017 00:25:47 +0000 (17:25 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb

Bug: 63662938
Bug: 63526567
Test: Added CTS tests

Change-Id: I8ed398cd62a9f461b0590e37f593daa3d8e4dbc4

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:15:46 +0000 (23:15 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours
am: 0a78268055  -s ours

Change-Id: Ifedba1a55e58651c9f4f93864ad52b8bf1f78461

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours
am: 84b2e0717c  -s ours

Change-Id: Ib5f483ddb67d18c95c720088f9b0ed1c64b65979

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303
am: 6d050827c3  -s ours

Change-Id: I192b34239fc52c5532a0ea4ce71fc110639d462f

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e
am: ff9e1b0303

Change-Id: I57d1b50eea3a31fae57bd20f856a0ebc53e73357

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d
am: 222dca470e

Change-Id: Icd722065f9256e7afec3e3d7f53c2aa5340856d8

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199
Marco Nelissen [Fri, 4 Aug 2017 22:45:10 +0000 (22:45 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199
am: 87f1a3041d

Change-Id: I8fc2acbf9bbddbc4a401f51595752351c06acc79

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef
Marco Nelissen [Fri, 4 Aug 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef
am: f233415199

Change-Id: I93a9b7b1f48953ec52d6c0f23e3141ddf6dc30f3

6 years agoMerge "Skip track if verification fails" into klp-dev
Marco Nelissen [Fri, 4 Aug 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Skip track if verification fails" into klp-dev
am: ab2c5046ef

Change-Id: Ica76922fc399fe0e5b6af23d613a2f6e5bc7820b

6 years agoMerge "Skip track if verification fails" into klp-dev
TreeHugger Robot [Fri, 4 Aug 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Skip track if verification fails" into klp-dev

6 years agoSkip track if verification fails
Marco Nelissen [Tue, 18 Jul 2017 21:57:11 +0000 (14:57 -0700)]
Skip track if verification fails

Bug: 62187433
Test: ran poc, CTS
Merged-In: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
Change-Id: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56
Dongwon Kang [Thu, 3 Aug 2017 20:57:21 +0000 (20:57 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56
am: 73c41f9d70

Change-Id: I12556bc1f16c13abfe7018a9c21258c73e46c7a0

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 20:51:21 +0000 (20:51 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
am: a7a43d9b56

Change-Id: If7a317b2a9de1daaafb83aeb466c52ef494b972d

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 20:45:52 +0000 (20:45 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e
am: 218692ec4f

Change-Id: I5abf7e89e0476f46492ca3166ff2245d70e87068

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev
TreeHugger Robot [Thu, 3 Aug 2017 20:44:43 +0000 (20:44 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60
Wei Jia [Thu, 3 Aug 2017 20:39:50 +0000 (20:39 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60
am: 067ab2f74e

Change-Id: Id86327d63b5b8aa3edc62b7e6c15689b6ef4afa7

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d
Wei Jia [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d
am: bbc5c8fc60

Change-Id: I0844a8bac332664d4d8e668257c470b0a89addfe

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376
Wei Jia [Thu, 3 Aug 2017 20:27:48 +0000 (20:27 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376
am: 96114e7c5d

Change-Id: I8616480a004aa44e947939db7e5b8cce1b7ec72a

6 years agoMPEG4Source: fix fragmented read.
Wei Jia [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
MPEG4Source: fix fragmented read.
am: 6b401a3376

Change-Id: I14b767357500d6680379c34ad74efdab1d7bb6ee

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5
Dongwon Kang [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5
am: 1e3070e56d

Change-Id: Iefa80b90d92ab9f14364eeb77b5cb2608f919496

6 years agoMerge "Skip track if verification fails" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)]
Merge "Skip track if verification fails" into mnc-dev
am: 6168d8eba5

Change-Id: Ic098164694aaea4a455e95f5fe4e662bfa832ce7

6 years agoMerge "Skip track if verification fails" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 19:58:37 +0000 (19:58 +0000)]
Merge "Skip track if verification fails" into mnc-dev

6 years agoMPEG4Source: fix fragmented read.
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.

Test: passed CTS test DecoderTest#testDecodeFragmented
Bug: 64314728
Bug: 36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit ba9af7792dfed6e9b1b216aab91a97e713eec891)

6 years agoFix memory leak in OggExtractor
Dongwon Kang [Thu, 20 Jul 2017 21:40:25 +0000 (14:40 -0700)]
Fix memory leak in OggExtractor

Test: added a temporal log and run poc
Bug: 63581671
Change-Id: I436a08e54d5e831f9fbdb33c26d15397ce1fbeba

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:45:47 +0000 (22:45 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a
am: b38111a0db

Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:43:44 +0000 (22:43 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97
am: 2b1df0008a

Change-Id: I2a8d904849b71156cda43aa7e44c377b34a17f10

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:41:13 +0000 (22:41 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820
am: 8d579abf97

Change-Id: I91ae5b377da3c8b253ef481ec66646dfcc7fa590

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:39:13 +0000 (22:39 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18
am: b226bba820

Change-Id: Iab6732cf5c86c6dec646df209e0f18b6c355780e

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:37:45 +0000 (22:37 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d
am: aafbda5a18

Change-Id: I22778c380e1aa3d268e8e32ff7eb2a458f46e7ef

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88
am: 5f3ac3898d

Change-Id: I22e4c53577164df13e5590d78dbd6796c1db06fe

7 years agoMerge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
Chong Zhang [Tue, 18 Jul 2017 22:26:47 +0000 (22:26 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a

Change-Id: I5515052572a4c271ebd277b3a4c6380f5327a166

7 years agoMerge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
Chong Zhang [Tue, 18 Jul 2017 22:26:46 +0000 (22:26 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88

Change-Id: I87cf81565eefd8ed299014e7aa1e10a00daefc31