RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-25 08:10:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  Unscaled Planar RGB -> RGB support in swscale.

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-04 01:14:45 +02:00
commit 41a097aada
2 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libswscale/swscale_internal.h
View File

@ -681,6 +681,14 @@ const char *sws_format_name(enum PixelFormat format);
(av_pix_fmt_descriptors[x].nb_components >= 2 && \ (av_pix_fmt_descriptors[x].nb_components >= 2 && \
(av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR)) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR))
#define isPackedRGB(x) \
((av_pix_fmt_descriptors[x].flags & \
(PIX_FMT_PLANAR | PIX_FMT_RGB)) == PIX_FMT_RGB)
#define isPlanarRGB(x) \
((av_pix_fmt_descriptors[x].flags & \
(PIX_FMT_PLANAR | PIX_FMT_RGB)) == (PIX_FMT_PLANAR | PIX_FMT_RGB))
#define usePal(x) ((av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) || \ #define usePal(x) ((av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) || \
(av_pix_fmt_descriptors[x].flags & PIX_FMT_PSEUDOPAL) || \ (av_pix_fmt_descriptors[x].flags & PIX_FMT_PSEUDOPAL) || \
(x) == PIX_FMT_Y400A) (x) == PIX_FMT_Y400A)

76
libswscale/swscale_unscaled.c
View File

@ -412,7 +412,9 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],
return srcSliceH; return srcSliceH;
} }
static void gbr24ptopacked24(const uint8_t* src[], int srcStride[], uint8_t* dst, int dstStride, int srcSliceH, int width) static void gbr24ptopacked24(const uint8_t *src[], int srcStride[],
uint8_t *dst, int dstStride, int srcSliceH,
int width)
{ {
int x, h, i; int x, h, i;
for (h = 0; h < srcSliceH; h++) { for (h = 0; h < srcSliceH; h++) {
@ -428,7 +430,9 @@ static void gbr24ptopacked24(const uint8_t* src[], int srcStride[], uint8_t* dst
} }
} }
static void gbr24ptopacked32(const uint8_t* src[], int srcStride[], uint8_t* dst, int dstStride, int srcSliceH, int alpha_first, int width) static void gbr24ptopacked32(const uint8_t *src[], int srcStride[],
uint8_t *dst, int dstStride, int srcSliceH,
int alpha_first, int width)
{ {
int x, h, i; int x, h, i;
for (h = 0; h < srcSliceH; h++) { for (h = 0; h < srcSliceH; h++) {
@ -455,44 +459,56 @@ static void gbr24ptopacked32(const uint8_t* src[], int srcStride[], uint8_t* dst
} }
} }
static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarRgbToRgbWrapper(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 alpha_first = 0; int alpha_first = 0;
if (c->srcFormat != PIX_FMT_GBR24P) { if (c->srcFormat != PIX_FMT_GBRP) {
av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n",
av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); av_get_pix_fmt_name(c->srcFormat),
av_get_pix_fmt_name(c->dstFormat));
return srcSliceH; return srcSliceH;
} }
switch (c->dstFormat) { switch (c->dstFormat) {
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
gbr24ptopacked24((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, gbr24ptopacked24((const uint8_t *[]) { src[1], src[0], src[2] },
dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); (int []) { srcStride[1], srcStride[0], srcStride[2] },
break; dst[0] + srcSliceY * dstStride[0], dstStride[0],
srcSliceH, c->srcW);
break;
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
gbr24ptopacked24((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, gbr24ptopacked24((const uint8_t *[]) { src[2], src[0], src[1] },
dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); (int []) { srcStride[2], srcStride[0], srcStride[1] },
break; dst[0] + srcSliceY * dstStride[0], dstStride[0],
srcSliceH, c->srcW);
break;
case PIX_FMT_ARGB: case PIX_FMT_ARGB:
alpha_first = 1; alpha_first = 1;
case PIX_FMT_RGBA: case PIX_FMT_RGBA:
gbr24ptopacked32((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, gbr24ptopacked32((const uint8_t *[]) { src[2], src[0], src[1] },
dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); (int []) { srcStride[2], srcStride[0], srcStride[1] },
break; dst[0] + srcSliceY * dstStride[0], dstStride[0],
srcSliceH, alpha_first, c->srcW);
break;
case PIX_FMT_ABGR: case PIX_FMT_ABGR:
alpha_first = 1; alpha_first = 1;
case PIX_FMT_BGRA: case PIX_FMT_BGRA:
gbr24ptopacked32((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, gbr24ptopacked32((const uint8_t *[]) { src[1], src[0], src[2] },
dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); (int []) { srcStride[1], srcStride[0], srcStride[2] },
break; dst[0] + srcSliceY * dstStride[0], dstStride[0],
srcSliceH, alpha_first, c->srcW);
break;
default: default:
av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", av_log(c, AV_LOG_ERROR,
av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); "unsupported planar RGB conversion %s -> %s\n",
av_get_pix_fmt_name(c->srcFormat),
av_get_pix_fmt_name(c->dstFormat));
} }
return srcSliceH; return srcSliceH;
@ -897,7 +913,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
f == PIX_FMT_BGR24) f == PIX_FMT_BGR24)
if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat)) if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat))
c->swScale= planarRgbToRgbWrapper; c->swScale = planarRgbToRgbWrapper;
/* bswap 16 bits per pixel/component packed formats */ /* bswap 16 bits per pixel/component packed formats */
if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, PIX_FMT_BGR444) || if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, PIX_FMT_BGR444) ||