commit 76cdb30c5bf3110354051aca2a16b5c8fbad3398
author Chih-Chung Chang <chihchung@google.com> Wed Jul 27 20:03:59 2011 +0800
committer Chih-Chung Chang <chihchung@google.com> Wed Jul 27 20:03:59 2011 +0800
tree 245069de0bcd92f6b327ee5681b0952f09053eb4
parent 7efb8efc88ba529c1c57366a305855c2051ebb8b

Remove unnecessary encoder input format check.

This was preventing the export function from working because the
encoder may accept a format other than YV12. As we always
convert frames to what the encoder accepts, the check is
unnecessary.

Change-Id: I2056f560b4737d33956b277fb39ebe85278464ae

libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp

diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
index 41c757c..c05aa41 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
@@ -918,25 +918,9 @@
         pOutPlane[2].u_topleft = 0;
         pOutPlane[2].u_stride  = pOutPlane[1].u_stride;
 
-        switch( pEncoderContext->mEncoderColorFormat ) {
-            case OMX_COLOR_FormatYUV420Planar:
-                pOutPlane[0].pac_data = pData;
-                pOutPlane[1].pac_data = pData + sizeY;
-                pOutPlane[2].pac_data = pData + sizeY + sizeU;
-            break;
-            case OMX_COLOR_FormatYUV420SemiPlanar:
-                pOutPlane[0].pac_data = pData;
-                SAFE_MALLOC(pOutPlane[1].pac_data, M4VIFI_UInt8,
-                    pOutPlane[1].u_height*pOutPlane[1].u_stride,"OutputPlaneU");
-                SAFE_MALLOC(pOutPlane[2].pac_data, M4VIFI_UInt8,
-                    pOutPlane[2].u_height*pOutPlane[2].u_stride,"OutputPlaneV");
-            break;
-            default:
-                LOGV("VideoEditorVideoEncoder_processInputBuffer : unsupported "
-                    "color format 0x%X", pEncoderContext->mEncoderColorFormat);
-                VIDEOEDITOR_CHECK(M4OSA_FALSE, M4ERR_PARAMETER);
-            break;
-        }
+        pOutPlane[0].pac_data = pData;
+        pOutPlane[1].pac_data = pData + sizeY;
+        pOutPlane[2].pac_data = pData + sizeY + sizeU;
 
         // Apply pre-processing
         err = pEncoderContext->mPreProcFunction(
@@ -983,16 +967,6 @@
     nbBuffer = pEncoderContext->mEncoderSource->storeBuffer(buffer);
 
 cleanUp:
-    if ( OMX_COLOR_FormatYUV420SemiPlanar == \
-            pEncoderContext->mEncoderColorFormat ) {
-        // Y plane has not been allocated
-        if ( pOutPlane[1].pac_data ) {
-            SAFE_FREE(pOutPlane[1].pac_data);
-        }
-        if ( pOutPlane[2].pac_data ) {
-            SAFE_FREE(pOutPlane[2].pac_data);
-        }
-    }
     if ( M4NO_ERROR == err ) {
         LOGV("VideoEditorVideoEncoder_processInputBuffer error 0x%X", err);
     } else {