OSDN Git Service
Pawin Vongmasa [Thu, 13 Oct 2016 01:47:51 +0000 (01:47 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours am:
d676f1bfeb am:
0ce582e5c4 -s ours am:
e843c53efa
am:
22d0f74490
Change-Id: I11d8a4f841028c0ea6a5a121b8132ceae6654048
Pawin Vongmasa [Thu, 13 Oct 2016 01:40:51 +0000 (01:40 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours am:
d676f1bfeb am:
0ce582e5c4 -s ours
am:
e843c53efa
Change-Id: Ib3ceca0ff50fdd4f6bf586d39ef84474ae0e6769
Pawin Vongmasa [Thu, 13 Oct 2016 01:33:22 +0000 (01:33 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours am:
d676f1bfeb
am:
0ce582e5c4 -s ours
Change-Id: Ib4c116449fa9a43f7a4c1b46c793c5de2d0cbac3
Pawin Vongmasa [Thu, 13 Oct 2016 01:27:01 +0000 (01:27 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours am:
37e3ea354a am:
ea136eb981 -s ours am:
2456e12801
am:
fe97b39795
Change-Id: I4d2a011145b4660d078e2e7d47ffb0fc2489a49a
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
Pawin Vongmasa [Thu, 13 Oct 2016 01:26:47 +0000 (01:26 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
0338b14e28 -s ours am:
648b682eeb am:
d558903f8c -s ours am:
ad1141b06b
am:
fbe82fe0fa
Change-Id: I2882ebae8b42057767a40cf65d14c177ace96200
Pawin Vongmasa [Thu, 13 Oct 2016 01:20:04 +0000 (01:20 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours am:
37e3ea354a am:
ea136eb981 -s ours
am:
2456e12801
Change-Id: Ic7b4cf9994060ed34e4ad3c13f09a5f28f635ab1
Pawin Vongmasa [Thu, 13 Oct 2016 01:20:03 +0000 (01:20 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev am:
622fd04e88 am:
862b281476 -s ours am:
5e94f64995
am:
d7ec581644
Change-Id: I57ed2dc7535c614ee26084475f03bef705a47109
Pawin Vongmasa [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
0338b14e28 -s ours am:
648b682eeb am:
d558903f8c -s ours
am:
ad1141b06b
Change-Id: Id96e179a59d415070f5975742e50e9746e011e54
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
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
Pawin Vongmasa [Thu, 13 Oct 2016 01:13:01 +0000 (01:13 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours am:
37e3ea354a
am:
ea136eb981 -s ours
Change-Id: I933c4482446d58c554cefc5c5d7befe90f4a54c6
Pawin Vongmasa [Thu, 13 Oct 2016 01:13:00 +0000 (01:13 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev am:
622fd04e88 am:
862b281476 -s ours
am:
5e94f64995
Change-Id: I4ea01684881d277d30b8e55fe463a0eb1638d236
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
0338b14e28 -s ours am:
648b682eeb
am:
d558903f8c -s ours
Change-Id: I306a576ddbc84dedb781e9b257429ef9381ac48b
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
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
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
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:29 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev am:
622fd04e88
am:
862b281476 -s ours
Change-Id: I8f450dd56bdf98e4a7bbe3cc61df2557f9f3f2d9
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Robert Shih [Thu, 22 Sep 2016 00:36:55 +0000 (00:36 +0000)]
SampleIterator: clear members on seekTo error
am:
03237ce0f9
Change-Id: I0dd1251bd8f132b445ebf515e4555e9ec9953269
Robert Shih [Thu, 22 Sep 2016 00:25:48 +0000 (00:25 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Marco Nelissen [Wed, 21 Sep 2016 20:35:16 +0000 (20:35 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev
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
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
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
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
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
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
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
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
Marco Nelissen [Wed, 21 Sep 2016 14:41:28 +0000 (14:41 +0000)]
Check mprotect result am:
866c800c06
am:
a0cfcf38d4
Change-Id: I0f188e2c717922689df42af21f6c47a865a8c390
Marco Nelissen [Wed, 21 Sep 2016 14:38:58 +0000 (14:38 +0000)]
Check mprotect result
am:
866c800c06
Change-Id: I7b20d72aafb9a95480c1a6b16f0cafc4d1749470
Robert Shih [Wed, 21 Sep 2016 00:37:55 +0000 (17:37 -0700)]
SampleIterator: clear members on seekTo error
Bug:
31091777
Change-Id: Iddf99d0011961d0fd3d755e57db4365b6a6a1193
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
OSDN Git Service
