OSDN Git Service

android-x86/frameworks-av.git
7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 25d34cacde...
Pawin Vongmasa [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 25d34cacde am: 428493c16d  -s ours am: c2af35e25d
am: 4da47f34d9

Change-Id: I81ea81ec83a84c23c4e3f7e79bed983f8838ba5e

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 25d34cacde...
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 25d34cacde am: 428493c16d  -s ours
am: c2af35e25d

Change-Id: I3ecb5174b9cdcfea100980f10390655c33681e31

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 25d34cacde
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:16 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: 25d34cacde
am: 428493c16d  -s ours

Change-Id: I52e1635153f8969caed1f4be5394ba7bdcf09985

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 agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c...
Lajos Molnar [Wed, 12 Oct 2016 01:35:52 +0000 (01:35 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189 am: 1c44a2ed66 am: efe63962a7 am: 6616cf9e18 am: 998d7dc3bb  -s ours am: 3fbd0b0be9
am: 6b049098e7

Change-Id: I639413153518078d0c9a9c77ea88d72f08f549dd

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c...
Lajos Molnar [Wed, 12 Oct 2016 01:29:22 +0000 (01:29 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189 am: 1c44a2ed66 am: efe63962a7 am: 6616cf9e18 am: 998d7dc3bb  -s ours
am: 3fbd0b0be9

Change-Id: I5f29661f51db448baa5d961a389ae794fce981ed

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c...
Lajos Molnar [Wed, 12 Oct 2016 01:23:21 +0000 (01:23 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189 am: 1c44a2ed66 am: efe63962a7 am: 6616cf9e18
am: 998d7dc3bb  -s ours

Change-Id: Ic8b000116797f546e3c8448259b2e20f25cb31d1

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: ae52fd383a
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: ae52fd383a
am: 0854507c13

Change-Id: I59a8a6be219809204f6da9e02f1f02b7a1b097e8

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: ae52fd383a

Change-Id: I5c510313cdea7f6d118e2999fc78ac0c7f6df4a0

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 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 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 08:16:56 +0000 (08:16 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6 am: a78bd18c93 am: 9578341c41 am: 8ede96a5f2 am: f7a2861c08 am: 2379d9e501 am: ed775f7c81 am: 3c5b347344
am: 2b7d32540a

Change-Id: I5a4b04dcdd458810f2dce07e2f62c12bb6eb6e06

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d58...
Robert Shih [Thu, 22 Sep 2016 08:16:41 +0000 (08:16 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b
am: 95eb4e7637

Change-Id: Iea71ed70d99eebd365c69920133d778164c6efdf

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6...
Robert Shih [Thu, 22 Sep 2016 08:13:28 +0000 (08:13 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6 am: a78bd18c93 am: 9578341c41 am: 8ede96a5f2 am: f7a2861c08 am: 2379d9e501 am: ed775f7c81
am: 3c5b347344

Change-Id: I8d0b07823c34cfbe2812cffd80cf665998dab5db

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d58...
Robert Shih [Thu, 22 Sep 2016 08:13:11 +0000 (08:13 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7
am: a38b5af18b

Change-Id: Iffeef9b918d210902e3374359829a5485a3be590

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

Change-Id: Ia40a5f03b95b4e6565341db2c8991798630e202e

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

Change-Id: I4ef144d69091234b310769d55d7b72479b98a8bb

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

Change-Id: I80bdb538abe4d68d5777fe2e34381fa6c810636a

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

Change-Id: Icf3964eafdaf56c6db6e442908541e3088f71c4e

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 agoLimit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60...
Marco Nelissen [Thu, 22 Sep 2016 02:01:19 +0000 (02:01 +0000)]
Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9 am: 828c7c2c31 am: c80241d9c3
am: fbe7df6dd0

Change-Id: I65270fb80f75dd063d28c3dff3cc4c06cb861bfa

7 years agoLimit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60...
Marco Nelissen [Thu, 22 Sep 2016 00:45:00 +0000 (00:45 +0000)]
Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9 am: 828c7c2c31
am: c80241d9c3

Change-Id: Ie00c1926aa03df8c221ad42a40d0d735ee8c069d

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 agoLimit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9
Marco Nelissen [Thu, 22 Sep 2016 00:37:33 +0000 (00:37 +0000)]
Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9
am: 828c7c2c31

Change-Id: I28eec82a69d9f29cf5d26ac0f034397e7ffb7343

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 am: 3a8c303038
Marco Nelissen [Wed, 21 Sep 2016 22:58:01 +0000 (22:58 +0000)]
Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038
am: 75e5b60ae9

Change-Id: Ia8122e73c5157ac2a932c9e7dfdd0f1ed9e94b83

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 21:06:20 +0000 (21:06 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d am: f5b8755f18 am: 7d5774b0ea am: 9668a1012a am: b87e75a6bf
am: 61b8e13fdd

Change-Id: Ie0f8bbb8fb5781ffd44abd9898bae3590f4d808b

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

Change-Id: Ie266cdda0dc52dd9f70fd9e001211577f5d9266a

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

Change-Id: I2d9dbc50a4d2b8fe09e836f1e2395fb660cd9d87

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

Change-Id: Ie074f7c34037157aae7298be6146b8ac26ae8ff6

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

Change-Id: Ie1550f4ac2417a3bd0cbbfc19f6e4bbb5751f0cb

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

Change-Id: Id8549dd45b507760bdc716b6546d0d87651462c2

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

Change-Id: I1928b55d24e9ed5023af5d68762e1c846388ee62

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

Change-Id: I6c91733ef133b05b484845ea68891c50bbc0091f

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 15:00:03 +0000 (15:00 +0000)]
Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23 am: 53b2b9eba3
am: 4073c59ac5

Change-Id: Id4369171977e5062bb66ac77f4cc7367d03c5e68

7 years agoCheck mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c...
Marco Nelissen [Wed, 21 Sep 2016 14:57:02 +0000 (14:57 +0000)]
Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23
am: 53b2b9eba3

Change-Id: Ifd1146a5fa1f9ae7abe7ad559a946ca898a918ab

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

Change-Id: I7f6a1264beac4f08357a5e151ec00abc127e9338

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

Change-Id: I1f204b5117adb467d0883a59b3f1a90f4c10ba47

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 04:27:25 +0000 (04:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3 am: d959eb23c5 am: 5df594ca92 am: b2c00418d3 am: c37d5f55a5
am: b028a26af0

Change-Id: Iea6b3e4dd14d9efe2679496192662f9bc334bc41

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

Change-Id: I07a32d9ac52c01603bfed43768d26debb1db2b2f

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb914...
Chong Zhang [Tue, 20 Sep 2016 04:26:52 +0000 (04:26 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88
am: 295244de61

Change-Id: Ibd2d0fec4c2cacbe0feb78224dce037f6e93c306

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am...
Ricardo Garcia [Tue, 20 Sep 2016 04:24:32 +0000 (04:24 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3 am: d959eb23c5 am: 5df594ca92 am: b2c00418d3
am: c37d5f55a5

Change-Id: I42aa5141b6b586454385c748b120aa59a285913d

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250...
rago [Tue, 20 Sep 2016 04:24:17 +0000 (04:24 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb am: 2feb9ce748 am: fba2bd1372 am: dddfa37ec9 am: de6acc18bb
am: a0f7a7b07e

Change-Id: I65c61bdb186ad6d83a94d1040d9266d2e08b2d64

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb914...
Chong Zhang [Tue, 20 Sep 2016 04:23:49 +0000 (04:23 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9
am: 53de578e88

Change-Id: I1096e2aa34eb9b89495f8ef7d4648ded5ee6381f

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

Change-Id: I4013cd1ddfabe63e01508ff16777b7abf68f6454

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

Change-Id: I2f722a5271282192b08764a42f28d301be1e1835

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb914...
Chong Zhang [Tue, 20 Sep 2016 02:30:29 +0000 (02:30 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8
am: 106a9050b9

Change-Id: Id244e1a1872462d64da300c0c461ee939a8f1f76

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

Change-Id: I25968f125f5fe1a801f23152d04d6d51ef5a322a

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

Change-Id: If9c3e7f463b3d053d939f0ca9377dd99dcb5aa4b

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

Change-Id: I8a6ee92a0077102d93f6c9e82b5f439f99e4749c

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