highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Browse Source
This commit is contained in:
Anton Khirnov
2012-10-06 12:10:34 +02:00
parent 78071a1420
commit 716d413c13
296 changed files with 2487 additions and 2486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libswscale/ppc/swscale_altivec.c
View File

@@ -287,7 +287,7 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
av_cold void ff_sws_init_swScale_altivec(SwsContext *c)
{
enum PixelFormat dstFormat = c->dstFormat;
enum AVPixelFormat dstFormat = c->dstFormat;
if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
return;
@@ -296,7 +296,7 @@ av_cold void ff_sws_init_swScale_altivec(SwsContext *c)
c->hyScale = c->hcScale = hScale_altivec_real;
}
if (!is16BPS(dstFormat) && !is9_OR_10BPS(dstFormat) &&
dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21 &&
dstFormat != AV_PIX_FMT_NV12 && dstFormat != AV_PIX_FMT_NV21 &&
!c->alpPixBuf) {
c->yuv2planeX = yuv2planeX_altivec;
}
@@ -305,22 +305,22 @@ av_cold void ff_sws_init_swScale_altivec(SwsContext *c)
* match what's found in the body of ff_yuv2packedX_altivec() */
if (!(c->flags & (SWS_BITEXACT | SWS_FULL_CHR_H_INT)) && !c->alpPixBuf) {
switch (c->dstFormat) {
case PIX_FMT_ABGR:
case AV_PIX_FMT_ABGR:
c->yuv2packedX = ff_yuv2abgr_X_altivec;
break;
case PIX_FMT_BGRA:
case AV_PIX_FMT_BGRA:
c->yuv2packedX = ff_yuv2bgra_X_altivec;
break;
case PIX_FMT_ARGB:
case AV_PIX_FMT_ARGB:
c->yuv2packedX = ff_yuv2argb_X_altivec;
break;
case PIX_FMT_RGBA:
case AV_PIX_FMT_RGBA:
c->yuv2packedX = ff_yuv2rgba_X_altivec;
break;
case PIX_FMT_BGR24:
case AV_PIX_FMT_BGR24:
c->yuv2packedX = ff_yuv2bgr24_X_altivec;
break;
case PIX_FMT_RGB24:
case AV_PIX_FMT_RGB24:
c->yuv2packedX = ff_yuv2rgb24_X_altivec;
break;
}

64
libswscale/ppc/yuv2rgb_altivec.c
View File

@@ -552,41 +552,41 @@ av_cold SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c)
return NULL;
switch (c->srcFormat) {
case PIX_FMT_YUV410P:
case PIX_FMT_YUV420P:
case AV_PIX_FMT_YUV410P:
case AV_PIX_FMT_YUV420P:
/*case IMGFMT_CLPL: ??? */
case PIX_FMT_GRAY8:
case PIX_FMT_NV12:
case PIX_FMT_NV21:
case AV_PIX_FMT_GRAY8:
case AV_PIX_FMT_NV12:
case AV_PIX_FMT_NV21:
if ((c->srcH & 0x1) != 0)
return NULL;
switch (c->dstFormat) {
case PIX_FMT_RGB24:
case AV_PIX_FMT_RGB24:
av_log(c, AV_LOG_WARNING, "ALTIVEC: Color Space RGB24\n");
return altivec_yuv2_rgb24;
case PIX_FMT_BGR24:
case AV_PIX_FMT_BGR24:
av_log(c, AV_LOG_WARNING, "ALTIVEC: Color Space BGR24\n");
return altivec_yuv2_bgr24;
case PIX_FMT_ARGB:
case AV_PIX_FMT_ARGB:
av_log(c, AV_LOG_WARNING, "ALTIVEC: Color Space ARGB\n");
return altivec_yuv2_argb;
case PIX_FMT_ABGR:
case AV_PIX_FMT_ABGR:
av_log(c, AV_LOG_WARNING, "ALTIVEC: Color Space ABGR\n");
return altivec_yuv2_abgr;
case PIX_FMT_RGBA:
case AV_PIX_FMT_RGBA:
av_log(c, AV_LOG_WARNING, "ALTIVEC: Color Space RGBA\n");
return altivec_yuv2_rgba;
case PIX_FMT_BGRA:
case AV_PIX_FMT_BGRA:
av_log(c, AV_LOG_WARNING, "ALTIVEC: Color Space BGRA\n");
return altivec_yuv2_bgra;
default: return NULL;
}
break;
case PIX_FMT_UYVY422:
case AV_PIX_FMT_UYVY422:
switch (c->dstFormat) {
case PIX_FMT_BGR32:
case AV_PIX_FMT_BGR32:
av_log(c, AV_LOG_WARNING, "ALTIVEC: Color Space UYVY -> RGB32\n");
return altivec_uyvy_rgb32;
default: return NULL;
@@ -635,7 +635,7 @@ static av_always_inline void ff_yuv2packedX_altivec(SwsContext *c,
const int16_t **alpSrc,
uint8_t *dest,
int dstW, int dstY,
enum PixelFormat target)
enum AVPixelFormat target)
{
int i, j;
vector signed short X, X0, X1, Y0, U0, V0, Y1, U1, V1, U, V;
@@ -710,22 +710,22 @@ static av_always_inline void ff_yuv2packedX_altivec(SwsContext *c,
B = vec_packclp(B0, B1);
switch (target) {
case PIX_FMT_ABGR:
case AV_PIX_FMT_ABGR:
out_abgr(R, G, B, out);
break;
case PIX_FMT_BGRA:
case AV_PIX_FMT_BGRA:
out_bgra(R, G, B, out);
break;
case PIX_FMT_RGBA:
case AV_PIX_FMT_RGBA:
out_rgba(R, G, B, out);
break;
case PIX_FMT_ARGB:
case AV_PIX_FMT_ARGB:
out_argb(R, G, B, out);
break;
case PIX_FMT_RGB24:
case AV_PIX_FMT_RGB24:
out_rgb24(R, G, B, out);
break;
case PIX_FMT_BGR24:
case AV_PIX_FMT_BGR24:
out_bgr24(R, G, B, out);
break;
default:
@@ -802,22 +802,22 @@ static av_always_inline void ff_yuv2packedX_altivec(SwsContext *c,
nout = (vector unsigned char *) scratch;
switch (target) {
case PIX_FMT_ABGR:
case AV_PIX_FMT_ABGR:
out_abgr(R, G, B, nout);
break;
case PIX_FMT_BGRA:
case AV_PIX_FMT_BGRA:
out_bgra(R, G, B, nout);
break;
case PIX_FMT_RGBA:
case AV_PIX_FMT_RGBA:
out_rgba(R, G, B, nout);
break;
case PIX_FMT_ARGB:
case AV_PIX_FMT_ARGB:
out_argb(R, G, B, nout);
break;
case PIX_FMT_RGB24:
case AV_PIX_FMT_RGB24:
out_rgb24(R, G, B, nout);
break;
case PIX_FMT_BGR24:
case AV_PIX_FMT_BGR24:
out_bgr24(R, G, B, nout);
break;
default:
@@ -850,9 +850,9 @@ void ff_yuv2 ## suffix ## _X_altivec(SwsContext *c, \
dest, dstW, dstY, pixfmt); \
}
YUV2PACKEDX_WRAPPER(abgr, PIX_FMT_ABGR);
YUV2PACKEDX_WRAPPER(bgra, PIX_FMT_BGRA);
YUV2PACKEDX_WRAPPER(argb, PIX_FMT_ARGB);
YUV2PACKEDX_WRAPPER(rgba, PIX_FMT_RGBA);
YUV2PACKEDX_WRAPPER(rgb24, PIX_FMT_RGB24);
YUV2PACKEDX_WRAPPER(bgr24, PIX_FMT_BGR24);
YUV2PACKEDX_WRAPPER(abgr, AV_PIX_FMT_ABGR);
YUV2PACKEDX_WRAPPER(bgra, AV_PIX_FMT_BGRA);
YUV2PACKEDX_WRAPPER(argb, AV_PIX_FMT_ARGB);
YUV2PACKEDX_WRAPPER(rgba, AV_PIX_FMT_RGBA);
YUV2PACKEDX_WRAPPER(rgb24, AV_PIX_FMT_RGB24);
YUV2PACKEDX_WRAPPER(bgr24, AV_PIX_FMT_BGR24);

8
libswscale/ppc/yuv2yuv_altivec.c
View File

@@ -182,13 +182,13 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[],
void ff_swscale_get_unscaled_altivec(SwsContext *c)
{
if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) &&
!(c->flags & SWS_BITEXACT) && c->srcFormat == PIX_FMT_YUV420P) {
enum PixelFormat dstFormat = c->dstFormat;
!(c->flags & SWS_BITEXACT) && c->srcFormat == AV_PIX_FMT_YUV420P) {
enum AVPixelFormat dstFormat = c->dstFormat;
// unscaled YV12 -> packed YUV, we want speed
if (dstFormat == PIX_FMT_YUYV422)
if (dstFormat == AV_PIX_FMT_YUYV422)
c->swScale = yv12toyuy2_unscaled_altivec;
else if (dstFormat == PIX_FMT_UYVY422)
else if (dstFormat == AV_PIX_FMT_UYVY422)
c->swScale = yv12touyvy_unscaled_altivec;
}
}