swscale: use Nbit code to handle !is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 May 2011 22:37:20 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 May 2011 22:37:20 +0000 (00:37 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale.c

index 6379bc1..521ed8e 100644 (file)
@@ -1898,7 +1898,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
             fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128);
         } else {
             if(isNBPS(c->srcFormat) || isNBPS(c->dstFormat)
-               || (is16BPS(c->srcFormat) && !is16BPS(c->dstFormat))
+               || (is16BPS(c->srcFormat) != is16BPS(c->dstFormat))
             ) {
                 const int src_depth = av_pix_fmt_descriptors[c->srcFormat].comp[plane].depth_minus1+1;
                 const int dst_depth = av_pix_fmt_descriptors[c->dstFormat].comp[plane].depth_minus1+1;
@@ -1940,15 +1940,6 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
                         DITHER_COPY(dstPtr2, dstStride[plane]/2, srcPtr2, srcStride[plane]/2, av_bswap16)
                     }
                 }
-            } else if(!is16BPS(c->srcFormat) && is16BPS(c->dstFormat)) {
-                for (i=0; i<height; i++) {
-                    for (j=0; j<length; j++) {
-                        dstPtr[ j<<1   ] = srcPtr[j];
-                        dstPtr[(j<<1)+1] = srcPtr[j];
-                    }
-                    srcPtr+= srcStride[plane];
-                    dstPtr+= dstStride[plane];
-                }
             } else if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
                   && isBE(c->srcFormat) != isBE(c->dstFormat)) {