Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index ba35748..14682af 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -538,11 +538,12 @@
size -= length;
}
- LOGV("AVC profile = %d (%s), level = %d",
- (int)profile, AVCProfileToString(profile), (int)level / 10);
+ CODEC_LOGV(
+ "AVC profile = %d (%s), level = %d",
+ (int)profile, AVCProfileToString(profile), level);
if (!strcmp(mComponentName, "OMX.TI.Video.Decoder")
- && (profile != kAVCProfileBaseline || level > 39)) {
+ && (profile != kAVCProfileBaseline || level > 30)) {
// This stream exceeds the decoder's capabilities. The decoder
// does not handle this gracefully and would clobber the heap
// and wreak havoc instead...