commit 4e28768b7a8d6a376c95d35e9060603431636bda
author Danny Fernandes <dannyfernandes@google.com> Fri Feb 04 13:37:40 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 04 13:37:40 2011 -0800
tree c552233b7cdd95a0fa14502a1a74794a0a9c72bf
parent 5eae88ab5c94efee602a5b68ceacd74f5285c6c4
parent 67fda6a6a718fa46aa803afa2c48be007b193587

Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb

libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp

diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 02005a4..a8b9c0c 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -1374,17 +1374,50 @@
                 int32_t uvPlaneSize = width * height / 4;
                 int32_t offsetSrc = 0;
 
-                M4OSA_MemAddr8 pTmpBuff = (M4OSA_MemAddr8)pDecoderBuffer->data() + pDecoderBuffer->range_offset();
+                if (( width == pDecShellContext->mGivenWidth )  &&
+                    ( height == pDecShellContext->mGivenHeight ))
+                {
+                    M4OSA_MemAddr8 pTmpBuff = (M4OSA_MemAddr8)pDecoderBuffer->data() + pDecoderBuffer->range_offset();
 
-                M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData, pTmpBuff, yPlaneSize);
+                    M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData, pTmpBuff, yPlaneSize);
 
-                offsetSrc += pDecShellContext->mGivenWidth * pDecShellContext->mGivenHeight;
-                M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize,
-                    pTmpBuff + offsetSrc, uvPlaneSize);
+                    offsetSrc += pDecShellContext->mGivenWidth * pDecShellContext->mGivenHeight;
+                    M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize,
+                        pTmpBuff + offsetSrc, uvPlaneSize);
 
-                offsetSrc += (pDecShellContext->mGivenWidth >> 1) * (pDecShellContext->mGivenHeight >> 1);
-                M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize + uvPlaneSize,
-                                pTmpBuff + offsetSrc, uvPlaneSize);
+                    offsetSrc += (pDecShellContext->mGivenWidth >> 1) * (pDecShellContext->mGivenHeight >> 1);
+                    M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize + uvPlaneSize,
+                        pTmpBuff + offsetSrc, uvPlaneSize);
+                }
+                else
+                {
+                    M4OSA_MemAddr8 pTmpBuff = (M4OSA_MemAddr8)pDecoderBuffer->data() + pDecoderBuffer->range_offset();
+                    M4OSA_MemAddr8 pTmpBuffDst = (M4OSA_MemAddr8)tmpDecBuffer->pData;
+                    int32_t index;
+
+                    for ( index = 0; index < height; index++)
+                    {
+                        memcpy(pTmpBuffDst, pTmpBuff, width);
+                        pTmpBuffDst += width;
+                        pTmpBuff += pDecShellContext->mGivenWidth;
+                    }
+
+                    pTmpBuff += (pDecShellContext->mGivenWidth * ( pDecShellContext->mGivenHeight - height));
+                    for ( index = 0; index < height >> 1; index++)
+                    {
+                        memcpy(pTmpBuffDst, pTmpBuff, width >> 1);
+                        pTmpBuffDst += width >> 1;
+                        pTmpBuff += pDecShellContext->mGivenWidth >> 1;
+                    }
+
+                    pTmpBuff += ((pDecShellContext->mGivenWidth * (pDecShellContext->mGivenHeight - height)) / 4);
+                    for ( index = 0; index < height >> 1; index++)
+                    {
+                        memcpy(pTmpBuffDst, pTmpBuff, width >> 1);
+                        pTmpBuffDst += width >> 1;
+                        pTmpBuff += pDecShellContext->mGivenWidth >> 1;
+                    }
+                }
 
                 break;
             }