OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:46:11 +0000 (19:46 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b am: 2675f4cac9
am: 6a2a5b5808

Change-Id: Ic443f079bcb1213921a3bf61a13dbfe83ce2a63e

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:39:39 +0000 (19:39 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b
am: 2675f4cac9

Change-Id: Ia5f63cef5ead1153656f38b34ac4bc8ebb12ca59

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:34:04 +0000 (19:34 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev
am: 3b1a9c3f1b

Change-Id: I2345da7f0816430a7a3eb1e42e411a41c4487a98

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
TreeHugger Robot [Tue, 6 Jun 2017 19:24:27 +0000 (19:24 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:22:25 +0000 (19:22 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours am: 98a5397265 am: bb3d5445c9  -s ours
am: 16531bf687

Change-Id: I3e1f949e4781eba1fa5599c1a4ee2a07dcd47e43

7 years agoFix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073
Jeff Tinker [Tue, 6 Jun 2017 19:22:07 +0000 (19:22 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073
am: 7a22df06c3

Change-Id: I7747e1b22225bde71682de407b923accbf59ea2f

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:17:01 +0000 (19:17 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours am: 98a5397265
am: bb3d5445c9  -s ours

Change-Id: I7e16e397d557dd1ff164840fba537ad26627a401

7 years agoFix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec
Jeff Tinker [Tue, 6 Jun 2017 19:16:09 +0000 (19:16 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec
am: d1a854a073

Change-Id: I212669c64a748fed506b8b4a90a568aa91d01787

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:11:01 +0000 (19:11 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours
am: 98a5397265

Change-Id: I8ba30c335c44dbf14c07eab2f656f249af424abf

7 years agoFix integer overflow in mediadrmserver am: eb21712f81
Jeff Tinker [Tue, 6 Jun 2017 19:10:38 +0000 (19:10 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81
am: 5250bc1bec

Change-Id: Ic300845c6fd6aa383ee6661812e489f885ada14c

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:06:01 +0000 (19:06 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours
am: 486e62c5dd  -s ours

Change-Id: I8f9016674ff88f70bc421604c1fae0bd208979d9

7 years agoFix integer overflow in mediadrmserver
Jeff Tinker [Tue, 6 Jun 2017 19:05:36 +0000 (19:05 +0000)]
Fix integer overflow in mediadrmserver
am: eb21712f81

Change-Id: I0caf94590f85f444a4705f62792c27a447fa8b69

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:59:39 +0000 (18:59 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d
am: f3383881ff  -s ours

Change-Id: Ida0671401c4323f61ff63c4954522171efa2bcca

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:54:07 +0000 (18:54 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1
am: fdfad5899d

Change-Id: Ibfeec763c09ce978dd44d7cade7cb848b31aa528

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:48:36 +0000 (18:48 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev
am: da924b45e1

Change-Id: I346cc9a7df899bb760abb7eb99f684f0d40ceced

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:39:58 +0000 (18:39 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev

7 years agoFix integer overflow in mediadrmserver
Jeff Tinker [Mon, 5 Jun 2017 21:34:48 +0000 (14:34 -0700)]
Fix integer overflow in mediadrmserver

bug:37710346
Change-Id: If18cfb5bb1d1f1b2997d2a0e1685590d674181f4

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae...
Marco Nelissen [Fri, 2 Jun 2017 04:25:02 +0000 (04:25 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189 am: 8ff995a8ae am: cfd6daa37e
am: 98a4729522

Change-Id: Ie371aca665e0c40d43c08187eb9cfc821af6cf73

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae...
Marco Nelissen [Fri, 2 Jun 2017 04:21:32 +0000 (04:21 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189 am: 8ff995a8ae
am: cfd6daa37e

Change-Id: I92f0c069616e6dd8e415d4a84917d7061857eb2d

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae...
Marco Nelissen [Fri, 2 Jun 2017 04:18:37 +0000 (04:18 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189
am: 8ff995a8ae

Change-Id: I2a84d1752dc91e1d99f0b6773195176dba1b15d3

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae
Marco Nelissen [Fri, 2 Jun 2017 04:15:32 +0000 (04:15 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae
am: cbaad4b189

Change-Id: Ifd9897d7c631c92e756481c3f43f0b4cbca85ca0

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339
Marco Nelissen [Fri, 2 Jun 2017 04:12:32 +0000 (04:12 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339
am: fe7c2700ae

Change-Id: I9c4c5dbe0682992f9e7521ed3bf6a52d8311e00f

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae
Marco Nelissen [Fri, 2 Jun 2017 04:09:21 +0000 (04:09 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae
am: a7602f8339

Change-Id: I2883ac8221475d5fa73ed34350f199355b541b14

7 years agoMerge "Fix potential leak" into klp-dev
Marco Nelissen [Fri, 2 Jun 2017 04:05:59 +0000 (04:05 +0000)]
Merge "Fix potential leak" into klp-dev
am: 2f9eacc3ae

Change-Id: I7e3a53be249eff99dd895e500f9833ad55a184b0

7 years agoMerge "Fix potential leak" into klp-dev
TreeHugger Robot [Fri, 2 Jun 2017 04:02:09 +0000 (04:02 +0000)]
Merge "Fix potential leak" into klp-dev

7 years agoMerge "Fix potential leak" into mnc-dev
Marco Nelissen [Thu, 1 Jun 2017 23:13:12 +0000 (23:13 +0000)]
Merge "Fix potential leak" into mnc-dev
am: 167af356fd

Change-Id: I47300ca03662a0b24195ac16e73c2873577a2b55

7 years agoMerge "Fix potential leak" into mnc-dev
TreeHugger Robot [Thu, 1 Jun 2017 23:07:47 +0000 (23:07 +0000)]
Merge "Fix potential leak" into mnc-dev

7 years agoDO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
Robert Shih [Thu, 25 May 2017 21:52:55 +0000 (21:52 +0000)]
DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
am: ebeb47000d

Change-Id: I1ae0603aa9b798bd6c624d96c18ef6457212bfa7

7 years agoDO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
Robert Shih [Tue, 23 May 2017 00:32:29 +0000 (17:32 -0700)]
DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor

Bug: 37622974
Bug: 37622987
Bug: 37623757
Test: run poc and observe no crash
Change-Id: I1e25c011f02bec26a1480ec9a217a52f15d43cf2

7 years agoDO NOT MERGE - m4v_h263: check header first before decoding a frame.
Wei Jia [Fri, 19 May 2017 21:34:10 +0000 (14:34 -0700)]
DO NOT MERGE - m4v_h263: check header first before decoding a frame.

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9

7 years agoNuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
Wei Jia [Fri, 8 Jan 2016 00:03:03 +0000 (16:03 -0800)]
NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.

Bug: 38391487
Bug: 24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit 56097a8ecc31ec308a1caa38f92b69f99324eada)

7 years agoFix potential leak
Marco Nelissen [Tue, 9 May 2017 21:17:06 +0000 (14:17 -0700)]
Fix potential leak

Fix potential memory leak introduced with bugfix for bug 31449945.

Bug: 36389123
Change-Id: I5a9a3551692d6cba385b45c4c7a465aa377a62b1

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:46:30 +0000 (15:46 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f
am: 00be42f32c

Change-Id: I651a449830219d0e7513417246d0d269cf44fe88

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:42:58 +0000 (15:42 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388
am: dd2f7e982f

Change-Id: I4cdcb7694baea6c10980860880c4bdcf41905a8f

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:39:56 +0000 (15:39 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca
am: 4bd7103388

Change-Id: I159ed2c6b4184689517bf39d791cb516d505e4ed

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:36:54 +0000 (15:36 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408
am: a2fbd251ca

Change-Id: I8a0e99463feb24350f02d5b5ccdc9419ebb2d71d

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6
Marco Nelissen [Tue, 16 May 2017 15:33:25 +0000 (15:33 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6
am: 55057ab408

Change-Id: I5107a57def4be19aad9dca950cca06bebecad1e8

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f
Marco Nelissen [Tue, 16 May 2017 15:30:24 +0000 (15:30 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f
am: 60657857c6

Change-Id: I1564d4e2626a31b7018bae301c50a268ccc79749

7 years agoMerge "Fix memory leak in error case" into klp-dev
Marco Nelissen [Tue, 16 May 2017 15:27:25 +0000 (15:27 +0000)]
Merge "Fix memory leak in error case" into klp-dev
am: 5136b7436f

Change-Id: I479e015461fa46227c4cae49829b0f3c0d769de9

7 years agoMerge "Fix memory leak in error case" into klp-dev
Marco Nelissen [Tue, 16 May 2017 15:20:59 +0000 (15:20 +0000)]
Merge "Fix memory leak in error case" into klp-dev

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:07:58 +0000 (17:07 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94
am: fd7cba4d0e

Change-Id: I0c11db2bb63c110732c925cfc482deee246dc720

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:04:56 +0000 (17:04 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735
am: 045c64fe94

Change-Id: I02f221f5a4a14706c83ce12c3273df75bd23361f

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367
Marco Nelissen [Mon, 15 May 2017 17:01:55 +0000 (17:01 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367
am: 412be4b735

Change-Id: I70263d5cb5fca57353337a60686d1468692819cf

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89
Marco Nelissen [Mon, 15 May 2017 16:59:57 +0000 (16:59 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89
am: b65b0a8367

Change-Id: I2faa1a87e934851ee2a4a865e3e3d7084381dac6

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf
Marco Nelissen [Mon, 15 May 2017 16:56:55 +0000 (16:56 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf
am: 086cee9d89

Change-Id: I9687649ed25dade9f872c83a290bbcd0abb4b5fc

7 years agoLimit ogg packet size am: bf928560ac
Marco Nelissen [Mon, 15 May 2017 16:53:54 +0000 (16:53 +0000)]
Limit ogg packet size am: bf928560ac
am: f349435fcf

Change-Id: I952944295017f01b254c80c8db935e33c51337f3

7 years agoLimit ogg packet size
Marco Nelissen [Mon, 15 May 2017 16:50:55 +0000 (16:50 +0000)]
Limit ogg packet size
am: bf928560ac

Change-Id: I102f6e9b1b4933d043b2a3e1e3f7fc885aaf6779

7 years agoLimit ogg packet size
Marco Nelissen [Fri, 12 May 2017 22:35:30 +0000 (15:35 -0700)]
Limit ogg packet size

A malformed ogg file might lace together a very large packet, which
could lead to out of memory conditions. Limit the packet size to
avoid this.

Bug: 36592202
Change-Id: I8650b3ec54a0de9ec302a7cbac296bb85efcfb3d

7 years agoPrevent OOB write in soft_avc encoder
Ray Essick [Fri, 12 May 2017 17:45:57 +0000 (17:45 +0000)]
Prevent OOB write in soft_avc encoder
am: 463452a949

Change-Id: I7cad9d84093cce83b2edf09a55bb8b9a588bee43

7 years agoFix memory leak in error case
Marco Nelissen [Fri, 12 May 2017 17:45:14 +0000 (10:45 -0700)]
Fix memory leak in error case

Bug: 37239013
Change-Id: Ic33e0f7ed946d0729efa46f69aff1a5d35e81b1e

7 years agoPrevent OOB write in soft_avc encoder
Ray Essick [Wed, 10 May 2017 22:38:51 +0000 (15:38 -0700)]
Prevent OOB write in soft_avc encoder

Soft avc encoder cached buffer sizes across a point where the sizes
could be reset by an app, allowing crafted requests to hit outside
of the current buffer. This remedies that by forcing buffer reallocation
with new sizes whenever the encoder state at such 'reset' points.

Bug: 35421151
Test: run POC with no crash
Change-Id: I8c689846142264f7b6a277332260a6bd8a2bd92d

7 years agoFix potential leak
Marco Nelissen [Tue, 9 May 2017 21:17:06 +0000 (14:17 -0700)]
Fix potential leak

Fix potential memory leak introduced with bugfix for bug 31449945.

Bug: 36389123
Change-Id: I5a9a3551692d6cba385b45c4c7a465aa377a62b1

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am...
Roger1 Jonsson [Tue, 11 Apr 2017 17:35:50 +0000 (17:35 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67
am: c5bea960dc

Change-Id: I0448adf35221404dbc19c4ed14f2d0252770499e

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am...
Roger1 Jonsson [Tue, 11 Apr 2017 17:32:20 +0000 (17:32 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b
am: 85f575dc67

Change-Id: Ie8f3698b61e3f4d13383eaf1f36788186fdf3676

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f
Roger1 Jonsson [Tue, 11 Apr 2017 17:27:19 +0000 (17:27 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f
am: 6dfbcefe4b

Change-Id: I2c528d91424183cbc31c6d8a55ec1f35c685315b

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev
Roger1 Jonsson [Tue, 11 Apr 2017 17:22:19 +0000 (17:22 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev
am: d12204372f

Change-Id: Ic2bca43957197cf537760826de60fcb85777cb1b

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev
TreeHugger Robot [Tue, 11 Apr 2017 17:02:45 +0000 (17:02 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:55:06 +0000 (20:55 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca
am: 12c176066e

Change-Id: Id2207725fc2e69c8aee4a24ee605dc7fae8939e2

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:50:38 +0000 (20:50 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62
am: 56c520c4ca

Change-Id: I27e648ddd65325600cad22d5b0fef03aa4a9447a

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:45:34 +0000 (20:45 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667
am: 9edaa79f62

Change-Id: Iad06395ed255dbd48b0a77147b6da809963e4306

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:41:04 +0000 (20:41 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8
am: 82ffcbd667

Change-Id: I1b2ea29d1c22f1714f0c0e90a56c585176742dd2

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:36:33 +0000 (20:36 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf
am: 59bc7f77f8

Change-Id: I133f8566b649821e06cfb21a95b20f84eb839219

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:32:06 +0000 (20:32 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e
am: 0893c50bcf

Change-Id: I819b55a95ff50c51488bac50c43fea8b2244a410

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:27:43 +0000 (20:27 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev
am: 922ad6183e

Change-Id: I8fbd67b5fe298d6f842d224109e2ab0b52a2b59a

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:19:37 +0000 (23:19 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3 am: 0bb0a8e1e8 am: 4d86bef7f7
am: 241f5feb8a

Change-Id: I52d24edf474be0f12e7debf052e1398a56674dc8

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:16:08 +0000 (23:16 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3 am: 0bb0a8e1e8
am: 4d86bef7f7

Change-Id: I53fd99fb4436b2cce7a8473a1e188cf8fcdf19eb

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:13:37 +0000 (23:13 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3
am: 0bb0a8e1e8

Change-Id: Id88b6709127ad9799d63dff3c1310001142a0a2c

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:10:38 +0000 (23:10 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours
am: 73db408aa3

Change-Id: Ibe55680e73e9caddc3fc79883fa17a50742f393d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d
Roger1 Jonsson [Wed, 5 Apr 2017 23:07:37 +0000 (23:07 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d
am: ab28d49e41  -s ours

Change-Id: I63e6f4ea65dda85e5d779f6aaf1fbd4ca5806f8c

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3
Roger1 Jonsson [Wed, 5 Apr 2017 22:52:35 +0000 (22:52 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3
am: e77a32bd3d

Change-Id: If61ba19bc937c6b7c7227296ddba5a1797072f9d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 5 Apr 2017 22:49:34 +0000 (22:49 +0000)]
Avoid crash for stss sync sample number 0
am: 5c364997a3

Change-Id: Ia97daf543c65b52db1c5d09471ed8d00a434364d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5

7 years agoDon't allow using or allocating a buffer after the first state transition
Marco Nelissen [Mon, 27 Mar 2017 22:04:25 +0000 (15:04 -0700)]
Don't allow using or allocating a buffer after the first state transition

Bug: 35467458
Change-Id: Ia76c8cec8ad2abb95ca29b2a89075f7acab4b174

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:15:30 +0000 (00:15 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours am: 413ad04890 am: 27ba2d85d6  -s ours
am: 4066f0e808

Change-Id: Icaa568c50688db3157c524978deda0a52ca87e37

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4
Robert Shih [Wed, 15 Mar 2017 00:10:00 +0000 (00:10 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4
am: b06f7c6e15

Change-Id: I9b5601e129a7162aa125feef425bdc93de4e4471

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:09:59 +0000 (00:09 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours am: 413ad04890
am: 27ba2d85d6  -s ours

Change-Id: Ib80a0800bbcbb4033081ff9052681dbaf5406ab8

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec
Robert Shih [Wed, 15 Mar 2017 00:04:31 +0000 (00:04 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec
am: 4eea0b3aa4

Change-Id: I4f3b1e4a100374da2e412082564fc6fb54dc122a

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:04:30 +0000 (00:04 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours
am: 413ad04890

Change-Id: I160f5893987b330ae73e6675ffb2dc2fed2d1304

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours
am: 1e4d8d67bc  -s ours

Change-Id: Iab0b678707ea31ad02f0f9be5f02f5638c601826

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c
am: 038fd6e5ec

Change-Id: I475073171089f82eac7816d479f9b720a887a0c9

7 years agoFLACExtractor: copy protect mWriteBuffer
Robert Shih [Tue, 14 Mar 2017 23:55:10 +0000 (23:55 +0000)]
FLACExtractor: copy protect mWriteBuffer
am: 8ee699977c

Change-Id: Icdfd99c85fb0f76cc607f8bb29430913cf72bad1

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd
Robert Shih [Tue, 14 Mar 2017 23:54:28 +0000 (23:54 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd
am: aca26c9d45  -s ours

Change-Id: Id436554a36de729ccd7a3220e32e155c423d0531

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0
Robert Shih [Tue, 14 Mar 2017 23:49:57 +0000 (23:49 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0
am: 761abda1bd

Change-Id: I30bf5233b69619d260edb952248865adf5c55c83

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Robert Shih [Tue, 14 Mar 2017 23:45:27 +0000 (23:45 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer
am: 13c77f4fe0

Change-Id: Ib7f8b77b3ba27fcd8e61e540eb39259cb287185c

7 years agoFLACExtractor: copy protect mWriteBuffer
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
(cherry picked from commit 328cd66cc72ba7bc5452ed5a93f29ddcd73aa9f9)

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 23:09:43 +0000 (23:09 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a
am: dbdf026f76

Change-Id: I4d2bba1d77108acad20a8886d79a99f8b521ede3

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f...
Ray Essick [Mon, 13 Mar 2017 23:09:29 +0000 (23:09 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56
am: eb58ce5bb0

Change-Id: Id8ea82f6504b70d8a448a8d00063b1b393a2f336

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 23:05:46 +0000 (23:05 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933
am: 7f2592fe4a

Change-Id: Ie8c0fadcf5c424e8a4627030c04cbac96442ebf4

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f...
Ray Essick [Mon, 13 Mar 2017 23:05:29 +0000 (23:05 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01
am: b05be00f56

Change-Id: I79378b8fa75e6912f49a9af3c4f46bd711494314

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2...
Marco Nelissen [Mon, 13 Mar 2017 23:01:30 +0000 (23:01 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e
am: 1db2ee3dbd

Change-Id: Ia7e87aa7baaf9bbff299ff70af5c77b90a922229

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0...
Marco Nelissen [Mon, 13 Mar 2017 23:01:14 +0000 (23:01 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3
am: 89349b8d29

Change-Id: I156d984af4dc64fa69d3b07661e8f2e7e86ca7e5

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 23:01:13 +0000 (23:01 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512
am: 4bc4f78933

Change-Id: I53212f1bdf2491a6b20ec9713adec169ef0d08c1

7 years agoMerge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e...
Marco Nelissen [Mon, 13 Mar 2017 23:00:59 +0000 (23:00 +0000)]
Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2
am: 8f2b91f0a1

Change-Id: Ib43ba6aeba921b0d2c5b8649ac1e7015c48a7884

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f...
Ray Essick [Mon, 13 Mar 2017 23:00:58 +0000 (23:00 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99
am: 8655d4fc01

Change-Id: Ia8696372f4015580ca91bed1f1c373a68d2ea196

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2...
Marco Nelissen [Mon, 13 Mar 2017 22:57:31 +0000 (22:57 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e
am: 98ee832c7e

Change-Id: Ie82d1dfa473886b9b166804da985bce439c90900

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0...
Marco Nelissen [Mon, 13 Mar 2017 22:57:14 +0000 (22:57 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df
am: 4ba3934ec3

Change-Id: I6babc4703d1462a30d3075cfb6a3fbfdffac5724

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 22:57:12 +0000 (22:57 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43
am: 8abf11b512

Change-Id: I1cdf8344d8ca41cf5c4b6622ec743bb094c3dff0