OSDN Git Service
Abhishek Arya [Tue, 18 Aug 2015 16:40:45 +0000 (16:40 +0000)]
am
01841c73: am
af46239a: am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
01841c73a5a824a34d794ec69e2769b088306485':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:40:44 +0000 (16:40 +0000)]
am
de5c4c46: am
43131299: am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
de5c4c4671f63457151fce7b4ad7963518f8ce36':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 16:40:43 +0000 (16:40 +0000)]
am
9359e822: am
8a34499a: am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
9359e82213e6027b2390b76ba30e2e44f0d5cec6':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:40:43 +0000 (16:40 +0000)]
am
d3b0f865: am
ce380290: (-s ours) am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
d3b0f865dcf66dfdf89e7e4d296e4a432a2e8a16':
SoftAVCEnc: check requested memory size before allocation.
Abhishek Arya [Tue, 18 Aug 2015 16:33:43 +0000 (16:33 +0000)]
am
af46239a: am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
af46239a10921980f5030222dff147a592480248':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:33:38 +0000 (16:33 +0000)]
am
43131299: am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
431312997856ce689e683ee0639cf1f4bedab7f0':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 16:33:35 +0000 (16:33 +0000)]
am
8a34499a: am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
8a34499ab9987d962040881b4c8d66b655f65ae0':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:33:34 +0000 (16:33 +0000)]
am
ce380290: (-s ours) am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
ce3802906214ec1ae2ac78d765b8480a2ebe295a':
SoftAVCEnc: check requested memory size before allocation.
Jon Larimer [Tue, 18 Aug 2015 15:08:53 +0000 (15:08 +0000)]
am
5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
* commit '
5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Jon Larimer [Tue, 18 Aug 2015 15:00:47 +0000 (15:00 +0000)]
Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
Jon Larimer [Tue, 18 Aug 2015 14:45:26 +0000 (14:45 +0000)]
am
f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
* commit '
f1a93e4720a71c308c3d88a9f751555ff532a01c':
SoftOpus: Fix output buffer capacity.
Jon Larimer [Tue, 18 Aug 2015 14:37:32 +0000 (14:37 +0000)]
Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
Abhishek Arya [Tue, 18 Aug 2015 13:14:57 +0000 (13:14 +0000)]
am
33235986: am
09c29ec4: am
94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
* commit '
33235986a7490b569c859e5555328cbe1bae2748':
libstagefright: check memory size for overflow before allocation.
Abhishek Arya [Tue, 18 Aug 2015 13:06:48 +0000 (13:06 +0000)]
am
09c29ec4: am
94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
* commit '
09c29ec42df51ae807725d4eea52c4cc305c13a0':
libstagefright: check memory size for overflow before allocation.
Wei Jia [Tue, 18 Aug 2015 13:04:50 +0000 (13:04 +0000)]
am
45e493e4: Merge "Merge commit \'
5a289b87\' into HEAD" into lmp-dev
* commit '
45e493e40ca5497cc7c21c3c683145d87bd37364':
ABuffer: reset members when memory allocation fails.
Wei Jia [Tue, 18 Aug 2015 12:59:42 +0000 (12:59 +0000)]
Merge "Merge commit '
5a289b87' into HEAD" into lmp-dev
Wei Jia [Tue, 18 Aug 2015 02:33:01 +0000 (02:33 +0000)]
am
9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev
* commit '
9cebcc5f7992ded7fa686575914830b6554cd6c9':
SoftAVCEncoder: fix mismatched type for comparison.
Wei Jia [Tue, 18 Aug 2015 02:27:05 +0000 (02:27 +0000)]
Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev
Wei Jia [Tue, 18 Aug 2015 02:18:24 +0000 (19:18 -0700)]
Merge commit '
5a289b87' into HEAD
ABuffer: reset members when memory allocation fails.
Bug:
22077698
(cherry picked from commit
94b0badc025b14141ff234e3e4e2745411742bac)
Change-Id: I359ec16e524ffb298c143c3d72fbf1a3af72d663
Wei Jia [Tue, 18 Aug 2015 02:07:48 +0000 (19:07 -0700)]
SoftAVCEncoder: fix mismatched type for comparison.
Bug:
20674674
Change-Id: Iace5b8c882339b3a9d2e706375255aeeeb0532fe
Wei Jia [Tue, 18 Aug 2015 01:59:47 +0000 (01:59 +0000)]
am
7d113a23: am
6d59c11c: (-s ours) am
fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
* commit '
7d113a238871413e9bef15a2aa40731e56127a40':
Revert "SoftAVCEnc: check requested memory size before allocation."
Wei Jia [Tue, 18 Aug 2015 01:53:08 +0000 (01:53 +0000)]
am
6d59c11c: (-s ours) am
fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
* commit '
6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2':
Revert "SoftAVCEnc: check requested memory size before allocation."
Abhishek Arya [Tue, 18 Aug 2015 01:45:48 +0000 (01:45 +0000)]
am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
9abb7401df730b5c510f6b8dac2716a0928d9623':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 01:39:06 +0000 (01:39 +0000)]
am
90eee339: am
652926c8: am
74d3170f: Merge "Fix comparison sign warnings." into klp-dev
* commit '
90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d':
Fix comparison sign warnings.
Wei Jia [Tue, 18 Aug 2015 01:33:05 +0000 (01:33 +0000)]
am
652926c8: am
74d3170f: Merge "Fix comparison sign warnings." into klp-dev
* commit '
652926c8a37fb904aaa0756a0d0bae0574f308c5':
Fix comparison sign warnings.
Wei Jia [Tue, 18 Aug 2015 01:31:43 +0000 (01:31 +0000)]
am
65842db0: Merge commit \'
b46eb8d9\' into HEAD
* commit '
65842db06c2d77e53cc5ac61692160d844cc7d0a':
SoftAVCEnc: check requested memory size before allocation.
Abhishek Arya [Tue, 18 Aug 2015 01:24:11 +0000 (18:24 -0700)]
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Bug:
20674086
Change-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b
Wei Jia [Tue, 18 Aug 2015 01:09:22 +0000 (18:09 -0700)]
Merge commit '
b46eb8d9' into HEAD
SoftAVCEnc: check requested memory size before allocation.
Bug:
20674674
(cherry picked from commit
f6fe4340219a8e674f3250fe32d4697ec8184b24)
Change-Id: Ib52a26de912fd5a9a08dd9948885fb4a9b32e9e6
Wei Jia [Tue, 18 Aug 2015 01:00:53 +0000 (01:00 +0000)]
am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
1a09d3521e8849dcb1090ecb50393f6e9ee140ec':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 00:53:14 +0000 (00:53 +0000)]
am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
c23e3dd8af7397f023aae040c4a03dd14091cbed':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 00:53:12 +0000 (00:53 +0000)]
am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
567b6551f8bc240cc267054ea5de55c46f10cc29':
SoftAVCEnc: check requested memory size before allocation.
Abhishek Arya [Tue, 18 Aug 2015 00:53:11 +0000 (00:53 +0000)]
am
94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
* commit '
94c1969c38d4386933ed5cad7f625029442f6331':
libstagefright: check memory size for overflow before allocation.
Wei Jia [Tue, 18 Aug 2015 00:53:10 +0000 (00:53 +0000)]
am
120f259d: Merge "ABuffer: reset members when memory allocation fails." into klp-dev
* commit '
120f259d0de4dc048a2b9007c0f19b8808e59021':
ABuffer: reset members when memory allocation fails.
Wei Jia [Tue, 18 Aug 2015 00:53:09 +0000 (00:53 +0000)]
am
fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
* commit '
fc8c226b75a45876e6545c3a217698ada52bd2d6':
Revert "SoftAVCEnc: check requested memory size before allocation."
Wei Jia [Tue, 18 Aug 2015 00:53:08 +0000 (00:53 +0000)]
am
74d3170f: Merge "Fix comparison sign warnings." into klp-dev
* commit '
74d3170ffc02620fcedb5a98c7a66e83ee2faa87':
Fix comparison sign warnings.
Wei Jia [Tue, 18 Aug 2015 00:53:07 +0000 (00:53 +0000)]
am
479b4de0: SoftAVCEnc: check requested memory size before allocation.
* commit '
479b4de0d267eb7d4c419f4da0069186a952ad17':
SoftAVCEnc: check requested memory size before allocation.
Wei Jia [Tue, 18 Aug 2015 00:48:01 +0000 (00:48 +0000)]
Merge "libstagefright: check remaining data size before parsing it." into klp-dev
Abhishek Arya [Mon, 17 Aug 2015 21:50:02 +0000 (14:50 -0700)]
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
BUG:
20674086
Change-Id: Idaff17975b327adea65c39bdba1ab4e88789c0cd
Wei Jia [Mon, 17 Aug 2015 19:49:39 +0000 (19:49 +0000)]
Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
Abhishek Arya [Mon, 17 Aug 2015 18:39:11 +0000 (18:39 +0000)]
Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
Chong Zhang [Fri, 14 Aug 2015 20:50:02 +0000 (13:50 -0700)]
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
bug:
22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
(cherry picked from commit
346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
Wei Jia [Mon, 17 Aug 2015 00:41:50 +0000 (17:41 -0700)]
libstagefright: check remaining data size before parsing it.
Bug:
23248776
Change-Id: I45cf53e58e4375afcf260b122264c968ec0ff6c8
(cherry picked from commit
3bf1e0fdf27e1188b8d3574ed073595b8eacb114)
Wei Jia [Mon, 17 Aug 2015 00:46:34 +0000 (17:46 -0700)]
SoftAVCEnc: check requested memory size before allocation.
Bug:
20674674
Change-Id: If80186a7b9078e575d389220f3bebe9f7630a956
(cherry picked from commit
f6fe4340219a8e674f3250fe32d4697ec8184b24)
Wei Jia [Sun, 16 Aug 2015 20:20:57 +0000 (20:20 +0000)]
Merge "ABuffer: reset members when memory allocation fails." into klp-dev
Wei Jia [Sun, 16 Aug 2015 18:19:37 +0000 (18:19 +0000)]
Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
Wei Jia [Sun, 16 Aug 2015 18:14:33 +0000 (18:14 +0000)]
Revert "SoftAVCEnc: check requested memory size before allocation."
This reverts commit
479b4de0d267eb7d4c419f4da0069186a952ad17.
Change-Id: I014746db3f861cb1cd5bf1b76f86b0356836a128
Wei Jia [Sun, 16 Aug 2015 18:02:05 +0000 (18:02 +0000)]
Merge "Fix comparison sign warnings." into klp-dev
Vignesh Venkatasubramanian [Thu, 11 Jun 2015 18:15:00 +0000 (11:15 -0700)]
SoftOpus: Fix output buffer capacity.
The output buffer size as per opus project's sample decoder [1] is
960*6*channel_count. Whereas in SoftOpus, we use 960*6 (without the
channel count multiplier. Fixing it to include maximum number of
channels possible as the multiplier.
[1] http://git.xiph.org/?p=opus-tools.git;a=blob;f=src/opusdec.c;h=
d085f04eacdfd49759ffdb73db805562ba396720;hb=
f2a2e88b47f6f24083a37be476f140f677fe7160#l571
BUG=
20721050
Change-Id: I323891a1b11491782bc093477b09e7757b885674
(cherry picked from commit
08e8227514f5ab99822dfae8b4d39414646ff59d)
Dan Albert [Fri, 8 May 2015 17:43:54 +0000 (10:43 -0700)]
Fix comparison sign warnings.
Bug:
23213430
Change-Id: I6f2e2b03b968a569b122004b4803c5d17fccfb12
(cherry picked from commit
635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c)
Wei Jia [Mon, 20 Jul 2015 18:34:22 +0000 (11:34 -0700)]
ABuffer: reset members when memory allocation fails.
Bug:
22077698
Change-Id: I2beb724662d041ad2339d0f4c7f983e7ac5e5e6f
(cherry picked from commit
94b0badc025b14141ff234e3e4e2745411742bac)
Wei Jia [Sat, 15 Aug 2015 00:16:46 +0000 (17:16 -0700)]
SoftAVCEnc: check requested memory size before allocation.
Bug:
20674674
Change-Id: I569e7a9b33fe64779a40e55539929c3dc4303c19
(cherry picked from commit
f6fe4340219a8e674f3250fe32d4697ec8184b24)
Wei Jia [Wed, 3 Jun 2015 20:47:51 +0000 (13:47 -0700)]
libstagefright: check memory size for overflow before allocation.
Bug:
20674086
Change-Id: I431aa2b7d30a942350ab6d105451c6b77e2f99d4
(cherry picked from commit
42cccd7c8811597d56fb86afeacf6231d693dea6)
Eric Laurent [Thu, 13 Aug 2015 22:46:29 +0000 (22:46 +0000)]
am
e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls
* commit '
e4ac35fa524b011f272d396b2c12515382bddb94':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 2 Apr 2015 20:49:15 +0000 (13:49 -0700)]
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Limit number of ports and patches listed by
LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS.
Also fix typo causing wrong pointer to be used when writing to Parcel.
Bug:
19573085.
Change-Id: I41a9c710e45738a4f11990160587856c429a4646
(cherry picked from commit
f75c2fef14354024ec27bff1444f9e50b5ef55a9)
Wei Jia [Thu, 13 Aug 2015 18:21:40 +0000 (18:21 +0000)]
am
39ab7cea: am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
39ab7cea0e3c14181e3e68b0f1bb5fa20a434b35':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:14:57 +0000 (18:14 +0000)]
am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
88aa97ea87b7e4f7b4f82df3500754e03205ef60':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:08:00 +0000 (18:08 +0000)]
am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
3ce293842fed1b3abd2ff0aecd2a0c70a55086ee':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 16:50:55 +0000 (16:50 +0000)]
am
3bb658ac: am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
3bb658acd971414b15b0957e131294db33f7b75b':
libstagefright: fix possible overflow in ID3.
Wei Jia [Wed, 12 Aug 2015 17:08:41 +0000 (10:08 -0700)]
libstagefright: fix possible overflow in amrwbenc.
Bug:
23142203
Change-Id: I309df51e4df6412655f04cc093d792bf6c7944f7
(cherry picked from commit
9dd01777aa14bbb90a6cdccf97383bb4e3d717a5)
Wei Jia [Thu, 13 Aug 2015 16:42:54 +0000 (16:42 +0000)]
am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
4e86a483a12b0139a8babf4754e5de340eaccd40':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 16:34:17 +0000 (16:34 +0000)]
am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
f51115bd8e44c2779b74477277c6f6046916e7cf':
libstagefright: fix possible overflow in ID3.
Wei Jia [Wed, 12 Aug 2015 17:41:00 +0000 (10:41 -0700)]
libstagefright: fix possible overflow in ID3.
Bug:
23129786
Change-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661
(cherry picked from commit
09da86913ca97d7a818a8917b6601527e5e18a24)
Nick Kralevich [Tue, 11 Aug 2015 05:11:59 +0000 (05:11 +0000)]
am
b6131acd: am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
b6131acd69ea32df926125d94c16174bc0ce1d4a':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 05:04:40 +0000 (05:04 +0000)]
am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
94f8150be2041f73c2f185f2c3622a9537d47454':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 04:24:54 +0000 (21:24 -0700)]
resolved conflicts for merge of
c86eae32 to klp-modular-dev
Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f
Nick Kralevich [Tue, 11 Aug 2015 03:31:38 +0000 (03:31 +0000)]
am
9d9491f9: am
0dbd0d7b: am
c9924410: am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
9d9491f9fb83523cfe68f2aa26c14f72f70812fc':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 03:24:13 +0000 (03:24 +0000)]
am
0dbd0d7b: am
c9924410: am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
0dbd0d7bfe340ac46271c7f87969431b62a023ed':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 03:07:29 +0000 (03:07 +0000)]
am
c9924410: am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
c99244105803ac32f4cc698b5b2a85b225d925a2':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:57:48 +0000 (02:57 +0000)]
am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
2fe61ed032e083dc39265f3b88274fcb8fbeed9b':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:49:10 +0000 (02:49 +0000)]
am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
3b8d3fa0dd97c05f77c4686986812e40203678d2':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:37:17 +0000 (02:37 +0000)]
am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
186d1fb9b72439c1c3317d72e4a0f52f466e6861':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:32:49 +0000 (02:32 +0000)]
am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
f4dfe12ecd26e7d6965a2abc062709b6d7d942c4':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:26:38 +0000 (02:26 +0000)]
am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:20:00 +0000 (02:20 +0000)]
am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
aa8dab77aa9ef1bb6e5414ee5e773001de725bef':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 17:11:35 +0000 (17:11 +0000)]
am
2abbc048: am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
2abbc048837182bda04037f53309cde4c73f017d':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 17:01:56 +0000 (17:01 +0000)]
am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
ba34c2ba414352ed0c1b9188f51c5445b04af2c6':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:55:57 +0000 (16:55 +0000)]
am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
f59348edfc54baa8f6e6532c6484656cf444d199':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:41:15 +0000 (16:41 +0000)]
am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
0080e03e2a69dcb5ecbcb2848f358ca73163714c':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:34:15 +0000 (16:34 +0000)]
am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:23:51 +0000 (16:23 +0000)]
am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:16:08 +0000 (16:16 +0000)]
am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
fea5921b975cf43c88b8f93d4f2500abde6088be':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:08:43 +0000 (16:08 +0000)]
am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
9fff1d37d6129dfce7a6f89004ec4a9cea9c9cad':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:01:24 +0000 (16:01 +0000)]
am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
d9d35098aaaa546d79d0707734aac9b4b12c5be1':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 15:19:26 +0000 (15:19 +0000)]
am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 14:55:23 +0000 (14:55 +0000)]
Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
Marco Nelissen [Sat, 8 Aug 2015 02:59:00 +0000 (02:59 +0000)]
Marco Nelissen [Sat, 8 Aug 2015 02:52:55 +0000 (02:52 +0000)]
am
80c17e0d: am
450e1015: Fix Ogg album art
* commit '
80c17e0d42248053edf7243e026995fefcf6aabd':
Fix Ogg album art
Marco Nelissen [Sat, 8 Aug 2015 02:47:04 +0000 (02:47 +0000)]
am
450e1015: Fix Ogg album art
* commit '
450e1015b7939292ca988dd1b4f0303a094478e9':
Fix Ogg album art
Marco Nelissen [Sat, 8 Aug 2015 01:25:33 +0000 (01:25 +0000)]
am
af3c0475: am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
af3c0475b9ee8b9e69e435b2bdd11e5c9172b050':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:17:58 +0000 (01:17 +0000)]
am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
9c67741f9f7ccc1007c7ecb44b8037210c733723':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:12:33 +0000 (01:12 +0000)]
am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
2e637bfd64c59200414130671e32e3e087e9f147':
Extra sanity checks on sample size and resolution
Marco Nelissen [Thu, 6 Aug 2015 15:03:47 +0000 (08:03 -0700)]
Fix Ogg album art
Bug:
23036083
Bug: https://code.google.com/p/android/issues/detail?id=182053
Change-Id: I1a5cbe06990900160c2addade238c1e9feab8f71
(cherry picked from commit
c63cc509404b9328aedd1be3adc4e87cd07b4eb1)
Marco Nelissen [Sat, 8 Aug 2015 00:59:49 +0000 (00:59 +0000)]
Merge "Extra sanity checks on sample size and resolution" into klp-dev
Nick Kralevich [Fri, 7 Aug 2015 23:09:03 +0000 (23:09 +0000)]
am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
bce77a36125b25ce864b40bd5938ca89becea898':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Fri, 7 Aug 2015 18:41:28 +0000 (18:41 +0000)]
am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
0e20b2093aa2bbc93afed8d68d3765d18a431b74':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Fri, 7 Aug 2015 18:19:24 +0000 (11:19 -0700)]
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
chunk_size is a uint64_t, so it can legitimately be bigger
than SIZE_MAX, which would cause the subtraction to underflow.
https://code.google.com/p/android/issues/detail?id=182251
Bug:
23034759
Change-Id: Ic1637fb26bf6edb0feb1bcf2876fd370db1ed547
Joshua J. Drake [Fri, 7 Aug 2015 17:51:09 +0000 (17:51 +0000)]
am
72abba8b: am
276cec63: am
4254be9a: am
9364bdc9: am
905aae46: am
11c88f66: am
2796ba1c: am
a555788d: am
0e33cb2d: am
e4ccf3a1: am
3329a19b: am
c87faed6: Fix integer underflow in covr MPEG4 processing
* commit '
72abba8bc6c152a7d5bca8417ef6ab343f2a0cff':
Fix integer underflow in covr MPEG4 processing
Joshua J. Drake [Fri, 7 Aug 2015 17:51:08 +0000 (17:51 +0000)]
am
437d47cb: am
f13cc52d: am
8e0e43d2: am
3621c056: am
bcc8e581: am
bb99a362: am
8d60fc3e: am
338bbf53: am
fd334e34: am
03d539a7: am
a5b9055d: am
f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom
* commit '
437d47cbbee7eff4a90e0f63028d9f9dd942c423':
Fix integer overflow when handling MPEG4 tx3g atom
Nick Kralevich [Fri, 7 Aug 2015 17:51:07 +0000 (17:51 +0000)]
am
61934faf: am
94012bc3: am
ffe509ff: am
d0af1ded: (-s ours) am
a421314f: am
430475da: resolved conflicts for merge of
0b3eca88 to jb-mr1-dev-plus-aosp
* commit '
61934fafa7e68c2adbf50412c3d524ea5ec4ed1d':
Prevent integer overflow when processing covr MPEG4 atoms
Joshua J. Drake [Fri, 7 Aug 2015 17:44:05 +0000 (17:44 +0000)]
am
276cec63: am
4254be9a: am
9364bdc9: am
905aae46: am
11c88f66: am
2796ba1c: am
a555788d: am
0e33cb2d: am
e4ccf3a1: am
3329a19b: am
c87faed6: Fix integer underflow in covr MPEG4 processing
* commit '
276cec63624d198981b37a68cd969031e4f42096':
Fix integer underflow in covr MPEG4 processing
OSDN Git Service
