OSDN Git Service
Wei Jia [Fri, 4 Sep 2015 17:55:45 +0000 (17:55 +0000)]
am
1a844448: (-s ours) am
933fd689: am
ec58a72b: am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
1a8444481c32422ea46e2a2062d9d49fc11eeeef':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 17:55:43 +0000 (17:55 +0000)]
am
e457eb05: resolved conflicts for
3b8747ca to lmp-mr1-ub-dev
* commit '
e457eb058643d3e2b305a477e5c7d4dbd9e4a165':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 17:49:28 +0000 (17:49 +0000)]
am
933fd689: am
ec58a72b: am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
933fd689b5511f096b864b84c95855d691d06a73':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 16:37:50 +0000 (09:37 -0700)]
resolved conflicts for
3b8747ca to lmp-mr1-ub-dev
Merge commit '
3b8747ca601175da0c94537e49f3097769a09501' into HEAD
libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Change-Id: I5b919716178eb3ba844b21e497b792e6ac61554d
Wei Jia [Fri, 4 Sep 2015 16:16:30 +0000 (16:16 +0000)]
am
ec58a72b: am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
ec58a72ba15425f5b748180822f39716b7e3c8dc':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 16:16:29 +0000 (16:16 +0000)]
am
ce34a82f: am
7ea22fce: am
c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
ce34a82fe2b5b2b955600fbfab1df964aa4934eb':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 16:04:57 +0000 (16:04 +0000)]
am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
bf03b948f12db86861c312dbb67ce82ff73f4bbb':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 16:04:54 +0000 (16:04 +0000)]
am
7ea22fce: am
c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
7ea22fce4fe6ac361fce1df3b583366933848b17':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 15:42:50 +0000 (15:42 +0000)]
am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
75143f30b31a7b38362281d0bbf6109b0e423441':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 15:42:47 +0000 (15:42 +0000)]
am
c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
c6a2815eadfce62702d58b3fa3887f24c49e1864':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Thu, 3 Sep 2015 17:58:08 +0000 (17:58 +0000)]
am
4abb48c3: am
898e8575: am
72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '
4abb48c30cd7821f3397ccd7de8deb3eb645b385':
Zero out return values in audio binder calls
Robert Shih [Thu, 3 Sep 2015 17:46:04 +0000 (17:46 +0000)]
am
898e8575: am
72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '
898e857594b738f88be4de5addc8ca296dfabd74':
Zero out return values in audio binder calls
Robert Shih [Thu, 3 Sep 2015 17:32:48 +0000 (17:32 +0000)]
am
72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '
72b0abdf56c655aae3052f7f762f5e6d8168a154':
Zero out return values in audio binder calls
Wei Jia [Thu, 3 Sep 2015 17:24:20 +0000 (17:24 +0000)]
am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
03b7f72b98ef0a4fa58a84a27d2f8735342faf58':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Thu, 3 Sep 2015 17:21:37 +0000 (17:21 +0000)]
Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
Wei Jia [Thu, 3 Sep 2015 17:14:06 +0000 (17:14 +0000)]
am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Wei Jia [Thu, 3 Sep 2015 15:54:39 +0000 (15:54 +0000)]
Merge "libstagefright: sanity check size before dereferencing pointer in Utils.cpp" into mnc-dev
Wonsik Kim [Thu, 3 Sep 2015 10:21:14 +0000 (10:21 +0000)]
am
ac774d53: am
eda49b16: am
3f79dbfc: am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
ac774d53fff5a580b9fe41ac4a7c6bb96b5137ef':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 10:11:57 +0000 (10:11 +0000)]
am
eda49b16: am
3f79dbfc: am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
eda49b160b0d730140f0ab48cf7a4013f2d97f30':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 10:04:32 +0000 (10:04 +0000)]
am
3f79dbfc: am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
3f79dbfcb1a62c28094b403ba954ab4543d709f7':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 09:54:28 +0000 (09:54 +0000)]
am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
d77786c699c3f846b57b8a8ea00f20749f550960':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 09:46:28 +0000 (09:46 +0000)]
am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
a6c650a9e7927c7d640828cea66fc96e0bf762ce':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 07:59:29 +0000 (07:59 +0000)]
am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
436b32d1eb75cf20d09776549bd7f7a11fa569a1':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 07:54:01 +0000 (07:54 +0000)]
am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
d26052738f7b095b7e318c8dde7f32db0a48450c':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 07:37:00 +0000 (07:37 +0000)]
Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-dev
Wonsik Kim [Wed, 2 Sep 2015 07:02:19 +0000 (16:02 +0900)]
Ogg: avoid size_t overflow in base64 decoding
Bug:
23707088
Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
Wonsik Kim [Wed, 2 Sep 2015 07:02:19 +0000 (16:02 +0900)]
Ogg: avoid size_t overflow in base64 decoding
Bug:
23707088
Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
Robert Shih [Wed, 2 Sep 2015 23:46:59 +0000 (16:46 -0700)]
Zero out return values in audio binder calls
More specifically when handling GET_OUTPUT_FOR_ATTR in IAudioPolicyService.
This prevents leaking a uninitialized `output` across binder if
getOutputForAttr were to encounter errors.
Bug:
23756261
Change-Id: Ibff8a1249a4e8a3c89a33a540dda428b10d6ca82
Lajos Molnar [Wed, 2 Sep 2015 17:42:40 +0000 (17:42 +0000)]
Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into mnc-dev
Chien-Yu Chen [Tue, 1 Sep 2015 21:16:44 +0000 (14:16 -0700)]
Camera: Fix flashlight deadlock
Use a dedicated mutex for torch UID map so it won't cause a deadlock
after flashlight app gets killed while the torch is on.
Bug:
23722318
Change-Id: I228377aa0412052d56b6b948361d9abaecbbc686
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
Lajos Molnar [Tue, 1 Sep 2015 00:19:52 +0000 (17:19 -0700)]
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Bug:
21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
Jeff Tinker [Fri, 28 Aug 2015 23:34:26 +0000 (23:34 +0000)]
Merge "Fix for security vulnerability in media server" into mnc-dev
Andy Hung [Fri, 28 Aug 2015 22:07:09 +0000 (22:07 +0000)]
am
dbf995ce: am
6b203f06: am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
dbf995cecdbfcb74437cf2b6b123b10821371f82':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:56:32 +0000 (21:56 +0000)]
am
6b203f06: am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
6b203f06b969ba92181dbf781544b40cc2c41b7c':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:48:10 +0000 (21:48 +0000)]
am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
66b24004345ff8a688e8548409b0b7d5a8902232':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:39:52 +0000 (21:39 +0000)]
am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
0ea9e2761a04c4f592d854dbde2749395735fe56':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:26:29 +0000 (21:26 +0000)]
am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
184ad88ddd6bbdf01e131e8e5b75bef5be67b29b':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:16:40 +0000 (21:16 +0000)]
am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
fba72ab0fcf7298492dcd9e3045913435d30d3a9':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:08:45 +0000 (21:08 +0000)]
am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
f394f12167fddbc755855d06b615509517c99f14':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 20:49:57 +0000 (20:49 +0000)]
Merge "libmedia: clear reply data for IEffect command" into klp-dev
Wei Jia [Fri, 28 Aug 2015 15:49:42 +0000 (15:49 +0000)]
Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev
Nick Kralevich [Thu, 27 Aug 2015 22:27:27 +0000 (22:27 +0000)]
am
608c349d: am
4e861bf5: am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
608c349d611e03e0143c23c3f77ddc62b137e354':
IMediaPlayer.cpp: make sure structures are initialized to 0
Jeff Tinker [Thu, 27 Aug 2015 03:22:39 +0000 (20:22 -0700)]
Fix for security vulnerability in media server
bug:
23540426
Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
Nick Kralevich [Thu, 27 Aug 2015 22:22:33 +0000 (22:22 +0000)]
am
4e861bf5: am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
4e861bf5d43eae00ae4cb8727c5a408c3728288b':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 22:15:02 +0000 (22:15 +0000)]
am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
e1dc15ecfaa5bbbda28647749bad51e6d18d0c79':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 22:07:00 +0000 (22:07 +0000)]
am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
762c713900bd764570c8fda4e238497200da66d6':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:59:43 +0000 (21:59 +0000)]
am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
b04cfdf51746dea51d2bb2f56fe9ef789fd30bd9':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:51:52 +0000 (21:51 +0000)]
am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
d437c77716fcf454d99b8424bb01f37643b970cc':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:45:45 +0000 (21:45 +0000)]
am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
0981df6e3db106bfb7a56a2b668c012fcc34dd2c':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 20 Aug 2015 16:56:39 +0000 (09:56 -0700)]
IMediaPlayer.cpp: make sure structures are initialized to 0
Credit https://code.google.com/p/android/issues/detail?id=183310
Bug:
23515142
Change-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427
(cherry picked from commit
b73b826cc16291b33649402497efbe0f946413bd)
Wei Jia [Thu, 27 Aug 2015 20:59:30 +0000 (13:59 -0700)]
NuPlayer: do not create audio decoder if the player is still in shutdown process.
Bug:
23350795
Change-Id: I46b02cf31d7d4447806910a9ecd8c3bda05f2f5b
Andy Hung [Wed, 26 Aug 2015 23:34:33 +0000 (16:34 -0700)]
libmedia: clear reply data for IEffect command
Bug:
23540907
Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
Andy Hung [Wed, 26 Aug 2015 23:34:33 +0000 (16:34 -0700)]
libmedia: clear reply data for IEffect command
Bug:
23540907
Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
Abhishek Arya [Wed, 26 Aug 2015 20:31:00 +0000 (20:31 +0000)]
am
f67f894f: (-s ours) am
ff9a97f6: am
92aa0532: am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
f67f894fead9065dcffda03a127cee7d746c9226':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Wed, 26 Aug 2015 20:30:59 +0000 (20:30 +0000)]
am
529c5cbf: (-s ours) am
1fd9995c: am
196a8a9f: am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
529c5cbf4e3df3cf4a0d1feaba547d314d53c3d3':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Wed, 26 Aug 2015 20:30:58 +0000 (20:30 +0000)]
am
f1dc8e29: (-s ours) am
524f9946: am
76b3fb29: am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
f1dc8e29649b51010bdac55d4f509b2a1fdad922':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Wed, 26 Aug 2015 20:30:57 +0000 (20:30 +0000)]
am
74d08b26: (-s ours) am
fb385ac6: am
571d9731: Merge commit \'
c642d411\' into HEAD
* commit '
74d08b264718cd4026ec3acb918ae5c72adbb68f':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 23:25:19 +0000 (23:25 +0000)]
am
ff9a97f6: am
92aa0532: am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
ff9a97f62344dc318b90c5b62ae3c7d3be5ab90e':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 23:25:18 +0000 (23:25 +0000)]
am
1fd9995c: am
196a8a9f: am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
1fd9995cad1c774c907480d0e4f4d201e81c3e8f':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 23:25:17 +0000 (23:25 +0000)]
am
524f9946: am
76b3fb29: am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
524f99469df44f47fd21d160b8434d40dd11bd65':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 23:25:11 +0000 (23:25 +0000)]
am
fb385ac6: am
571d9731: Merge commit \'
c642d411\' into HEAD
* commit '
fb385ac653b4850fbb4565118c828aa285176a3e':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:32:47 +0000 (16:32 +0000)]
am
92aa0532: am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
92aa0532ab7cfd70011f70bc909249b894a840d0':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:32:46 +0000 (16:32 +0000)]
am
196a8a9f: am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
196a8a9fc741544dacdced22734d8f87f581b375':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:32:45 +0000 (16:32 +0000)]
am
76b3fb29: am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
76b3fb292dcda8f56543be10b9e135cce117e210':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:27:08 +0000 (16:27 +0000)]
am
571d9731: Merge commit \'
c642d411\' into HEAD
* commit '
571d9731c06decc19b55617be85eb0df70fa94cb':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:26:22 +0000 (16:26 +0000)]
am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
5e47eb9512890ea443977d3b54125b33f8259f63':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:26:20 +0000 (16:26 +0000)]
am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
c4757a8741aa43aba2a62b5e4171dcf3a7fc65e6':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:26:19 +0000 (16:26 +0000)]
am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
4fd0696a8f849d80c725322739ba260421299e0b':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:10:32 +0000 (09:10 -0700)]
Merge commit '
c642d411' into HEAD
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Bug:
21443020
(cherry picked from commit
760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
Change-Id: I5bc68e3e7f0278b8bbbe0ad5b87d6e8e2dbabd42
Abhishek Arya [Tue, 25 Aug 2015 05:35:57 +0000 (05:35 +0000)]
am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
35a7b54e828336121d26060dd7e7adb5f5027d32':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:35:56 +0000 (05:35 +0000)]
am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
b504ca537ca206661ab60d774927032bae52dc35':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 05:30:46 +0000 (05:30 +0000)]
am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
f9a51893d739000cd70caf10c83d0e603371f5b1':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:30:44 +0000 (05:30 +0000)]
am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
3a7ff4c754fcb99c29621ed94b08ed6fb65f6495':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 05:23:24 +0000 (05:23 +0000)]
am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
9a2be5d49d57b239bf6345f033eab01ba98f3889':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:23:23 +0000 (05:23 +0000)]
am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
a5f50e98d1408addcaaac27e4d13981163d12a15':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 05:03:29 +0000 (05:03 +0000)]
am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
4f797b92b6e6d21a88c6b9b85a6cba38bfd04e3a':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:03:28 +0000 (05:03 +0000)]
am
dc5e47f0: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
dc5e47f013bfbb74c5c35ad976aa98d480cb351b':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 04:00:11 +0000 (04:00 +0000)]
Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
Abhishek Arya [Tue, 25 Aug 2015 04:00:04 +0000 (04:00 +0000)]
Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
Wei Jia [Mon, 24 Aug 2015 23:23:09 +0000 (23:23 +0000)]
am
dddf932f: am
41de4ba1: am
cf69487d: am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
dddf932f2e58dab3ae183f720f44ca35fca52765':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Mon, 24 Aug 2015 23:23:08 +0000 (23:23 +0000)]
am
a6bafbc5: am
2c02f5ee: am
719cd33e: am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
a6bafbc5da25db600d7311c0ba47a3fe034b4471':
Limit allocations to avoid out-of-memory
Wei Jia [Mon, 24 Aug 2015 23:17:50 +0000 (23:17 +0000)]
am
41de4ba1: am
cf69487d: am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
41de4ba1d896c4e8ab7df24d10ca7d5109fbd323':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Mon, 24 Aug 2015 23:17:49 +0000 (23:17 +0000)]
am
2c02f5ee: am
719cd33e: am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
2c02f5eeec639825ece4acbca0d1969da192dca0':
Limit allocations to avoid out-of-memory
Marco Nelissen [Tue, 16 Jun 2015 21:50:36 +0000 (14:50 -0700)]
DO NOT MERGE - Fix software video decoder buffer size calculation
Various software video decoders would specify the buffer size as if it were
fully cropped, which then failed a sanity check in SoftwareRenderer.
They now return the full buffer size.
Bug:
21717327
Bug:
21443020
Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
(cherry picked from commit
3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)
Marco Nelissen [Tue, 16 Jun 2015 21:50:36 +0000 (14:50 -0700)]
DO NOT MERGE - Fix software video decoder buffer size calculation
Various software video decoders would specify the buffer size as if it were
fully cropped, which then failed a sanity check in SoftwareRenderer.
They now return the full buffer size.
Bug:
21717327
Bug:
21443020
Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
(cherry picked from commit
3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)
Wei Jia [Mon, 8 Jun 2015 21:01:42 +0000 (14:01 -0700)]
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Bug:
21443020
Change-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2
(cherry picked from commit
760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
Wei Jia [Mon, 8 Jun 2015 21:01:42 +0000 (14:01 -0700)]
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Bug:
21443020
Change-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2
(cherry picked from commit
760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
Robert Shih [Mon, 24 Aug 2015 16:06:16 +0000 (16:06 +0000)]
am
fa11fd5b: resolved conflicts for merge of
327afffb to lmp-mr1-ub-dev
* commit '
fa11fd5bb2e9c5e00f7fecbbe76c279193182cee':
Prevent integer issues in ID3::Iterator::findFrame
Robert Shih [Mon, 24 Aug 2015 15:36:50 +0000 (08:36 -0700)]
resolved conflicts for merge of
327afffb to lmp-mr1-ub-dev
Change-Id: I6c1369f05bbeb83e2152b8dae35f7a53328f7239
Wei Jia [Sun, 23 Aug 2015 19:33:29 +0000 (19:33 +0000)]
am
cf69487d: am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
cf69487d1af3eeba724b65716a63ae13238e6e4a':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:33:28 +0000 (19:33 +0000)]
am
719cd33e: am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
719cd33e4ebc1c600772f81db28f81ccfe99ec4e':
Limit allocations to avoid out-of-memory
Wei Jia [Sun, 23 Aug 2015 19:27:03 +0000 (19:27 +0000)]
am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
6f80b09f61da018d2f05e5303c0a798f9011d667':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:27:02 +0000 (19:27 +0000)]
am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
492bba08202a601e96a13b26422c85b3fb1a5ee0':
Limit allocations to avoid out-of-memory
Wei Jia [Sun, 23 Aug 2015 19:19:25 +0000 (19:19 +0000)]
am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
252a8c0956fe5a10bc18d9d4c6337edf29657d72':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:19:24 +0000 (19:19 +0000)]
am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
d18bb120442fcc04efe269e6a26f83265eea40c8':
Limit allocations to avoid out-of-memory
Wei Jia [Sun, 23 Aug 2015 19:15:04 +0000 (19:15 +0000)]
am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
0f3ab16c827a43534597cb38515951ff736f9740':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:15:02 +0000 (19:15 +0000)]
am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
09f71c5621799e0f030b4a8058d2fb4df5977de0':
Limit allocations to avoid out-of-memory