OSDN Git Service

android-x86/frameworks-av.git
8 years agoDO NOT MERGE - ACodec: Save and use the previous crop rectangle.
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am...
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
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)

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
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

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3...
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
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

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
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)

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
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)

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
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)

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c...
Wonsik Kim [Tue, 19 Jul 2016 23:01:16 +0000 (23:01 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051
am: e02be17174

Change-Id: I7f452f8033eb9aa1aea4401e803493c5951b0581

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c...
Wonsik Kim [Tue, 19 Jul 2016 22:58:48 +0000 (22:58 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379
am: 56fb1ed051

Change-Id: I79dd256460081f658ed3209204cfd104de708637

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c...
Wonsik Kim [Tue, 19 Jul 2016 22:56:49 +0000 (22:56 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341
am: 45fb504379

Change-Id: I309cc67d0a97c88e18182b7435e5b271355e4772

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c...
Wonsik Kim [Tue, 19 Jul 2016 22:54:16 +0000 (22:54 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108
am: 062fd4a341

Change-Id: I979b1c6b415b83d11f1a0c24b7fe54fe79556676

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5
Wonsik Kim [Tue, 19 Jul 2016 22:51:43 +0000 (22:51 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5
am: f054728108

Change-Id: I230da4ea86abf01ff9057900f0eea1af151c9a00

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277
Wonsik Kim [Tue, 19 Jul 2016 22:46:54 +0000 (22:46 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277
am: c83b53c9e5

Change-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0

8 years agoomx: prevent input port enable/disable for software codecs
Wonsik Kim [Tue, 19 Jul 2016 22:44:18 +0000 (22:44 +0000)]
omx: prevent input port enable/disable for software codecs
am: 2b94fa8277

Change-Id: I5c370c34986be1435f2d0eebae8e264c0f4f0f44

8 years agoomx: prevent input port enable/disable for software codecs
Wonsik Kim [Thu, 7 Jul 2016 03:57:02 +0000 (12:57 +0900)]
omx: prevent input port enable/disable for software codecs

Bug: 29421804
Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f

8 years agoDO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours am...
Robert Shih [Thu, 14 Jul 2016 23:14:32 +0000 (23:14 +0000)]
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours am: 5d925fce78  -s ours am: 0576ffb637 am: cd349da1c2
am: 21a32935cb  -s ours

Change-Id: I94403eab4f73289a80cd126c2f66faef3657bdd1

8 years agoDO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours am...
Robert Shih [Thu, 14 Jul 2016 23:11:32 +0000 (23:11 +0000)]
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours am: 5d925fce78  -s ours am: 0576ffb637
am: cd349da1c2

Change-Id: I0bbf7d30e9f37cf6cb3f2a73d790b079c0bf837b

8 years agoDO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours am...
Robert Shih [Thu, 14 Jul 2016 23:09:06 +0000 (23:09 +0000)]
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours am: 5d925fce78  -s ours
am: 0576ffb637

Change-Id: Ieab310032dbf29bab829c7b01225d84fd3df354c

8 years agoDO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours
Robert Shih [Thu, 14 Jul 2016 23:06:31 +0000 (23:06 +0000)]
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours
am: 5d925fce78  -s ours

Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978

8 years agoDO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270
Robert Shih [Thu, 14 Jul 2016 23:04:02 +0000 (23:04 +0000)]
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270
am: 1038762b09  -s ours

Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a

8 years agoDO NOT MERGE - Fix build am: bf835e4525
Robert Shih [Thu, 14 Jul 2016 23:01:31 +0000 (23:01 +0000)]
DO NOT MERGE - Fix build am: bf835e4525
am: 98b31b9270

Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b

8 years agoDO NOT MERGE - Fix build
Robert Shih [Thu, 14 Jul 2016 22:58:30 +0000 (22:58 +0000)]
DO NOT MERGE - Fix build
am: bf835e4525

Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e

8 years agoDO NOT MERGE - Fix build
Robert Shih [Thu, 14 Jul 2016 22:32:08 +0000 (15:32 -0700)]
DO NOT MERGE - Fix build

Change-Id: Iff47bb735778fb275abeee573c636856b839feb5

8 years agoFix build
Robert Shih [Thu, 14 Jul 2016 20:50:32 +0000 (13:50 -0700)]
Fix build

Change-Id: I48ba34b3df9c9a896d4b18c3f48e41744b7dab54

8 years agoFix build
Robert Shih [Thu, 14 Jul 2016 19:37:52 +0000 (12:37 -0700)]
Fix build

Change-Id: I96a9c437eec53a285ac96794cc1ad0c8954b27e0

8 years agoMerge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into lmp-dev am: d5573715d8...
Robert Shih [Thu, 14 Jul 2016 18:19:58 +0000 (18:19 +0000)]
Merge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into lmp-dev am: d5573715d8  -s ours am: f2fffc9fd0 am: 047fb889cc
am: 9f7ef49df4  -s ours

Change-Id: If5670ac1cde5b28e1993344176682e6479932aa5

8 years agoMerge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into lmp-dev am: d5573715d8 ...
Robert Shih [Thu, 14 Jul 2016 18:15:20 +0000 (18:15 +0000)]
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into lmp-dev am: d5573715d8  -s ours am: f2fffc9fd0
am: 047fb889cc

Change-Id: I09b46561d6490b0693e0f37e3b770a50de2b82f2

8 years agoMerge \\"DO NOT MERGE - SoftMP3: memset safely\\" into lmp-dev am: d5573715d8 -s...
Robert Shih [Thu, 14 Jul 2016 18:11:42 +0000 (18:11 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into lmp-dev am: d5573715d8  -s ours
am: f2fffc9fd0

Change-Id: I5a1d3e49a82b031a74d48396ee719410d8e6a09a

8 years agoMerge \"DO NOT MERGE - SoftMP3: memset safely\" into lmp-dev
Robert Shih [Thu, 14 Jul 2016 18:09:23 +0000 (18:09 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into lmp-dev
am: d5573715d8  -s ours

Change-Id: I8f7f2b98145c76b2904a0ef57651214e6881aac5

8 years agoMerge "SoftMP3: memset safely" into mnc-dev
Robert Shih [Thu, 14 Jul 2016 18:06:25 +0000 (18:06 +0000)]
Merge "SoftMP3: memset safely" into mnc-dev

8 years agoMerge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev
Robert Shih [Thu, 14 Jul 2016 18:06:19 +0000 (18:06 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev

8 years agoMerge \\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\" into lmp-dev am: 5f34f...
Sergio Giro [Thu, 14 Jul 2016 18:03:15 +0000 (18:03 +0000)]
Merge \\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\" into lmp-dev am: 5f34f40530  -s ours am: 20ae503b50 am: 012d1246ce
am: e6373adbec  -s ours

Change-Id: I451066bdcc955ad76e81f1650f1583b5b560a094

8 years agoDO NOT MERGE Add bound checks to utf16_to_utf8 am: 0d9d569c26 am: edce8ad060
Sergio Giro [Thu, 14 Jul 2016 18:03:12 +0000 (18:03 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8 am: 0d9d569c26 am: edce8ad060
am: 4f24f218dc  -s ours

Change-Id: I087fe456765f1129a8697604be2f6e47243446f9

8 years agoMerge \\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\" into lmp-dev am: 5f34f40...
Sergio Giro [Thu, 14 Jul 2016 18:00:54 +0000 (18:00 +0000)]
Merge \\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\" into lmp-dev am: 5f34f40530  -s ours am: 20ae503b50
am: 012d1246ce

Change-Id: I07f7f569d97ccf58cd48f11e700c64d2eaeededc

8 years agoDO NOT MERGE Add bound checks to utf16_to_utf8 am: 0d9d569c26
Sergio Giro [Thu, 14 Jul 2016 17:59:53 +0000 (17:59 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8 am: 0d9d569c26
am: edce8ad060

Change-Id: I1c725b97d3f1fcabaa7129200ca67c3d479fd771

8 years agoMerge \\"DO NOT MERGE Add bound checks to utf16_to_utf8\\" into lmp-dev am: 5f34f4053...
Sergio Giro [Thu, 14 Jul 2016 17:59:45 +0000 (17:59 +0000)]
Merge \\"DO NOT MERGE Add bound checks to utf16_to_utf8\\" into lmp-dev am: 5f34f40530  -s ours
am: 20ae503b50

Change-Id: Ib55ae047145673b53042b2e705f4407a0627b5bc

8 years agoMerge \"DO NOT MERGE Add bound checks to utf16_to_utf8\" into lmp-dev
Sergio Giro [Thu, 14 Jul 2016 17:52:03 +0000 (17:52 +0000)]
Merge \"DO NOT MERGE Add bound checks to utf16_to_utf8\" into lmp-dev
am: 5f34f40530  -s ours

Change-Id: I2426d28827f0ee2e2077f31d411af78a58e72b32

8 years agoDO NOT MERGE Add bound checks to utf16_to_utf8
Sergio Giro [Thu, 14 Jul 2016 17:52:03 +0000 (17:52 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8
am: 0d9d569c26

Change-Id: Ic54078ce7eed59b04e6e4862bf2daf2aa0185950

8 years agoMerge "DO NOT MERGE Add bound checks to utf16_to_utf8" into lmp-dev
Sergio Giro [Thu, 14 Jul 2016 17:36:23 +0000 (17:36 +0000)]
Merge "DO NOT MERGE Add bound checks to utf16_to_utf8" into lmp-dev

8 years agoDO NOT MERGE Add bound checks to utf16_to_utf8
Sergio Giro [Tue, 28 Jun 2016 17:24:52 +0000 (18:24 +0100)]
DO NOT MERGE Add bound checks to utf16_to_utf8

Bug: 29250543
(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)

Change-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83

8 years agoAdd bound checks to utf16_to_utf8
Sergio Giro [Tue, 28 Jun 2016 17:24:52 +0000 (18:24 +0100)]
Add bound checks to utf16_to_utf8

Bug: 29250543
Change-Id: I3518416e89ed901021970958fb6005fd69129f7c
(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)

8 years agoDO NOT MERGE Add bound checks to utf16_to_utf8
Sergio Giro [Tue, 28 Jun 2016 17:24:52 +0000 (18:24 +0100)]
DO NOT MERGE Add bound checks to utf16_to_utf8

Bug: 29250543
(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)

Change-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83

8 years agofix build
Lajos Molnar [Thu, 14 Jul 2016 03:27:32 +0000 (20:27 -0700)]
fix build

Change-Id: I9bb8c659d3fc97a8e748451d82d0f3448faa242b

8 years agoMerge \\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\" into klp-dev am: 3242dcf6...
Robert Shih [Thu, 14 Jul 2016 02:03:29 +0000 (02:03 +0000)]
Merge \\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours am: a2f91257fd  -s ours am: da2ac348fc am: 8635613bf3
am: d88de681cd  -s ours

Change-Id: I081055beacca8e362ff4a0e80221586918167e41

8 years agoMerge \\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\" into klp-dev am: 3242dcf6e9...
Robert Shih [Thu, 14 Jul 2016 01:58:04 +0000 (01:58 +0000)]
Merge \\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours am: a2f91257fd  -s ours am: da2ac348fc
am: 8635613bf3

Change-Id: I534362c8ac08d793e2e9b19190a3091c252edc66

8 years agoMerge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into klp-dev am: 3242dcf6e9...
Robert Shih [Thu, 14 Jul 2016 01:49:30 +0000 (01:49 +0000)]
Merge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours am: a2f91257fd  -s ours
am: da2ac348fc

Change-Id: I6d0517817b12073b3ce93dcfe14626399770a1fb

8 years agoMerge \\\\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\\\" into klp-dev...
Robert Shih [Thu, 14 Jul 2016 01:43:53 +0000 (01:43 +0000)]
Merge \\\\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\\\" into klp-dev am: 91ad8847ab am: 74b10b831c am: 6bdf8cb440  -s ours am: 1f5fe85d74  -s ours am: 67443ebc81 am: 12165c481f
am: d4e82b9e6e  -s ours

Change-Id: I41a3e3896eadfc521a5cab3d3074618a847acb37

8 years agoMerge \\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\"...
Robert Shih [Thu, 14 Jul 2016 01:43:52 +0000 (01:43 +0000)]
Merge \\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8 am: a17d7c0307
am: 83d7bdbceb

Change-Id: I1d0e31020d3cf327a552854192dfa5c8e4ca4a09

8 years agoMerge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into klp-dev am: 3242dcf6e9...
Robert Shih [Thu, 14 Jul 2016 01:43:50 +0000 (01:43 +0000)]
Merge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours
am: a2f91257fd  -s ours

Change-Id: I64c9657a66aa2e818ebc002af31591e6db51907d

8 years agoMerge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev am: 3242dcf6e9 am...
Robert Shih [Thu, 14 Jul 2016 01:41:18 +0000 (01:41 +0000)]
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154
am: e3c1c2d734  -s ours

Change-Id: I018c8bedc4d810b7abca34ff4273e249ebc0648f

8 years agoMerge \\\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\\" into klp-dev...
Robert Shih [Thu, 14 Jul 2016 01:41:18 +0000 (01:41 +0000)]
Merge \\\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\\" into klp-dev am: 91ad8847ab am: 74b10b831c am: 6bdf8cb440  -s ours am: 1f5fe85d74  -s ours am: 67443ebc81
am: 12165c481f

Change-Id: I97c5746a61515aefdb065f9d6a9ce3f9281999cb

8 years agoMerge \\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\" into...
Robert Shih [Thu, 14 Jul 2016 01:41:16 +0000 (01:41 +0000)]
Merge \\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8
am: a17d7c0307

Change-Id: If552708dbdb28fe1b744adbd92790faafbc10783

8 years agoMerge \\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\" into klp-dev am...
Robert Shih [Thu, 14 Jul 2016 01:38:01 +0000 (01:38 +0000)]
Merge \\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\" into klp-dev am: 91ad8847ab am: 74b10b831c am: 6bdf8cb440  -s ours am: 1f5fe85d74  -s ours
am: 67443ebc81

Change-Id: Ieb95c0c81bd8f5503e0162fc5ee2c7f2421612e7

8 years agoMerge \\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\" into...
Robert Shih [Thu, 14 Jul 2016 01:38:00 +0000 (01:38 +0000)]
Merge \\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295
am: 5d36fedeb8

Change-Id: I38291dfa8aa8956b53f074df1084668f53b7f7fe

8 years agoDO NOT MERGE - SoftVPX: fix nFilledLen overflow am: b7ba49c1a0 -s ours am: c7dd19198...
Robert Shih [Thu, 14 Jul 2016 01:37:59 +0000 (01:37 +0000)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow am: b7ba49c1a0  -s ours am: c7dd19198c am: 3cb33198d6
am: baba64dd05  -s ours

Change-Id: I9dd3ff57b51d10efeb17fefdc55e787035dfa587

8 years agoMerge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am: 3242dcf6e9
Robert Shih [Thu, 14 Jul 2016 01:37:58 +0000 (01:37 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am: 3242dcf6e9
am: f4ad14f154

Change-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450

8 years agoDO NOT MERGE - SoftVPX: fix nFilledLen overflow am: b7ba49c1a0 -s ours am: c7dd19198c
Robert Shih [Thu, 14 Jul 2016 01:34:32 +0000 (01:34 +0000)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow am: b7ba49c1a0  -s ours am: c7dd19198c
am: 3cb33198d6

Change-Id: Ie17c37e86bebce202fa6c18f60149a191b3eaf2f

8 years agoMerge \\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\" into klp-dev am:...
Robert Shih [Thu, 14 Jul 2016 01:31:31 +0000 (01:31 +0000)]
Merge \\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\" into klp-dev am: 91ad8847ab am: 74b10b831c am: 6bdf8cb440  -s ours
am: 1f5fe85d74  -s ours

Change-Id: I3bb44ca286fd216f56d945996675a3d6045aa93d

8 years agoMerge \\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\" into klp...
Robert Shih [Thu, 14 Jul 2016 01:31:30 +0000 (01:31 +0000)]
Merge \\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f
am: 29f09eb295

Change-Id: Ib65bf1a2dd56dfa84881a18acf0ba1871cdff38c

8 years agoMerge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:31:29 +0000 (01:31 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
am: 3242dcf6e9

Change-Id: I09c381c92c7efeacc95c611b2775d875a6202027

8 years agoMerge \\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\" into klp-dev am: 91ad88...
Robert Shih [Thu, 14 Jul 2016 01:28:42 +0000 (01:28 +0000)]
Merge \\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\" into klp-dev am: 91ad8847ab am: 74b10b831c
am: 6bdf8cb440  -s ours

Change-Id: Id01ce97ff7add25f1f0b067440916e9d299a740b

8 years agoMerge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp...
Robert Shih [Thu, 14 Jul 2016 01:28:41 +0000 (01:28 +0000)]
Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp-dev am: f545c72b97 am: d89781f3be
am: c9c40b829f

Change-Id: I5facfd78f7050928d30c86585036128749b1f292

8 years agoDO NOT MERGE - SoftVPX: fix nFilledLen overflow am: b7ba49c1a0 -s ours
Robert Shih [Thu, 14 Jul 2016 01:28:38 +0000 (01:28 +0000)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow am: b7ba49c1a0  -s ours
am: c7dd19198c

Change-Id: Ie8bd4477f33d081adc23e74d1be699780ba2cf41

8 years agoMerge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:26:14 +0000 (01:26 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev

8 years agoMerge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am: 91ad8847ab
Robert Shih [Thu, 14 Jul 2016 01:25:31 +0000 (01:25 +0000)]
Merge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am: 91ad8847ab
am: 74b10b831c

Change-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2

8 years agoMerge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev...
Robert Shih [Thu, 14 Jul 2016 01:25:30 +0000 (01:25 +0000)]
Merge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev am: f545c72b97
am: d89781f3be

Change-Id: Iae2cc6d8f4512e7e1f4273bbb28b292337e291b6

8 years agoMerge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
am: 91ad8847ab

Change-Id: I66eec25f4bc143dd5d67b9bb77825f6e6c732880

8 years agoMerge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
am: f545c72b97

Change-Id: I9206ce86485cb3acc2540d135f6beacc03bb38f5

8 years agoDO NOT MERGE - SoftVPX: fix nFilledLen overflow
Robert Shih [Thu, 14 Jul 2016 01:22:48 +0000 (01:22 +0000)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow
am: b7ba49c1a0  -s ours

Change-Id: I87244bcc43caae1977289c0cf66093f5d94b3527

8 years agoMerge "SoftVPX: fix nFilledLen overflow" into mnc-dev
Robert Shih [Thu, 14 Jul 2016 01:21:06 +0000 (01:21 +0000)]
Merge "SoftVPX: fix nFilledLen overflow" into mnc-dev

8 years agoMerge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:18:10 +0000 (01:18 +0000)]
Merge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev

8 years agoMerge "OMXCodec: check IMemory::pointer() before using allocation" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:16:52 +0000 (01:16 +0000)]
Merge "OMXCodec: check IMemory::pointer() before using allocation" into klp-dev

8 years agoDO NOT MERGE - SoftMP3: memset safely
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely

Bug: 29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97

8 years agoDO NOT MERGE - SoftMP3: memset safely
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely

Bug: 29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97

8 years agoDO NOT MERGE - SoftVPX: fix nFilledLen overflow
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow

Bug: 29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3

8 years agoDO NOT MERGE - SoftVPX: fix nFilledLen overflow
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow

Bug: 29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3

8 years agoSoftVPX: fix nFilledLen overflow
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
SoftVPX: fix nFilledLen overflow

Bug: 29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3

8 years agoMerge \\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\" into klp...
Ray Essick [Wed, 13 Jul 2016 22:55:00 +0000 (22:55 +0000)]
Merge \\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0
am: b528c30f00

Change-Id: I45609cc7db5ce15b9e3ce02465d5a81e849f445d

8 years agoMerge \\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\" into klp-dev...
Ray Essick [Wed, 13 Jul 2016 22:52:22 +0000 (22:52 +0000)]
Merge \\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0
am: fbdd8670a0

Change-Id: I42f79dd854a98d8fe20e922a35db372b54fc53b8