diff options
author | Chih-Chung Chang <chihchung@google.com> | 2011-08-05 17:52:45 +0800 |
---|---|---|
committer | Chih-Chung Chang <chihchung@google.com> | 2011-08-08 18:11:04 +0800 |
commit | 2aa01fd002bba1dde45791c1138c1f71a8d0aa53 (patch) | |
tree | dfa99a4f4d0a709a43a9b1b9cc83802c28f48f47 /libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp | |
parent | 43fcc396614a587851e2b7c4cea2876ec58b8648 (diff) | |
download | frameworks_av-2aa01fd002bba1dde45791c1138c1f71a8d0aa53.zip frameworks_av-2aa01fd002bba1dde45791c1138c1f71a8d0aa53.tar.gz frameworks_av-2aa01fd002bba1dde45791c1138c1f71a8d0aa53.tar.bz2 |
Rename YV12 to I420.
Change-Id: I453b7044bf46950ef67091f3417ed3e6a65086a0
Diffstat (limited to 'libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp')
-rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp index 42cfa65..3447c2c 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp @@ -788,7 +788,7 @@ M4OSA_ERR VideoEditorVideoDecoder_destroy(M4OSA_Context pContext) { VIDEOEDITOR_CHECK(M4OSA_NULL != pContext, M4ERR_PARAMETER); // Release the color converter - delete pDecShellContext->mYV12ColorConverter; + delete pDecShellContext->mI420ColorConverter; // Destroy the graph if( pDecShellContext->mVideoDecoder != NULL ) { @@ -943,14 +943,14 @@ M4OSA_ERR VideoEditorVideoDecoder_create(M4OSA_Context *pContext, pDecShellContext->m_pVideoStreamhandler->m_videoHeight); // Get the color converter - pDecShellContext->mYV12ColorConverter = new YV12ColorConverter; - if (pDecShellContext->mYV12ColorConverter->isLoaded()) { - decoderOutput = pDecShellContext->mYV12ColorConverter->getDecoderOutputFormat(); + pDecShellContext->mI420ColorConverter = new I420ColorConverter; + if (pDecShellContext->mI420ColorConverter->isLoaded()) { + decoderOutput = pDecShellContext->mI420ColorConverter->getDecoderOutputFormat(); } if (decoderOutput == OMX_COLOR_FormatYUV420Planar) { - delete pDecShellContext->mYV12ColorConverter; - pDecShellContext->mYV12ColorConverter = NULL; + delete pDecShellContext->mI420ColorConverter; + pDecShellContext->mI420ColorConverter = NULL; } LOGI("decoder output format = 0x%X\n", decoderOutput); @@ -1412,14 +1412,14 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context, break; } default: - if (pDecShellContext->mYV12ColorConverter) { - if (pDecShellContext->mYV12ColorConverter->convertDecoderOutputToYV12( + if (pDecShellContext->mI420ColorConverter) { + if (pDecShellContext->mI420ColorConverter->convertDecoderOutputToI420( (uint8_t *)pDecoderBuffer->data(),// ?? + pDecoderBuffer->range_offset(), // decoderBits pDecShellContext->mGivenWidth, // decoderWidth pDecShellContext->mGivenHeight, // decoderHeight pDecShellContext->mCropRect, // decoderRect tmpDecBuffer->pData /* dstBits */) < 0) { - LOGE("convertDecoderOutputToYV12 failed"); + LOGE("convertDecoderOutputToI420 failed"); } } else { LOGW("VideoDecoder_decode: unexpected color format 0x%X", |