git.osdn.net Git - android-x86/frameworks-av.git/log

Pawin Vongmasa [Fri, 19 Aug 2016 17:57:39 +0000 (17:57 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec -s ours am: 1dd4973234
am: 484d229a3c

Change-Id: Id1ceb16b426d7e378765cb9f55daa0796b6fc5bb

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:54:47 +0000 (17:54 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec -s ours
am: 1dd4973234

Change-Id: I723ac6216066ec3df3af8e8caad2c6b6361727f4

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:50:40 +0000 (17:50 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0
am: ab5c805aec -s ours

Change-Id: I46dd8facbac82da0651a5fb9e8c5c22e168d29c6

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:45:49 +0000 (17:45 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b
am: 52f7319fc0

Change-Id: I87bb8284037b01da2de982a3602339741ed6f4f8

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:19:47 +0000 (17:19 +0000)]

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f am: 06985c1dbc am: a25f2f5359 am: 1f84a02d15
am: 2482c5e73f

Change-Id: I3c90e36a8bd1992780a3996c7d16c760df4968cd

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:19:46 +0000 (17:19 +0000)]

Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262
am: 0954180087

Change-Id: Ia1975e0053d3d719ba678abbc7d48d7b74e43357

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:14:09 +0000 (17:14 +0000)]

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f am: 06985c1dbc am: a25f2f5359
am: 1f84a02d15

Change-Id: Ib395d9fee37f51fd735dca8ba67fd37ab3f7606b

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:14:07 +0000 (17:14 +0000)]

Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a
am: 1cdd3c4262

Change-Id: I9c6e65b795a5181ba152ffd4e358b0a25311b22e

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:11:29 +0000 (17:11 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours
am: 45cd2f896b

Change-Id: If0d77fc4311666cff881c371167fd19a534d0fb2

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:10:39 +0000 (17:10 +0000)]

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f am: 06985c1dbc
am: a25f2f5359

Change-Id: I41c1d70146910fc39926c7fcd1951863f8e967e1

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:10:38 +0000 (17:10 +0000)]

Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a
am: b65f47d30a

Change-Id: I18c74610c4fbbedf047e64c3bd01e5704422234c

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours
am: 83cf293b73 -s ours

Change-Id: I92bb3e0101da80205105f1d047eea56f5c5d85a0

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:05:11 +0000 (17:05 +0000)]

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f
am: 06985c1dbc

Change-Id: I3265aee42b89b18cdc3be5d374e25897f15be208

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:05:05 +0000 (17:05 +0000)]

Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c
am: 784c8ac91a

Change-Id: I1dd6a8c51d485de7af539339f7c6199935ee9fa8

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:04:02 +0000 (17:04 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65
am: 2a21f09fff -s ours

Change-Id: I540ae20fea8366c44796e104662b505192926270

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 17:00:35 +0000 (17:00 +0000)]

Merge "better validation lengths of strings in ID3 tags" into lmp-dev am: ae12b68ba2 am: 5bc68fd641 am: fb7cfdbe9b am: 234f929659 am: f91b860374
am: eeb29f32ee

Change-Id: I5b66fadbe2d2fb623c3b40699b54a2026e98b4ac

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:00:34 +0000 (17:00 +0000)]

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404
am: c776d9b42f

Change-Id: I202194b9bf1167ab437eb18edd548512e6713bff

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 17:00:34 +0000 (17:00 +0000)]

better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca
am: 49c95c0e2a

Change-Id: Id20117b7a08e6e8858adf2c499ae03cff4189417

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 17:00:33 +0000 (17:00 +0000)]

Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401
am: 0aaa2c606c

Change-Id: I9b705a7105e5e6abb0370837f4927e33ab504e3e

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 16:57:05 +0000 (16:57 +0000)]

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
am: 7a66bd2404

Change-Id: Ia6fabe0d3bcedf9834f3a7dfb8b2a6c19e4f0d80

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 16:57:04 +0000 (16:57 +0000)]

Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: baa9146401

Change-Id: I3c8f4edbc3b75f50bc6393271314a71f681ac43d

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 16:57:03 +0000 (16:57 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743
am: 453ba68c65

Change-Id: I833cb55b51e554e6b2ef3227f2923def6643c9e4

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:54:09 +0000 (16:54 +0000)]

Merge "better validation lengths of strings in ID3 tags" into lmp-dev am: ae12b68ba2 am: 5bc68fd641 am: fb7cfdbe9b am: 234f929659
am: f91b860374

Change-Id: Iee46723d68ed2d648766230fe334763ff2f2e98b

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:54:08 +0000 (16:54 +0000)]

better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31
am: 94875f51ca

Change-Id: Id6b1ba9255ca4d3f298ee408231648511e6a0fed

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 16:54:03 +0000 (16:54 +0000)]

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: ad929db743

Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 16:53:17 +0000 (16:53 +0000)]

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:50:36 +0000 (16:50 +0000)]

Merge "better validation lengths of strings in ID3 tags" into lmp-dev am: ae12b68ba2 am: 5bc68fd641 am: fb7cfdbe9b
am: 234f929659

Change-Id: I5e6e092d1175e54560f4a4c3ffc8f666b239a442

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:50:35 +0000 (16:50 +0000)]

better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4
am: d936eadf31

Change-Id: Ic91989dc86a789e282c3b20f253d8591d7bd78a7

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:48:25 +0000 (16:48 +0000)]

Merge "better validation lengths of strings in ID3 tags" into lmp-dev am: ae12b68ba2 am: 5bc68fd641
am: fb7cfdbe9b

Change-Id: Ic0fb16e1db8d024643ce1738466ad12daf89ff11

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:48:24 +0000 (16:48 +0000)]

better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb
am: 019973a8d4

Change-Id: I19865bbbc4037de800c2a1670de070c5ecc2dbf6

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:41:01 +0000 (16:41 +0000)]

Merge "better validation lengths of strings in ID3 tags" into lmp-dev am: ae12b68ba2
am: 5bc68fd641

Change-Id: I3d52b464d1ebced3381dc3813ac29fbe91b15d9e

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:41:01 +0000 (16:41 +0000)]

better validation lengths of strings in ID3 tags am: d23c01546c
am: e3fad118bb

Change-Id: I14bb5fbc1d7f97cf178b56699fd61131745b1a0e

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:37:31 +0000 (16:37 +0000)]

Merge "better validation lengths of strings in ID3 tags" into lmp-dev
am: ae12b68ba2

Change-Id: I839c9ba9a8d2b5e366745ea137ba4f35979e2494

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:37:31 +0000 (16:37 +0000)]

better validation lengths of strings in ID3 tags
am: d23c01546c

Change-Id: Idb8da8a0557349964f862ec1ab9f81542b81c492

commit | commitdiff | tree

Ray Essick [Fri, 19 Aug 2016 16:33:48 +0000 (16:33 +0000)]

Merge "better validation lengths of strings in ID3 tags" into lmp-dev

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 08:45:39 +0000 (01:45 -0700)]

DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 09:07:33 +0000 (02:07 -0700)]

Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: I4776db4a26fb3c31bb994d48788373fe569c812a

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 03:08:12 +0000 (03:08 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887 am: b71a431eab -s ours am: 5c4e9db2bb -s ours am: 348a267300 am: f9bcd8f269 am: b1d9532571 -s ours am: 61328a3f38
am: 0eb58d27a2

Change-Id: Iea0eebe824780bb6dfb85f0d51dcd0bc2146b1e8

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 03:08:10 +0000 (03:08 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 180185da19 -s ours am: 5d50c6e5e0 am: 9cb824f404 am: b037147760 -s ours am: 7db383ebb7
am: 3906f11f59

Change-Id: I2de57431f543a4bccfd70734dff1ed1fa48636c5

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 03:02:13 +0000 (03:02 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887 am: b71a431eab -s ours am: 5c4e9db2bb -s ours am: 348a267300 am: f9bcd8f269 am: b1d9532571 -s ours
am: 61328a3f38

Change-Id: Ibb188095eb9677ae8293a5922cf124055f544961

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 03:02:12 +0000 (03:02 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 180185da19 -s ours am: 5d50c6e5e0 am: 9cb824f404 am: b037147760 -s ours
am: 7db383ebb7

Change-Id: I3dbc9f8cf25eca9885f4356a97602c39c7db033a

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:59:10 +0000 (02:59 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887 am: b71a431eab -s ours am: 5c4e9db2bb -s ours am: 348a267300 am: f9bcd8f269
am: b1d9532571 -s ours

Change-Id: I315726456f9a01ae9ec942c9071b605d92b902fb

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:59:09 +0000 (02:59 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 180185da19 -s ours am: 5d50c6e5e0 am: 9cb824f404
am: b037147760 -s ours

Change-Id: I4ea77c0bc2828bf5560fd244f6d937b91a39c11f

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:57:01 +0000 (02:57 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887 am: b71a431eab -s ours am: 5c4e9db2bb -s ours am: 348a267300
am: f9bcd8f269

Change-Id: Id871c2271566705e62c0e608269fed0e0f4abc37

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:57:00 +0000 (02:57 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 180185da19 -s ours am: 5d50c6e5e0
am: 9cb824f404

Change-Id: If561b868ecee3b9cf54b9c1a669276008dfcc82f

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:54:04 +0000 (02:54 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887 am: b71a431eab -s ours am: 5c4e9db2bb -s ours
am: 348a267300

Change-Id: I594edffee48c52277de18e760aef5bf7916756b3

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:53:08 +0000 (02:53 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887 am: b71a431eab -s ours
am: 5c4e9db2bb -s ours

Change-Id: Id306e53c54feb78be4eeedd11fc43796973d8848

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:53:08 +0000 (02:53 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 180185da19 -s ours
am: 5d50c6e5e0

Change-Id: I82c5a285bb7464070072d11d05116cd69e837947

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:50:09 +0000 (02:50 +0000)]

SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331
am: 792a43273e

Change-Id: Ia721ae1add40fea83796817f7f16585450dbbd33

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:50:08 +0000 (02:50 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887
am: b71a431eab -s ours

Change-Id: I2b59b1bf145b023796e66cc13e385d5ec1c80b54

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:46:39 +0000 (02:46 +0000)]

SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c
am: 1cfd97c331

Change-Id: I9648977377ee7a06dff6ff00a4c74e31a0f44a3a

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:44:08 +0000 (02:44 +0000)]

SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11
am: 3efed2f14c

Change-Id: I33b4226d5aa42a1adc14988789ac2f0965cfb606

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:44:07 +0000 (02:44 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am: 180185da19 -s ours

Change-Id: I73131f2361fa0f950aca6ed77551cb8d7e6a96d9

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:43:37 +0000 (02:43 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b
am: 920b0f7887

Change-Id: I603ab931f82d8a83187be989dccb8686de8bf95e

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:41:33 +0000 (02:41 +0000)]

SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950
am: af39271e11

Change-Id: I2d263d12fecf7dc3974b665ca568d3db5dcd76b3

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:40:37 +0000 (02:40 +0000)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am: 940829f69b

Change-Id: I3df8797998bac785ad198cb4fb2401779a3947ff

commit | commitdiff | tree

Pawin Vongmasa [Fri, 19 Aug 2016 02:37:06 +0000 (02:37 +0000)]

SoftMPEG4: Check the buffer size before writing the reference frame.
am: 6951231950

Change-Id: I594a73e3b3a2002608675ac38e23c6b2764bd0d2

commit | commitdiff | tree

Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]

DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)

commit | commitdiff | tree

Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]

commit | commitdiff | tree

Ray Essick [Tue, 16 Aug 2016 21:24:43 +0000 (14:24 -0700)]

better validation lengths of strings in ID3 tags

Validate lengths on strings in ID3 tags, particularly around 0.
Also added code to handle cases when we can't get memory for
copies of strings we want to extract from these tags.

Affects L/M/N/master, same patch for all of them.

Bug: 30744884
Change-Id: I2675a817a39f0927ec1f7e9f9c09f2e61020311e
Test: play mp3 file which caused a <0 length.

commit | commitdiff | tree

Pawin Vongmasa [Fri, 12 Aug 2016 21:07:23 +0000 (21:07 +0000)]

DO NOT MERGE - ACodec: Save and use the previous crop rectangle. am: 07d73a0a3f
am: 5e523ead5a

Change-Id: Ie68d73caa56740f8d9273acd3a5888266092a3d4

commit | commitdiff | tree

Pawin Vongmasa [Fri, 12 Aug 2016 21:03:53 +0000 (21:03 +0000)]

DO NOT MERGE - ACodec: Save and use the previous crop rectangle.
am: 07d73a0a3f

Change-Id: I52c3cf5e2ccc0e2c84b0e634dba8e10054d4ff42

commit | commitdiff | tree

Pawin Vongmasa [Fri, 12 Aug 2016 01:51:24 +0000 (18:51 -0700)]

DO NOT MERGE - ACodec: Save and use the previous crop rectangle.

When the surface changes, set the crop rectangle for the new native
window using the previous crop rectangle if available.

Also prevent null pointer dereferencing in debug mode.

Bug: 30690174

Change-Id: I7a707d661ced5a87fcaa8568cbb903fbc26ea346

commit | commitdiff | tree

Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]

SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:18:54 +0000 (22:18 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours am: 7ab70a7ba9
am: 7543b66cfd

Change-Id: I6847dd0cffc7851773599f679c0a926ad7342783

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:18:53 +0000 (22:18 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours am: 63f8141861
am: 761a18edbe

Change-Id: Ic47006ebd0c7ac51b743773798676dd147892297

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:16:24 +0000 (22:16 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours
am: 7ab70a7ba9

Change-Id: I7210069708eefb8b5c10d5a5845668eb1c45b0f4

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:16:23 +0000 (22:16 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours
am: 63f8141861

Change-Id: Ie8abe25ffa6cb731d62419c318e14ca2b2fa6d82

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:13:28 +0000 (22:13 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a
am: f3cfa7f815 -s ours

Change-Id: I4a38c82e157f3a8e57da1a7aad847eb2657e7278

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:13:27 +0000 (22:13 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0
am: a7a43eb646 -s ours

Change-Id: I443f4c11ead7e5b1544fd213debfed85308a2cef

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:11:30 +0000 (22:11 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522
am: a28d14862a

Change-Id: Icbc3aa2db7297be677de0e40f0dc879c462d929f

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:11:29 +0000 (22:11 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded
am: 450fd950d0

Change-Id: I1e9071e2c055795c40d7973fec98c2a8850d7f62

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:08:22 +0000 (22:08 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
am: ee58cd8522

Change-Id: I0a099a5fc8d3c4c188380b78c7acf8c4239c8b38

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 22:08:21 +0000 (22:08 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error
am: 2d58796ded

Change-Id: Iee9435171a7566f60f48c657c6fada505e2eda90

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Aug 2016 22:05:02 +0000 (22:05 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev

commit | commitdiff | tree

Marco Nelissen [Mon, 1 Aug 2016 21:25:24 +0000 (21:25 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17
am: 3f5bbfce01

Change-Id: Ib4fc390cc0bbb567a9b326379a07185281415704

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:25:24 +0000 (21:25 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05
am: 26cf54f35a

Change-Id: I41f61245a331077becb774d5e31aa20493d4b674

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:22:30 +0000 (21:22 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours
am: 1d39eeea17

Change-Id: Ia482954362156d923126e1e2ecccef08b6e4c427

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:22:29 +0000 (21:22 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours
am: b017233d05

Change-Id: I5400e735c20ba9a0ebf2801a8bb35cdfc720a3f5

commit | commitdiff | tree

Marco Nelissen [Mon, 1 Aug 2016 21:19:54 +0000 (21:19 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0
am: 559b777d4f -s ours

Change-Id: Ibb838a504e61b142c33cbf6a9ed6e27d478dcbd2

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:19:53 +0000 (21:19 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d
am: 4f4d793ecb -s ours

Change-Id: I620085a5b0f5bd6a56ac5db49b137d984c7b984a

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:17:31 +0000 (21:17 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a
am: bbc4b190d0

Change-Id: I2a7760f7b6bb1c12d021fbcf0ddd5d5fcab21cc3

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:17:30 +0000 (21:17 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7
am: ac9dd1421d

Change-Id: I8038fce681bda8b550e2d84c3aea13004dc5ebc7

commit | commitdiff | tree

Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]

DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)

commit | commitdiff | tree

Marco Nelissen [Mon, 1 Aug 2016 21:13:52 +0000 (21:13 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours
am: 64c06e051a

Change-Id: I089103c8f98f6819bfe2e6ce3d229bdf5d9ddb9c

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:13:52 +0000 (21:13 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours
am: 4efaa1bca7

Change-Id: I0323e79f8297797599cd5ae3e5ae06ec81254128

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:11:24 +0000 (21:11 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
am: 8f4b1a7de0 -s ours

Change-Id: I5ccb9ee7ddd79e6a3599c1e53ff0247c0af50bf4

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 21:11:23 +0000 (21:11 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error
am: f4f36a0a31 -s ours

Change-Id: I5f7bb034371e3651a00a6023352b871eeeb9740a

commit | commitdiff | tree

Marco Nelissen [Mon, 1 Aug 2016 21:08:39 +0000 (21:08 +0000)]

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:52:12 +0000 (20:52 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f
am: b88ce695e4

Change-Id: I2b973cafc8605c7e14abe81930bf09230c51f1c8

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:49:16 +0000 (20:49 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours
am: a47d63df6f

Change-Id: I970030586310f86a7a79fef657d033f6e5b6a602

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:46:42 +0000 (20:46 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d
am: f3da79cfea -s ours

Change-Id: Id37c208ae6cfa2e8f43ba62c9b3d84101a322e46

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:44:11 +0000 (20:44 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5
am: 0c51e9905d

Change-Id: I4f5b6970ec841a06e6f99cadeac3e81665cc2ba2

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:38:12 +0000 (20:38 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours
am: 3041de70c5

Change-Id: Ifab7545acb5b56f5c0c55f43ceb748f4794f2456

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:35:41 +0000 (20:35 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours
am: 87d4805d94 -s ours

Change-Id: I7316ed78d4308e8528a79ec2f2ea7708164401ad

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:33:17 +0000 (20:33 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3
am: e40e452a3a -s ours

Change-Id: Ib76f39590bc10ace428d2e142db1f752ac3567c6

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:30:41 +0000 (20:30 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3
am: b39e9bffc1

Change-Id: I94081e4d78f974f55132f9ba0ad4d6e33998bb5c

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:30:39 +0000 (20:30 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2
am: 8df5df78a3

Change-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error
am: 17a10c50e2

Change-Id: I310e406b5370678b112f5ad0603e22456d6c3de7

commit | commitdiff | tree

Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]

DO NOT MERGE - stagefright: fix integer overflow error
am: 52780d3ce3

Change-Id: I1faf21de42ce1221174096e26cfc215e945655f0