generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swscale: fix formatting and indentation of unscaled conversion routines.

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Nathan Adil Maxson 2011-12-18 08:11:27 -08:00 committed by Ronald S. Bultje
parent 87eebb3454
commit 7b3894bee9
1 changed files with 380 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
libswscale/swscale_unscaled.c
View File

@ -87,7 +87,8 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_256)[8][8] = {
#define RV ( (int) (0.500 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) #define RV ( (int) (0.500 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5))
#define RU (-(int) (0.169 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) #define RU (-(int) (0.169 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5))
static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, uint8_t val) static void fillPlane(uint8_t *plane, int stride, int width, int height, int y,
uint8_t val)
{ {
int i; int i;
uint8_t *ptr = plane + stride * y; uint8_t *ptr = plane + stride * y;
@ -114,8 +115,10 @@ static void copyPlane(const uint8_t *src, int srcStride,
} }
} }
static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY,
int srcSliceH, uint8_t *dstParam[],
int dstStride[])
{ {
uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY / 2; uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY / 2;
@ -123,61 +126,73 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
dstParam[0], dstStride[0]); dstParam[0], dstStride[0]);
if (c->dstFormat == PIX_FMT_NV12) if (c->dstFormat == PIX_FMT_NV12)
interleaveBytes(src[1], src[2], dst, c->srcW/2, srcSliceH/2, srcStride[1], srcStride[2], dstStride[0]); interleaveBytes(src[1], src[2], dst, c->srcW / 2, srcSliceH / 2,
srcStride[1], srcStride[2], dstStride[0]);
else else
interleaveBytes(src[2], src[1], dst, c->srcW/2, srcSliceH/2, srcStride[2], srcStride[1], dstStride[0]); interleaveBytes(src[2], src[1], dst, c->srcW / 2, srcSliceH / 2,
srcStride[2], srcStride[1], dstStride[0]);
return srcSliceH; return srcSliceH;
} }
static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]); yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
srcStride[1], dstStride[0]);
return srcSliceH; return srcSliceH;
} }
static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarToUyvyWrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
yv12touyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]); yv12touyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
srcStride[1], dstStride[0]);
return srcSliceH; return srcSliceH;
} }
static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
yuv422ptoyuy2(src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0]); yuv422ptoyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
srcStride[1], dstStride[0]);
return srcSliceH; return srcSliceH;
} }
static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY;
yuv422ptouyvy(src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0]); yuv422ptouyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
srcStride[1], dstStride[0]);
return srcSliceH; return srcSliceH;
} }
static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2; uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2;
uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY / 2; uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY / 2;
yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
dstStride[1], srcStride[0]);
if (dstParam[3]) if (dstParam[3])
fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
@ -185,26 +200,30 @@ static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
return srcSliceH; return srcSliceH;
} }
static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY; uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY;
uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY; uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY;
yuyvtoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); yuyvtoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
dstStride[1], srcStride[0]);
return srcSliceH; return srcSliceH;
} }
static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2; uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2;
uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY / 2; uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY / 2;
uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
dstStride[1], srcStride[0]);
if (dstParam[3]) if (dstParam[3])
fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
@ -212,26 +231,30 @@ static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
return srcSliceH; return srcSliceH;
} }
static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
{ {
uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY;
uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY; uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY;
uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY; uint8_t *vdst = dstParam[2] + dstStride[2] * srcSliceY;
uyvytoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); uyvytoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
dstStride[1], srcStride[0]);
return srcSliceH; return srcSliceH;
} }
static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette) static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels,
const uint8_t *palette)
{ {
int i; int i;
for (i = 0; i < num_pixels; i++) for (i = 0; i < num_pixels; i++)
((uint32_t *) dst)[i] = ((const uint32_t *) palette)[src[i << 1]] | (src[(i << 1) + 1] << 24); ((uint32_t *) dst)[i] = ((const uint32_t *) palette)[src[i << 1]] | (src[(i << 1) + 1] << 24);
} }
static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette) static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels,
const uint8_t *palette)
{ {
int i; int i;
@ -239,7 +262,8 @@ static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels,
((uint32_t *) dst)[i] = ((const uint32_t *) palette)[src[i << 1]] | src[(i << 1) + 1]; ((uint32_t *) dst)[i] = ((const uint32_t *) palette)[src[i << 1]] | src[(i << 1) + 1];
} }
static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette) static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels,
const uint8_t *palette)
{ {
int i; int i;
@ -273,8 +297,9 @@ static int packed_16bpc_bswap(SwsContext *c, const uint8_t* src[],
return srcSliceH; return srcSliceH;
} }
static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceY, int srcSliceH, uint8_t *dst[],
int dstStride[])
{ {
const enum PixelFormat srcFormat = c->srcFormat; const enum PixelFormat srcFormat = c->srcFormat;
const enum PixelFormat dstFormat = c->dstFormat; const enum PixelFormat dstFormat = c->dstFormat;
@ -326,8 +351,9 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
) )
/* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */ /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */
static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceY, int srcSliceH, uint8_t *dst[],
int dstStride[])
{ {
const enum PixelFormat srcFormat = c->srcFormat; const enum PixelFormat srcFormat = c->srcFormat;
const enum PixelFormat dstFormat = c->dstFormat; const enum PixelFormat dstFormat = c->dstFormat;
@ -354,8 +380,8 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
|| CONV_IS(RGBA, ARGB)) conv = shuffle_bytes_3012; || CONV_IS(RGBA, ARGB)) conv = shuffle_bytes_3012;
} else } else
/* BGR -> BGR */ /* BGR -> BGR */
if ( (isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) if ((isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) ||
|| (isRGBinInt(srcFormat) && isRGBinInt(dstFormat))) { (isRGBinInt(srcFormat) && isRGBinInt(dstFormat))) {
switch (srcId | (dstId << 4)) { switch (srcId | (dstId << 4)) {
case 0x34: conv = rgb16to15; break; case 0x34: conv = rgb16to15; break;
case 0x36: conv = rgb24to15; break; case 0x36: conv = rgb24to15; break;
@ -370,8 +396,8 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
case 0x84: conv = rgb16to32; break; case 0x84: conv = rgb16to32; break;
case 0x86: conv = rgb24to32; break; case 0x86: conv = rgb24to32; break;
} }
} else if ( (isBGRinInt(srcFormat) && isRGBinInt(dstFormat)) } else if ((isBGRinInt(srcFormat) && isRGBinInt(dstFormat)) ||
|| (isRGBinInt(srcFormat) && isBGRinInt(dstFormat))) { (isRGBinInt(srcFormat) && isBGRinInt(dstFormat))) {
switch (srcId | (dstId << 4)) { switch (srcId | (dstId << 4)) {
case 0x33: conv = rgb15tobgr15; break; case 0x33: conv = rgb15tobgr15; break;
case 0x34: conv = rgb16tobgr15; break; case 0x34: conv = rgb16tobgr15; break;
@ -397,14 +423,18 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
} else { } else {
const uint8_t *srcPtr = src[0]; const uint8_t *srcPtr = src[0];
uint8_t *dstPtr = dst[0]; uint8_t *dstPtr = dst[0];
if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1) && !isRGBA32(dstFormat)) if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1) &&
!isRGBA32(dstFormat))
srcPtr += ALT32_CORR; srcPtr += ALT32_CORR;
if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1) && !isRGBA32(srcFormat)) if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1) &&
!isRGBA32(srcFormat))
dstPtr += ALT32_CORR; dstPtr += ALT32_CORR;
if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0 && !(srcStride[0] % srcBpp)) if (dstStride[0] * srcBpp == srcStride[0] * dstBpp && srcStride[0] > 0 &&
conv(srcPtr, dstPtr + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]); !(srcStride[0] % srcBpp))
conv(srcPtr, dstPtr + dstStride[0] * srcSliceY,
srcSliceH * srcStride[0]);
else { else {
int i; int i;
dstPtr += dstStride[0] * srcSliceY; dstPtr += dstStride[0] * srcSliceY;
@ -419,8 +449,9 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
return srcSliceH; return srcSliceH;
} }
static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dst[], int dstStride[])
{ {
rgb24toyv12( rgb24toyv12(
src[0], src[0],
@ -434,8 +465,9 @@ static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
return srcSliceH; return srcSliceH;
} }
static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dst[], int dstStride[])
{ {
copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW, copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,
dst[0], dstStride[0]); dst[0], dstStride[0]);
@ -450,8 +482,9 @@ static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[
} }
/* unscaled copy like stuff (assumes nearly identical formats) */ /* unscaled copy like stuff (assumes nearly identical formats) */
static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int packedCopyWrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dst[], int dstStride[])
{ {
if (dstStride[0] == srcStride[0] && srcStride[0] > 0) if (dstStride[0] == srcStride[0] && srcStride[0] > 0)
memcpy(dst[0] + dstStride[0] * srcSliceY, src[0], srcSliceH * dstStride[0]); memcpy(dst[0] + dstStride[0] * srcSliceY, src[0], srcSliceH * dstStride[0]);
@ -462,8 +495,9 @@ static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
int length = 0; int length = 0;
/* universal length finder */ /* universal length finder */
while(length+c->srcW <= FFABS(dstStride[0]) while (length + c->srcW <= FFABS(dstStride[0]) &&
&& length+c->srcW <= FFABS(srcStride[0])) length+= c->srcW; length + c->srcW <= FFABS(srcStride[0]))
length += c->srcW;
assert(length != 0); assert(length != 0);
for (i = 0; i < srcSliceH; i++) { for (i = 0; i < srcSliceH; i++) {
@ -496,8 +530,9 @@ static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
src += srcStride; \ src += srcStride; \
} }
static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dst[], int dstStride[])
{ {
int plane, i, j; int plane, i, j;
for (plane = 0; plane < 4; plane++) { for (plane = 0; plane < 4; plane++) {
@ -507,13 +542,15 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
const uint8_t *srcPtr = src[plane]; const uint8_t *srcPtr = src[plane];
uint8_t *dstPtr = dst[plane] + dstStride[plane] * y; uint8_t *dstPtr = dst[plane] + dstStride[plane] * y;
if (!dst[plane]) continue; if (!dst[plane])
continue;
// ignore palette for GRAY8 // ignore palette for GRAY8
if (plane == 1 && !dst[2]) continue; if (plane == 1 && !dst[2]) continue;
if (!src[plane] || (plane == 1 && !src[2])) { if (!src[plane] || (plane == 1 && !src[2])) {
if (is16BPS(c->dstFormat)) if (is16BPS(c->dstFormat))
length *= 2; length *= 2;
fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128); fillPlane(dst[plane], dstStride[plane], length, height, y,
(plane == 3) ? 255 : 128);
} else { } else {
if (is9_OR_10BPS(c->srcFormat)) { if (is9_OR_10BPS(c->srcFormat)) {
const int src_depth = av_pix_fmt_descriptors[c->srcFormat].comp[plane].depth_minus1 + 1; const int src_depth = av_pix_fmt_descriptors[c->srcFormat].comp[plane].depth_minus1 + 1;
@ -661,8 +698,8 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
srcPtr += srcStride[plane]; srcPtr += srcStride[plane];
dstPtr += dstStride[plane]; dstPtr += dstStride[plane];
} }
} else if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat) } else if (is16BPS(c->srcFormat) && is16BPS(c->dstFormat) &&
&& isBE(c->srcFormat) != isBE(c->dstFormat)) { isBE(c->srcFormat) != isBE(c->dstFormat)) {
for (i = 0; i < height; i++) { for (i = 0; i < height; i++) {
for (j = 0; j < length; j++) for (j = 0; j < length; j++)
@ -702,26 +739,32 @@ void ff_get_unscaled_swscale(SwsContext *c)
const int dstH = c->dstH; const int dstH = c->dstH;
int needsDither; int needsDither;
needsDither= isAnyRGB(dstFormat) needsDither = isAnyRGB(dstFormat) &&
&& c->dstFormatBpp < 24 c->dstFormatBpp < 24 &&
&& (c->dstFormatBpp < c->srcFormatBpp || (!isAnyRGB(srcFormat))); (c->dstFormatBpp < c->srcFormatBpp || (!isAnyRGB(srcFormat)));
/* yv12_to_nv12 */ /* yv12_to_nv12 */
if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) { if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) &&
(dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) {
c->swScale = planarToNv12Wrapper; c->swScale = planarToNv12Wrapper;
} }
/* yuv2bgr */ /* yuv2bgr */
if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUV422P ||
&& !(flags & SWS_ACCURATE_RND) && !(dstH&1)) { srcFormat == PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) &&
!(flags & SWS_ACCURATE_RND) && !(dstH & 1)) {
c->swScale = ff_yuv2rgb_get_func_ptr(c); c->swScale = ff_yuv2rgb_get_func_ptr(c);
} }
if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) { if (srcFormat == PIX_FMT_YUV410P &&
(dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P) &&
!(flags & SWS_BITEXACT)) {
c->swScale = yvu9ToYv12Wrapper; c->swScale = yvu9ToYv12Wrapper;
} }
/* bgr24toYV12 */ /* bgr24toYV12 */
if (srcFormat==PIX_FMT_BGR24 && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND)) if (srcFormat == PIX_FMT_BGR24 &&
(dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P) &&
!(flags & SWS_ACCURATE_RND))
c->swScale = bgr24ToYv12Wrapper; c->swScale = bgr24ToYv12Wrapper;
/* RGB/BGR -> RGB/BGR (no dither needed forms) */ /* RGB/BGR -> RGB/BGR (no dither needed forms) */
@ -780,9 +823,11 @@ void ff_get_unscaled_swscale(SwsContext *c)
c->swScale = planarToUyvyWrapper; c->swScale = planarToUyvyWrapper;
} }
} }
if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) if (srcFormat == PIX_FMT_YUYV422 &&
(dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
c->swScale = yuyvToYuv420Wrapper; c->swScale = yuyvToYuv420Wrapper;
if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) if (srcFormat == PIX_FMT_UYVY422 &&
(dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
c->swScale = uyvyToYuv420Wrapper; c->swScale = uyvyToYuv420Wrapper;
if (srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P) if (srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P)
c->swScale = yuyvToYuv422Wrapper; c->swScale = yuyvToYuv422Wrapper;
@ -790,17 +835,17 @@ void ff_get_unscaled_swscale(SwsContext *c)
c->swScale = uyvyToYuv422Wrapper; c->swScale = uyvyToYuv422Wrapper;
/* simple copy */ /* simple copy */
if ( srcFormat == dstFormat if ( srcFormat == dstFormat ||
|| (srcFormat == PIX_FMT_YUVA420P && dstFormat == PIX_FMT_YUV420P) (srcFormat == PIX_FMT_YUVA420P && dstFormat == PIX_FMT_YUV420P) ||
|| (srcFormat == PIX_FMT_YUV420P && dstFormat == PIX_FMT_YUVA420P) (srcFormat == PIX_FMT_YUV420P && dstFormat == PIX_FMT_YUVA420P) ||
|| (isPlanarYUV(srcFormat) && isGray(dstFormat)) (isPlanarYUV(srcFormat) && isGray(dstFormat)) ||
|| (isPlanarYUV(dstFormat) && isGray(srcFormat)) (isPlanarYUV(dstFormat) && isGray(srcFormat)) ||
|| (isGray(dstFormat) && isGray(srcFormat)) (isGray(dstFormat) && isGray(srcFormat)) ||
|| (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat) (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat) &&
&& c->chrDstHSubSample == c->chrSrcHSubSample c->chrDstHSubSample == c->chrSrcHSubSample &&
&& c->chrDstVSubSample == c->chrSrcVSubSample c->chrDstVSubSample == c->chrSrcVSubSample &&
&& dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21 dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21 &&
&& srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21)) srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21))
{ {
if (isPacked(c->srcFormat)) if (isPacked(c->srcFormat))
c->swScale = packedCopyWrapper; c->swScale = packedCopyWrapper;
@ -845,9 +890,11 @@ static int check_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt,
* swscale wrapper, so we don't need to export the SwsContext. * swscale wrapper, so we don't need to export the SwsContext.
* Assumes planar YUV to be in YUV order instead of YVU. * Assumes planar YUV to be in YUV order instead of YVU.
*/ */
int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[], int attribute_align_arg sws_scale(struct SwsContext *c,
const int srcStride[], int srcSliceY, int srcSliceH, const uint8_t * const srcSlice[],
uint8_t* const dst[], const int dstStride[]) const int srcStride[], int srcSliceY,
int srcSliceH, uint8_t *const dst[],
const int dstStride[])
{ {
int i; int i;
const uint8_t *src2[4] = { srcSlice[0], srcSlice[1], srcSlice[2], srcSlice[3] }; const uint8_t *src2[4] = { srcSlice[0], srcSlice[1], srcSlice[2], srcSlice[3] };
@ -894,7 +941,8 @@ int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
r = ( i >> 3 ) * 255; r = ( i >> 3 ) * 255;
g = ((i >> 1) & 3) * 85; g = ((i >> 1) & 3) * 85;
b = ( i & 1) * 255; b = ( i & 1) * 255;
} else if(c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_Y400A) { } else if (c->srcFormat == PIX_FMT_GRAY8 ||
c->srcFormat == PIX_FMT_Y400A) {
r = g = b = i; r = g = b = i;
} else { } else {
assert(c->srcFormat == PIX_FMT_BGR4_BYTE); assert(c->srcFormat == PIX_FMT_BGR4_BYTE);
@ -939,8 +987,10 @@ int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
// copy strides, so they can safely be modified // copy strides, so they can safely be modified
if (c->sliceDir == 1) { if (c->sliceDir == 1) {
// slices go from top to bottom // slices go from top to bottom
int srcStride2[4]= {srcStride[0], srcStride[1], srcStride[2], srcStride[3]}; int srcStride2[4] = { srcStride[0], srcStride[1], srcStride[2],
int dstStride2[4]= {dstStride[0], dstStride[1], dstStride[2], dstStride[3]}; srcStride[3] };
int dstStride2[4] = { dstStride[0], dstStride[1], dstStride[2],
dstStride[3] };
reset_ptr(src2, c->srcFormat); reset_ptr(src2, c->srcFormat);
reset_ptr((const uint8_t **) dst2, c->dstFormat); reset_ptr((const uint8_t **) dst2, c->dstFormat);
@ -949,11 +999,14 @@ int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
if (srcSliceY + srcSliceH == c->srcH) if (srcSliceY + srcSliceH == c->srcH)
c->sliceDir = 0; c->sliceDir = 0;
return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, dstStride2); return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2,
dstStride2);
} else { } else {
// slices go from bottom to top => we flip the image internally // slices go from bottom to top => we flip the image internally
int srcStride2[4]= {-srcStride[0], -srcStride[1], -srcStride[2], -srcStride[3]}; int srcStride2[4] = { -srcStride[0], -srcStride[1], -srcStride[2],
int dstStride2[4]= {-dstStride[0], -dstStride[1], -dstStride[2], -dstStride[3]}; -srcStride[3] };
int dstStride2[4] = { -dstStride[0], -dstStride[1], -dstStride[2],
-dstStride[3] };
src2[0] += (srcSliceH - 1) * srcStride[0]; src2[0] += (srcSliceH - 1) * srcStride[0];
if (!usePal(c->srcFormat)) if (!usePal(c->srcFormat))
@ -972,12 +1025,14 @@ int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
if (!srcSliceY) if (!srcSliceY)
c->sliceDir = 0; c->sliceDir = 0;
return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, srcSliceH, dst2, dstStride2); return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH,
srcSliceH, dst2, dstStride2);
} }
} }
/* Convert the palette to the same packed 32-bit format as the palette */ /* Convert the palette to the same packed 32-bit format as the palette */
void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette) void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst,
int num_pixels, const uint8_t *palette)
{ {
int i; int i;
@ -986,7 +1041,8 @@ void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pix
} }
/* Palette format: ABCD -> dst format: ABC */ /* Palette format: ABCD -> dst format: ABC */
void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette) void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst,
int num_pixels, const uint8_t *palette)
{ {
int i; int i;