diff options
| author | Danny Fernandes <dannyfernandes@google.com> | 2011-02-11 18:43:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-11 18:43:41 -0800 |
| commit | 1845894d33736c8e17df6b88874bbd4e5a73977a (patch) | |
| tree | 20568cdb764aa1386891c3f0f31c8cb6cc3fce7c | |
| parent | 6f01a99c470d4dcdc046b9ba802b787b95e38dbb (diff) | |
| parent | b864ee128119ad995862355776599e553691e722 (diff) | |
| download | frameworks_av-1845894d33736c8e17df6b88874bbd4e5a73977a.zip frameworks_av-1845894d33736c8e17df6b88874bbd4e5a73977a.tar.gz frameworks_av-1845894d33736c8e17df6b88874bbd4e5a73977a.tar.bz2 | |
Merge "Fix for 3448630 H.263 files returning unsupported profile and level."
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp index eb48717..92116f6 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp @@ -670,7 +670,6 @@ M4OSA_ERR VideoEditor3gpReader_getOption(M4OSA_Context context, break; case M4READER_3GP_kOptionID_H263Properties: { -#if 0 if(M4OSA_NULL == pC->mVideoStreamHandler) { LOGV("VideoEditor3gpReader_getOption no videoStream retrieved"); @@ -678,7 +677,7 @@ M4OSA_ERR VideoEditor3gpReader_getOption(M4OSA_Context context, break; } if((M4DA_StreamTypeVideoH263 != pC->mVideoStreamHandler->\ - mStreamType) || (pC->mVideoStreamHandler->\ + m_streamType) || (pC->mVideoStreamHandler->\ m_decoderSpecificInfoSize < 7)) { LOGV("VideoEditor3gpReader_getOption DSI Size %d", pC->mVideoStreamHandler->m_decoderSpecificInfoSize); @@ -693,7 +692,6 @@ M4OSA_ERR VideoEditor3gpReader_getOption(M4OSA_Context context, pC->mVideoStreamHandler->m_pDecoderSpecificInfo[6]; ((M4READER_3GP_H263Properties *)pValue)->uiLevel = pC->mVideoStreamHandler->m_pDecoderSpecificInfo[5]; -#endif LOGV("VideoEditor3gpReader_getOption M4READER_3GP_kOptionID_\ H263Properties end"); } @@ -1520,14 +1518,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, /* Get the DSI info */ if(M4DA_StreamTypeVideoH263 == streamType) { - if (meta->findData(kKeyESDS, &type, &data, &size)) { - ESDS esds((const char *)data, size); - CHECK_EQ(esds.InitCheck(), OK); - - esds.getCodecSpecificInfo( - &codec_specific_data, &codec_specific_data_size); - (*pStreamHandler)->m_decoderSpecificInfoSize = - codec_specific_data_size; + if (meta->findData(kKeyD263, &type, &data, &size)) { + (*pStreamHandler)->m_decoderSpecificInfoSize = size; if ((*pStreamHandler)->m_decoderSpecificInfoSize != 0) { DecoderSpecific = (M4OSA_UInt8*)M4OSA_malloc( (*pStreamHandler)->m_decoderSpecificInfoSize, @@ -1536,15 +1528,19 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, return M4ERR_ALLOC; } M4OSA_memcpy((M4OSA_MemAddr8)DecoderSpecific, - (M4OSA_MemAddr8)codec_specific_data, - codec_specific_data_size); + (M4OSA_MemAddr8)data, size); (*pStreamHandler)->m_pDecoderSpecificInfo = DecoderSpecific; } else { (*pStreamHandler)->m_pDecoderSpecificInfo = M4OSA_NULL; + (*pStreamHandler)->m_decoderSpecificInfoSize = 0; } + (*pStreamHandler)->m_pESDSInfo = M4OSA_NULL; + (*pStreamHandler)->m_ESDSInfoSize = 0; + (*pStreamHandler)->m_pH264DecoderSpecificInfo = M4OSA_NULL; + (*pStreamHandler)->m_H264decoderSpecificInfoSize = 0; } else { LOGV("VE_getNextStreamHandler: H263 dsi not found"); (*pStreamHandler)->m_pDecoderSpecificInfo = M4OSA_NULL; |