OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b00...
Ricardo Garcia [Thu, 13 Oct 2016 01:48:06 +0000 (01:48 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e am: 6732f45ee9 am: 24566f2939 am: 25a681e678
am: 73895e0b02

Change-Id: I5770281efd6e83a2cb0ed40b16436625b3c10da8

7 years agoFix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a...
rago [Thu, 13 Oct 2016 01:47:50 +0000 (01:47 +0000)]
Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a am: bcc7230bb9 am: f4a63f6765
am: ecfd198cda

Change-Id: Ie96acf726e282e014339b2817ad6aa0634378ca9

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b00...
Ricardo Garcia [Thu, 13 Oct 2016 01:41:05 +0000 (01:41 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e am: 6732f45ee9 am: 24566f2939
am: 25a681e678

Change-Id: I658364d7223918d5757d61e2e9ce9f905e6a7627

7 years agoFix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a...
rago [Thu, 13 Oct 2016 01:40:51 +0000 (01:40 +0000)]
Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a am: bcc7230bb9
am: f4a63f6765

Change-Id: I6a360ed595632dbb9d8e370c4561ec41d07c173f

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b00...
Ricardo Garcia [Thu, 13 Oct 2016 01:33:30 +0000 (01:33 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e am: 6732f45ee9
am: 24566f2939

Change-Id: Ibfc04cf102256f0a114b9670550beee44254be14

7 years agoFix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a
rago [Thu, 13 Oct 2016 01:33:18 +0000 (01:33 +0000)]
Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a
am: bcc7230bb9

Change-Id: If5d6fefb276341472d827bac3f349561f7d1d990

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 01:27:04 +0000 (01:27 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42 am: d18d8fac61  -s ours am: 54c0001dc9  -s ours
am: 253e3ae0ba

Change-Id: I74873bdd367f238277c74fec12edf7275ee14435

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e
Ricardo Garcia [Thu, 13 Oct 2016 01:26:59 +0000 (01:26 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e
am: 6732f45ee9

Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86...
Pawin Vongmasa [Thu, 13 Oct 2016 01:26:48 +0000 (01:26 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86 am: 2c76c56d56 am: f1e84ca858  -s ours am: 7b9756261d  -s ours
am: d676f1bfeb

Change-Id: I0f8ec51bbc0e26aae780f20668f5ac03d5a8da42

7 years agoFix potential NULL dereference in Visualizer effect am: 874f9e0b8e
rago [Thu, 13 Oct 2016 01:26:47 +0000 (01:26 +0000)]
Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e
am: f060479b9a

Change-Id: I69eb3819f246e6d807af099f9a0260146cd06fd2

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 01:20:03 +0000 (01:20 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42 am: d18d8fac61  -s ours
am: 54c0001dc9  -s ours

Change-Id: I6bb100ce240464dff699c5d37227a93e085a2f74

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
am: eee86b009e

Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728

7 years agoFix potential NULL dereference in Visualizer effect
rago [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
Fix potential NULL dereference in Visualizer effect
am: 874f9e0b8e

Change-Id: I382b8cc3799b52e085aac0ccec7dcb668a4933ec

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86...
Pawin Vongmasa [Thu, 13 Oct 2016 01:19:47 +0000 (01:19 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86 am: 2c76c56d56 am: f1e84ca858  -s ours
am: 7b9756261d  -s ours

Change-Id: I016c0378320af03c05a01059de8c6edeabd84130

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 01:13:46 +0000 (01:13 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:59 +0000 (01:12 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42
am: d18d8fac61  -s ours

Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86...
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86 am: 2c76c56d56
am: f1e84ca858  -s ours

Change-Id: I7b0abee027d5cc3e697b3afcbf8412641f963ad3

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:30 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235
am: b512f4ab42

Change-Id: Ic852128c935782783fc03175be9968da6e894e90

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:29 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am: b6ba3d7e47  -s ours
am: 37e3ea354a

Change-Id: Ica84145fb5bba2067aeaa3311d66395aea25e860

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 0338b14e28...
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:17 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 0338b14e28  -s ours
am: 648b682eeb

Change-Id: I8a304efd3e38c9b3a5f1d6c507250bf7ce26319a

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:16 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86
am: 2c76c56d56

Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
am: 8caef85235

Change-Id: I9b4b155c4a720b27120428ea995833c426a65fef

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
am: b6ba3d7e47  -s ours

Change-Id: Iab547a3c17869e99ec58022b11a27eeb2777c729

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev
am: 622fd04e88

Change-Id: I9a6424ca1f7724e5513e0251f650382b3a49f1f7

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am: 0338b14e28  -s ours

Change-Id: Idc7eaeacd94e4499b75aaa1213bf6848ae9206c1

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am: de84a76b86

Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:45 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am: 25d34cacde

Change-Id: I92443c3bee4174f9c6d493911d84d022dbb1972f

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:52 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:49 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:33 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev

7 years agoFix potential NULL dereference in Visualizer effect
rago [Sat, 8 Oct 2016 01:16:09 +0000 (18:16 -0700)]
Fix potential NULL dereference in Visualizer effect

Bug: 30229821

Test: fixing CL. Existing unit tests still pass.

Change-Id: I6e4abd759d5d2abc3b391e92e2e18f060cab7af0

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c...
Lajos Molnar [Tue, 11 Oct 2016 23:16:13 +0000 (23:16 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189 am: 1c44a2ed66 am: efe63962a7
am: 6616cf9e18

Change-Id: If2b68293e43057d517989755f64e56bdfab20b8e

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c...
Lajos Molnar [Tue, 11 Oct 2016 23:10:12 +0000 (23:10 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189 am: 1c44a2ed66
am: efe63962a7

Change-Id: Id22c6f78db4d457c281ab9db7c214236c2bdb18d

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c...
Lajos Molnar [Tue, 11 Oct 2016 23:04:42 +0000 (23:04 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189
am: 1c44a2ed66

Change-Id: I5ef2909336c4264e22c4216b64fccc46ea654c19

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102
Lajos Molnar [Tue, 11 Oct 2016 22:58:40 +0000 (22:58 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102
am: d9f6b22189

Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key
Lajos Molnar [Tue, 11 Oct 2016 22:53:10 +0000 (22:53 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
am: afb20c3102

Change-Id: Ia68b31d3e1781cb24e0c16f669a6b26644f33d46

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key
Lajos Molnar [Tue, 11 Oct 2016 15:41:51 +0000 (08:41 -0700)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key

Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.

Bug: 31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Fri, 30 Sep 2016 07:45:52 +0000 (00:45 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: If2708b3006c22393e80a2557f93d8a71e4e7bf16

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Fri, 30 Sep 2016 09:44:54 +0000 (02:44 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: Icc5714bd2459c053c0a913b1c27d9ffbef5b2d2a

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Fri, 30 Sep 2016 09:29:29 +0000 (02:29 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: I7fd0bb683819b2e43863b861fb078a6a67fa5317

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6...
Robert Shih [Thu, 22 Sep 2016 04:39:05 +0000 (04:39 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6 am: a78bd18c93 am: 9578341c41 am: 8ede96a5f2
am: f7a2861c08

Change-Id: Ic6e50bef5ab391402178a6f81695a9570b948497

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d58...
Robert Shih [Thu, 22 Sep 2016 04:38:49 +0000 (04:38 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1
am: f72b9e0011

Change-Id: Id75a548e9ca949e760f1e642283fcd27e57dd2dd

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6...
Robert Shih [Thu, 22 Sep 2016 03:12:21 +0000 (03:12 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6 am: a78bd18c93 am: 9578341c41
am: 8ede96a5f2

Change-Id: I48772c14585f8f90012321a9f16d57c09338811b

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d58...
Robert Shih [Thu, 22 Sep 2016 03:12:07 +0000 (03:12 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892
am: d4ddd555f1

Change-Id: I08b5684d546c10a0bc1bd47e74528f9ec7819003

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6...
Robert Shih [Thu, 22 Sep 2016 03:07:42 +0000 (03:07 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6 am: a78bd18c93
am: 9578341c41

Change-Id: Ia3bdadd25c957b6a5e3a1a7fe0e5e414ff510721

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c
Robert Shih [Thu, 22 Sep 2016 03:07:28 +0000 (03:07 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c
am: e0d588b892

Change-Id: I62d47aa490a6fb62eabd5f80da26e47de69b8b1c

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6
Robert Shih [Thu, 22 Sep 2016 00:43:10 +0000 (00:43 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6
am: a78bd18c93

Change-Id: Iec88e35a497a7503b589739082b86ae5bc0e2479

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9
Robert Shih [Thu, 22 Sep 2016 00:42:56 +0000 (00:42 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9
am: 8468b8980c

Change-Id: I4d81b7bd8732f03d0308740b96418203d17cd65b

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev
Robert Shih [Thu, 22 Sep 2016 00:36:56 +0000 (00:36 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev
am: 610a9222d6

Change-Id: I39efc9f85b13cb1212565b58f8907fd53b31920c

7 years agoSampleIterator: clear members on seekTo error
Robert Shih [Thu, 22 Sep 2016 00:36:55 +0000 (00:36 +0000)]
SampleIterator: clear members on seekTo error
am: 03237ce0f9

Change-Id: I0dd1251bd8f132b445ebf515e4555e9ec9953269

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev
Robert Shih [Thu, 22 Sep 2016 00:25:48 +0000 (00:25 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev

7 years agoLimit mp4 atom size to something reasonable am: cb898dca47
Marco Nelissen [Wed, 21 Sep 2016 21:58:19 +0000 (21:58 +0000)]
Limit mp4 atom size to something reasonable am: cb898dca47
am: 3a8c303038

Change-Id: I7907117a622513ea8f1cc5d198e056778ddc3e50

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Wed, 21 Sep 2016 21:55:16 +0000 (21:55 +0000)]
Limit mp4 atom size to something reasonable
am: cb898dca47

Change-Id: I4aedbf522dfabefbe797d37e3a37160c8f210e90

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am...
Marco Nelissen [Wed, 21 Sep 2016 20:56:47 +0000 (20:56 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d
am: f5b8755f18

Change-Id: I0580baa791fa7f87f5e65a47bff20cf1d44334c2

7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c...
Marco Nelissen [Wed, 21 Sep 2016 20:56:34 +0000 (20:56 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c55d  -s ours am: 03bee1989e
am: 6c6dd8d9a5

Change-Id: I60b8d9c769c814b67a636ea8f2f3b451c548f7f6

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am...
Marco Nelissen [Wed, 21 Sep 2016 20:54:21 +0000 (20:54 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb
am: b617cbed2d

Change-Id: Ia289fe9f51200867d38ad92821db2b48532e62e9

7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c...
Marco Nelissen [Wed, 21 Sep 2016 20:54:04 +0000 (20:54 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c55d  -s ours
am: 03bee1989e

Change-Id: I9ebff4e3cb7adace3949c550a74d072c53a18a27

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am...
Marco Nelissen [Wed, 21 Sep 2016 20:52:08 +0000 (20:52 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb
am: 085a4173eb

Change-Id: I0727b58843540b89c4e4668c1e7f2168d5fc7058

7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605
Marco Nelissen [Wed, 21 Sep 2016 20:51:33 +0000 (20:51 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605
am: 29ccd8c55d  -s ours

Change-Id: If514b12f86a85a90ff0835eeafa5a31324ec3c17

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc
Marco Nelissen [Wed, 21 Sep 2016 20:41:43 +0000 (20:41 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc
am: 3fb9e5b7cb

Change-Id: Ibcb0e44db0ff0da658af399522266606171b6a2e

7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6
Marco Nelissen [Wed, 21 Sep 2016 20:41:31 +0000 (20:41 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6
am: 569f3db605

Change-Id: Icc063dd70e08fea6320e3d3f64ebbd4ba51d8aa8

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev
am: 9af51c59dc

Change-Id: Id16a06b7ec4fceac9ecec7ed3504fdf233095268

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Limit mp4 atom size to something reasonable
am: 638c99bad6

Change-Id: I1284a0b7a44c5f7a8d88b931114e201d8cb09601

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev
Marco Nelissen [Wed, 21 Sep 2016 20:35:16 +0000 (20:35 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a

7 years agoCheck mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c
Marco Nelissen [Wed, 21 Sep 2016 14:49:00 +0000 (14:49 +0000)]
Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c
am: 762b7a9b6e

Change-Id: I63e5846c6a21f03c9063c3d48e49dfe48fb22ea7

7 years agoCheck mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be
Marco Nelissen [Wed, 21 Sep 2016 14:46:30 +0000 (14:46 +0000)]
Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be
am: e353ce4b3c

Change-Id: Iba3ac429600319f099276cc774eb8b3bb85e7b25

7 years agoCheck mprotect result am: 866c800c06 am: a0cfcf38d4
Marco Nelissen [Wed, 21 Sep 2016 14:44:02 +0000 (14:44 +0000)]
Check mprotect result am: 866c800c06 am: a0cfcf38d4
am: 638aca47be

Change-Id: I337dd1d62a4cd52de051afd4d9b919a742ad20fe

7 years agoCheck mprotect result am: 866c800c06
Marco Nelissen [Wed, 21 Sep 2016 14:41:28 +0000 (14:41 +0000)]
Check mprotect result am: 866c800c06
am: a0cfcf38d4

Change-Id: I0f188e2c717922689df42af21f6c47a865a8c390

7 years agoCheck mprotect result
Marco Nelissen [Wed, 21 Sep 2016 14:38:58 +0000 (14:38 +0000)]
Check mprotect result
am: 866c800c06

Change-Id: I7b20d72aafb9a95480c1a6b16f0cafc4d1749470

7 years agoSampleIterator: clear members on seekTo error
Robert Shih [Wed, 21 Sep 2016 00:37:55 +0000 (17:37 -0700)]
SampleIterator: clear members on seekTo error

Bug: 31091777
Change-Id: Iddf99d0011961d0fd3d755e57db4365b6a6a1193

7 years agoCheck mprotect result
Marco Nelissen [Tue, 20 Sep 2016 20:36:40 +0000 (13:36 -0700)]
Check mprotect result

mprotect can theoretically fail, which could then let one exploit
a vulnerable codec if one exists on the device.

Bug: 31350239
Change-Id: I7b99c190619f0fb2eb93119596e6da0d2deb8ba5

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am...
Ricardo Garcia [Tue, 20 Sep 2016 01:27:53 +0000 (01:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3
am: d959eb23c5

Change-Id: I9607061992408699810ee2e3da764b249fee5cf1

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250...
rago [Tue, 20 Sep 2016 01:27:39 +0000 (01:27 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb am: 2feb9ce748
am: fba2bd1372

Change-Id: Ic9b0c82b5fa96866efe440d28ba5226c12fa6af1

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb914...
Chong Zhang [Tue, 20 Sep 2016 01:27:13 +0000 (01:27 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9
am: 87415a74ee

Change-Id: If59c75fcee406abe3a2afb1c3e601f7f4b5f8970

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am...
Ricardo Garcia [Tue, 20 Sep 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313
am: 9a5ec6b4c3

Change-Id: I9567b9e3dbd3107cb64ae96681fec0ebb775190f

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb
rago [Tue, 20 Sep 2016 00:56:50 +0000 (00:56 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb
am: 2feb9ce748

Change-Id: I6a251c81d4337113a863a5364c39006678cca066

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb914...
Chong Zhang [Tue, 20 Sep 2016 00:56:26 +0000 (00:56 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c
am: b308b1a5d9

Change-Id: I502080e16a7543aac4b6720283f27b365bac8d52

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am...
Ricardo Garcia [Tue, 20 Sep 2016 00:46:09 +0000 (00:46 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5
am: d7822b3313

Change-Id: Iec66f66b4239b395253d757d57725ecd20320c13

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
rago [Tue, 20 Sep 2016 00:46:03 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
am: bad0250dcb

Change-Id: I23660e1da14f232ff786f9ab78da3e26f301c1b2

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
Chong Zhang [Tue, 20 Sep 2016 00:45:37 +0000 (00:45 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
am: dfe5b5193c

Change-Id: Ibd28b74deb652eb61b08e933a5e288d145841a14

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952
Ricardo Garcia [Tue, 20 Sep 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952
am: f59ab362c5

Change-Id: I9b65bbed0946bb25b25772f24256dbe1f8fe022c

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52
rago [Tue, 20 Sep 2016 00:39:33 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52
am: 8720f85196

Change-Id: I0803632824e6fc5a70ad6a1ba36743eb11cc3e7e

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2
Chong Zhang [Tue, 20 Sep 2016 00:39:03 +0000 (00:39 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2
am: 86d9bb9141

Change-Id: Id27e600a2c500634cd56bb8367f8d7ce811d63e8

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev
Ricardo Garcia [Tue, 20 Sep 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev
am: b602286952

Change-Id: Ic0cd9c82a5417e0281db38d806956876d95801fc

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:04 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 46dc714d52

Change-Id: I61f5adb793d2c54c078211213b25fd7ea37a3895

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Tue, 20 Sep 2016 00:29:11 +0000 (00:29 +0000)]
IOMX: do not clear buffer if it's allocated by component
am: ea76573aa2

Change-Id: Id77521c1d8a2e3c0f24b3467db0cea1907d5b934

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev
Ricardo Garcia [Tue, 20 Sep 2016 00:27:26 +0000 (00:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Mon, 19 Sep 2016 22:29:04 +0000 (15:29 -0700)]
IOMX: do not clear buffer if it's allocated by component

The component might depends on their buffers to be initialized
in certain ways to work. Don't clear unless we're allocating it.

bug: 31586647
Change-Id: Ia0a125797e414998ef0cd8ce03672f5b1e0bbf7a

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc...
Lajos Molnar [Thu, 15 Sep 2016 22:46:54 +0000 (22:46 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0 am: daa3b8e3fa
am: c47a0e4c71

Change-Id: I25b1252b6165bb815d6713ca3bce6a17dffdd640

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc...
Lajos Molnar [Thu, 15 Sep 2016 22:44:54 +0000 (22:44 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0
am: daa3b8e3fa

Change-Id: I163ffc7bb0b794af540653614be05abfe2fb828e

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
Lajos Molnar [Thu, 15 Sep 2016 22:41:53 +0000 (22:41 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
am: 9a565c52b0

Change-Id: If2465b5f16cc58d5d0d7cda3e117ad863dafd479

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b
Lajos Molnar [Thu, 15 Sep 2016 22:39:55 +0000 (22:39 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b
am: 99accf6cdc

Change-Id: I2f80600bad65948b26e839d8588b98a574ffba9b

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Thu, 15 Sep 2016 22:36:52 +0000 (22:36 +0000)]
IOMX: allow configuration after going to loaded state
am: c13904014b

Change-Id: Ibc6e43830d08890077691ebd55b1515554b94053

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Wed, 14 Sep 2016 17:01:37 +0000 (10:01 -0700)]
IOMX: allow configuration after going to loaded state

This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.

Bug: 31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d

7 years agoMerge "SoundTrigger: get service by value." into lmp-dev am: d9288b85b3
Eric Laurent [Tue, 13 Sep 2016 23:16:41 +0000 (23:16 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev am: d9288b85b3
am: 1382a3a869

Change-Id: Iff9cdece93d788ec081e95d68b0470dd42d338ab

7 years agoSoundTrigger: get service by value. am: 3b01b3019b
Eric Laurent [Tue, 13 Sep 2016 23:16:40 +0000 (23:16 +0000)]
SoundTrigger: get service by value. am: 3b01b3019b
am: bd33d5672f

Change-Id: I02848bd715ac17b90728d867242889749ff39f61

7 years agoMerge "SoundTrigger: get service by value." into lmp-dev
Eric Laurent [Tue, 13 Sep 2016 23:13:41 +0000 (23:13 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev
am: d9288b85b3

Change-Id: Ic8cd8682688c8363420e768996c13af072f61182

7 years agoSoundTrigger: get service by value.
Eric Laurent [Tue, 13 Sep 2016 23:13:40 +0000 (23:13 +0000)]
SoundTrigger: get service by value.
am: 3b01b3019b

Change-Id: Ibb98c945e51fef6d21e91b1e9f670eb4f83c5663