Changeset 45

Timestamp:

05/04/08 16:52:40 (4 months ago)

Author:

sip

Message:

Fixed overlaped image on mosaic

Files:

• media/include/framescaler.h (modified) (2 diffs)
• media/src/framescaler.cpp (modified) (5 diffs)
• media/src/partedmosaic.cpp (modified) (1 diff)

media/include/framescaler.h

@@ -10 +10 @@
-public:
-        FrameScaler();
+        ~FrameScaler();
-        int SetResize(int srcWidth,int srcHeight,int srcLineWidth,int dstWidth,int dstHeight,int dstLineWidth);
-        int Resize(BYTE *srcY,BYTE *srcU,BYTE *srcV,BYTE *dstY, BYTE *dstU, BYTE *dstV);
@@ -19 +20 @@
-        int     resizeDstWidth;
-        int     resizeDstHeight;
+        int     resizeDstLineWidth;
-        int     resizeSrc[3];
-        int     resizeDst[3];
-        int     resizeFlags;
+        int     tmpWidth;
+        int     tmpHeight;
+        int     tmpBufferSize;
+        BYTE*   tmpBuffer;
+        BYTE*   tmpY;
+        BYTE*   tmpU;
+        BYTE*   tmpV;
+
-};
-

media/src/framescaler.cpp

@@ -1 +1 @@
-#include <framescaler.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
-
-FrameScaler::FrameScaler()
@@ -9 +13 @@
-        resizeDstWidth  = 0;
-        resizeDstHeight = 0;
+        resizeDstLineWidth = 0;
+
+        //tmp buffer
+        tmpWidth        = 0;
+        tmpHeight       = 0;
+        tmpBuffer       = NULL;
+        tmpBufferSize   = 0;
+        tmpY            = NULL;
+        tmpU            = NULL;
+        tmpV            = NULL;
-
-        // Bicubic by default 
-        resizeFlags     = SWS_BICUBIC;
+}
+FrameScaler::~FrameScaler()
+{
+        //Free mem
+        if (tmpBuffer)
+                //free
+                free(tmpBuffer);
+        //Close resizer
+        //??
-}
-
@@ -38 +61 @@
-        resizeDstWidth  = dstWidth;
-        resizeDstHeight = dstHeight;
+        resizeDstLineWidth = dstLineWidth;
+
+
+        //to use MM2 we need the width and heinght to be multiple of 32
+        tmpWidth = (resizeDstWidth/32 +1)*32;
+        tmpHeight = (resizeDstHeight/32 +1)*32;
+
+        //Get tmp buffer size
+        tmpBufferSize = tmpWidth*tmpHeight*3/2;
+
+        //Check if we had it already
+        if (tmpBuffer)
+                //Free it
+                free(tmpBuffer);
+
+        //Allocate it
+        tmpBuffer = (BYTE*)malloc(tmpBufferSize);
-
-        // Set values for line sizes
@@ -43 +83 @@
-        resizeSrc[1] = srcLineWidth/2;
-        resizeSrc[2] = srcLineWidth/2;
-
+/*
-        resizeDst[1] = dstLineWidth/2;
-
+
+
+
+
+
+
+
+
+
-
-        // exit 
@@ -62 +110 @@
-                return 0;
-
-        // Set input picture data 
-        int numPixels = resizeWidth*resizeHeight;
-        int resPixels = resizeDstWidth;
-
-        // Set pointers 
-        src[0] = srcY;
-        src[1] = srcU;
-        src[2] = srcV;
-
+/*
-        dst[1] = dstU;
-
+
+
+
+
-
-        // Resize frame 
-        sws_scale(resizeCtx, src, resizeSrc, 0, resizeHeight, dst, resizeDst);
-
+        //Copy to destination
+        for (int i=0;i<resizeDstHeight;++i)
+                //Copy
+                memcpy(dstY+resizeDstLineWidth*i,tmpY+tmpWidth*i,resizeDstWidth);
+
+        //Copy to destination
+        for (int i=0;i<resizeDstHeight/2;++i)
+        {
+                //Copy
+                memcpy(dstU+resizeDstLineWidth*i/2,tmpU+tmpWidth*i/2,resizeDstWidth/2);
+                memcpy(dstV+resizeDstLineWidth*i/2,tmpV+tmpWidth*i/2,resizeDstWidth/2);
+        }
+
-        //Done
-        return 1;

media/src/partedmosaic.cpp

@@ -101 +101 @@
-        //Get offsets
-        offset = (mosaicTotalWidth*mosaicHeight*i) + mosaicWidth*j; 
-*i)/4+(mosaicWidth*j)/2
+/4)*i+(mosaicWidth/2)*j
-
-        //Get plane pointers