OSDN Git Service
Jon Larimer [Tue, 18 Aug 2015 18:31:21 +0000 (18:31 +0000)]
am
fc26577c: am
698ff79c: am
27362395: (-s ours) am
2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
* commit '
fc26577c6023ac6861c1875e6ae02f23ce53afc0':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Nick Kralevich [Tue, 18 Aug 2015 18:31:20 +0000 (18:31 +0000)]
am
4b153ff9: am
2f3c04a4: resolved conflicts for merge of
6035c811 to lmp-dev
* commit '
4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22':
MPEG4Source::fragmentedRead: check range before writing into buffers
Jon Larimer [Tue, 18 Aug 2015 18:23:42 +0000 (18:23 +0000)]
am
698ff79c: am
27362395: (-s ours) am
2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
* commit '
698ff79c1e37f01678231eb4f57dc8f6574a7f83':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Nick Kralevich [Tue, 18 Aug 2015 18:23:42 +0000 (18:23 +0000)]
am
2f3c04a4: resolved conflicts for merge of
6035c811 to lmp-dev
* commit '
2f3c04a4e92aabea09325cd6870d74a705d98dd8':
MPEG4Source::fragmentedRead: check range before writing into buffers
Jon Larimer [Tue, 18 Aug 2015 18:20:25 +0000 (18:20 +0000)]
am
27362395: (-s ours) am
2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
* commit '
27362395cec5673a9cbfe7179ad5490c4e475329':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Nick Kralevich [Tue, 18 Aug 2015 16:57:24 +0000 (09:57 -0700)]
resolved conflicts for merge of
6035c811 to lmp-dev
Change-Id: Icf911f31e207c4c658047f6bfe8088d697b04ed6
Jon Larimer [Tue, 18 Aug 2015 16:47:06 +0000 (16:47 +0000)]
am
484ebc81: am
a1e462e5: am
0afecdeb: am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
484ebc81263a627b5e24e65373ab0752996ca0c8':
Check buffer size before using it
Abhishek Arya [Tue, 18 Aug 2015 16:47:04 +0000 (16:47 +0000)]
am
54ea6c02: am
5ff4bb7a: am
8026ad38: am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
54ea6c02570ca87e94b03e0a8468dfc2f20536b7':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 16:47:03 +0000 (16:47 +0000)]
am
de47cd3c: am
3b77e940: am
d146d466: am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
de47cd3c5223bb0fdd7376f8ea21ba2f857bafbe':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 16:47:02 +0000 (16:47 +0000)]
am
00887af1: am
e9a8362e: am
a2a68264: am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
00887af170d5302d1030e107ed3db969b05edcb4':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 16:47:00 +0000 (16:47 +0000)]
am
3c803e7f: am
6afd8574: am
073a656d: am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
3c803e7f777ad745b1b2cae0bdb2a31b11d47e80':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Abhishek Arya [Tue, 18 Aug 2015 16:46:58 +0000 (16:46 +0000)]
am
93bc6176: am
01841c73: am
af46239a: am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
93bc61764eb8417165de2bbaa6384165f7298a32':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:46:56 +0000 (16:46 +0000)]
am
91fc84f2: am
de5c4c46: am
43131299: am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
91fc84f2102f222607d402953d9c1d4383e15a71':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 16:46:55 +0000 (16:46 +0000)]
am
0bf31aeb: am
9359e822: am
8a34499a: am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
0bf31aeb5b0e58cd167aaee2a6cb4d9248e0e66b':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:46:54 +0000 (16:46 +0000)]
am
0a427176: am
d3b0f865: am
ce380290: (-s ours) am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
0a427176083f5b82f4c47031fbc51dd1801121da':
SoftAVCEnc: check requested memory size before allocation.
Jon Larimer [Tue, 18 Aug 2015 16:40:50 +0000 (16:40 +0000)]
am
a1e462e5: am
0afecdeb: am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
a1e462e5531db20d1dc70c3e24c82879a0a90870':
Check buffer size before using it
Abhishek Arya [Tue, 18 Aug 2015 16:40:49 +0000 (16:40 +0000)]
am
5ff4bb7a: am
8026ad38: am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 16:40:48 +0000 (16:40 +0000)]
am
3b77e940: am
d146d466: am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
3b77e940822e8a5ef4953b709bdae00fa1bcca43':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 16:40:47 +0000 (16:40 +0000)]
am
e9a8362e: am
a2a68264: am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
e9a8362e1d379e90655e904ca49d6333e4218eda':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 16:40:46 +0000 (16:40 +0000)]
am
6afd8574: am
073a656d: am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
6afd8574d44ae158bed9cafe1c74dd1bfc5573b6':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
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.
Jon Larimer [Tue, 18 Aug 2015 16:33:55 +0000 (16:33 +0000)]
am
0afecdeb: am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
0afecdebaea1982ead120a701ddd24f2b0ff3897':
Check buffer size before using it
Abhishek Arya [Tue, 18 Aug 2015 16:33:50 +0000 (16:33 +0000)]
am
8026ad38: am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
8026ad3838e2f7367e8ff616f66b2c2f8bc8488c':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 16:33:49 +0000 (16:33 +0000)]
am
d146d466: am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
d146d4660451fb04c039f4ac8554103876fa4722':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 16:33:48 +0000 (16:33 +0000)]
am
a2a68264: am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
a2a6826494dec4a8fab6bd6828828fae886e516a':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 16:33:46 +0000 (16:33 +0000)]
am
073a656d: am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
073a656d7dd0b432e7c8d508745d9fb552955b9e':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
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:13:39 +0000 (15:13 +0000)]
am
2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
* commit '
2ed42aea9c6fbca4bde52d647ff082b997b5968c':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Jon Larimer [Tue, 18 Aug 2015 15:13:19 +0000 (15:13 +0000)]
am
fecbc5da: am
5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
* commit '
fecbc5da64a992f91f74ef6c67a7e247b0da7777':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
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 15:00:42 +0000 (15:00 +0000)]
Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
Jon Larimer [Tue, 18 Aug 2015 14:50:36 +0000 (14:50 +0000)]
am
cad46fbd: am
f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
* commit '
cad46fbde4961d5374c27f9d85cd8f2b6822ffa7':
SoftOpus: Fix output buffer capacity.
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
Jon Larimer [Tue, 18 Aug 2015 14:31:25 +0000 (14:31 +0000)]
am
0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev
* commit '
0d46c93785e2c426be11172bec0489b698fea6c3':
MPEG4Source::fragmentedRead: check range before writing into buffers
Jon Larimer [Tue, 18 Aug 2015 14:31:24 +0000 (14:31 +0000)]
am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
aa1cc74139341eb3ae9511af5310b965dbf890f4':
Check buffer size before using it
Jon Larimer [Tue, 18 Aug 2015 14:25:45 +0000 (14:25 +0000)]
Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev
Jon Larimer [Tue, 18 Aug 2015 14:24:26 +0000 (14:24 +0000)]
Merge "Check buffer size before using it" into klp-dev
Abhishek Arya [Tue, 18 Aug 2015 13:41:18 +0000 (13:41 +0000)]
am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 13:36:34 +0000 (13:36 +0000)]
am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
6f561b93d8c6473fa0baa281ad4a53f882e656cc':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 13:36:33 +0000 (13:36 +0000)]
am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 13:28:34 +0000 (13:28 +0000)]
Merge "Check vector size before accessing" into klp-dev
Abhishek Arya [Tue, 18 Aug 2015 13:24:21 +0000 (13:24 +0000)]
Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
Abhishek Arya [Tue, 18 Aug 2015 13:18:36 +0000 (13:18 +0000)]
am
8369ac13: am
33235986: am
09c29ec4: am
94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
* commit '
8369ac13ad207baebbaf4cd7b357a35dd54408c6':
libstagefright: check memory size for overflow before allocation.
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.
Wei Jia [Tue, 18 Aug 2015 13:11:37 +0000 (13:11 +0000)]
am
ef2c6e04: am
45e493e4: Merge "Merge commit \'
5a289b87\' into HEAD" into lmp-dev
* commit '
ef2c6e044676bf9f0ead4359d7a1840236150e4d':
ABuffer: reset members when memory allocation fails.
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 03:13:17 +0000 (20:13 -0700)]
SoftAVCEncoder: fix auto merge error, member names have changed.
Bug:
20674674
Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6
Wei Jia [Tue, 18 Aug 2015 02:41:07 +0000 (02:41 +0000)]
am
5d1e62e2: am
9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev
* commit '
5d1e62e24628e86fc0485113db18b31973a5cf4b':
SoftAVCEncoder: fix mismatched type for comparison.
Robert Shih [Thu, 16 Jul 2015 22:04:12 +0000 (15:04 -0700)]
MatroskaExtractor: detect infinite loop when parsing NALs
Bug:
21335999
Change-Id: I76bd34610e52048ffcf16e41aa6175afc8a14ee4
(cherry picked from commit
2dcf6138ebc9c5688aeae151d2fbde55a2826128)
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
Neel Mehta [Sat, 15 Aug 2015 00:38:48 +0000 (17:38 -0700)]
Fix for memory corruption in ID3::removeUnsynchronizationV2_4().
Bug:
23227354
Change-Id: Iaa36cfda4fd84ca7e039f56086fd61b4118020db
(cherry picked from commit
77e23413a539df16503e356bd4df4a952f3abc47)
Wei Jia [Tue, 18 Aug 2015 02:08:48 +0000 (02:08 +0000)]
am
138f44a1: am
7d113a23: am
6d59c11c: (-s ours) am
fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
* commit '
138f44a1de740fb6b3a3491c30a11dc8f6ca5f81':
Revert "SoftAVCEnc: check requested memory size before allocation."
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:49 +0000 (01:45 +0000)]
am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
deba0610c89d54390c9d2d0a0f3b79fd7679779c':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Wei Jia [Tue, 18 Aug 2015 01:45:49 +0000 (01:45 +0000)]
am
3175ff3f: am
90eee339: am
652926c8: am
74d3170f: Merge "Fix comparison sign warnings." into klp-dev
* commit '
3175ff3f343ecd85700e2029d7709ce960272967':
Fix comparison sign warnings.
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:39 +0000 (01:39 +0000)]
am
78df80c2: am
65842db0: Merge commit \'
b46eb8d9\' into HEAD
* commit '
78df80c26352bdbe3dc3725a6d937f60fc340127':
SoftAVCEnc: check requested memory size before allocation.
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:31:42 +0000 (01:31 +0000)]
Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
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 22:34:16 +0000 (22:34 +0000)]
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
This reverts commit
c23e3dd8af7397f023aae040c4a03dd14091cbed.
This speculative fix didn't fix the compile failure, do checking locally.
Change-Id: I1598f7208c8232ca38c0fcad17f211598591594e
Robert Shih [Tue, 23 Jun 2015 00:58:27 +0000 (17:58 -0700)]
MPEG4Source::fragmentedRead: check range before writing into buffers
Bug:
22008959
Change-Id: I5f6e188adcc593796455bdaf7b0b8aba672b106e
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)
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)
OSDN Git Service
