am 7b909c05: am 66b89a62: 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

This commit is contained in:
Andreas Huber
2010-06-10 10:17:04 -07:00
committed by Android Git Automerger

View File

@@ -538,11 +538,12 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) {
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...