OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f52229
)
Some playable/decodable streams have been found in the wild that violate this asserti...
author
Andreas Huber
<andih@google.com>
Mon, 23 Nov 2009 22:39:38 +0000
(14:39 -0800)
committer
Andreas Huber
<andih@google.com>
Mon, 23 Nov 2009 23:14:44 +0000
(15:14 -0800)
media/libstagefright/OMXCodec.cpp
patch
|
blob
|
history
diff --git
a/media/libstagefright/OMXCodec.cpp
b/media/libstagefright/OMXCodec.cpp
index
10a4986
..
c5e935d
100644
(file)
--- a/
media/libstagefright/OMXCodec.cpp
+++ b/
media/libstagefright/OMXCodec.cpp
@@
-351,7
+351,9
@@
sp<OMXCodec> OMXCodec::Create(
uint8_t profile = ptr[1];
uint8_t level = ptr[3];
- CHECK((ptr[4] >> 2) == 0x3f); // reserved
+ // There is decodable content out there that fails the following
+ // assertion, let's be lenient for now...
+ // CHECK((ptr[4] >> 2) == 0x3f); // reserved
size_t lengthSize = 1 + (ptr[4] & 3);