diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 22:54:00 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 23:06:57 +0400 |
commit | ac627b3d38d370027406c93c2dcaac0b1712a7d4 (patch) | |
tree | d2d1f39e96a75d864681349c4fbd37692e558683 /libswscale/ppc | |
parent | 89715a3cf187c271f7cf4c230b23cd6f6d638e32 (diff) | |
parent | 716d413c13981da15323c7a3821860536eefdbbb (diff) |
Merge commit '716d413c13981da15323c7a3821860536eefdbbb'
* commit '716d413c13981da15323c7a3821860536eefdbbb':
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Conflicts:
doc/examples/muxing.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
libavcodec/8bps.c
libavcodec/aasc.c
libavcodec/aura.c
libavcodec/avcodec.h
libavcodec/avs.c
libavcodec/bfi.c
libavcodec/bmp.c
libavcodec/bmpenc.c
libavcodec/c93.c
libavcodec/cscd.c
libavcodec/cyuv.c
libavcodec/dpx.c
libavcodec/dpxenc.c
libavcodec/eatgv.c
libavcodec/escape124.c
libavcodec/ffv1.c
libavcodec/flashsv.c
libavcodec/fraps.c
libavcodec/h264.c
libavcodec/huffyuv.c
libavcodec/iff.c
libavcodec/imgconvert.c
libavcodec/indeo3.c
libavcodec/kmvc.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/ljpegenc.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
libavcodec/motionpixels.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo_enc.c
libavcodec/pamenc.c
libavcodec/pcxenc.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/ptx.c
libavcodec/qdrw.c
libavcodec/qpeg.c
libavcodec/qtrleenc.c
libavcodec/raw.c
libavcodec/rawdec.c
libavcodec/rl2.c
libavcodec/sgidec.c
libavcodec/sgienc.c
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/sunrast.c
libavcodec/targa.c
libavcodec/targaenc.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/tmv.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/vb.c
libavcodec/vp3.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/xwddec.c
libavcodec/xwdenc.c
libavcodec/yop.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/formats.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_hflip.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/movenc.c
libavformat/mxf.h
libavformat/utils.c
libavformat/yuv4mpeg.c
libavutil/imgutils.c
libavutil/pixdesc.c
libswscale/input.c
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c
libswscale/x86/yuv2rgb_template.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/ppc')
-rw-r--r-- | libswscale/ppc/swscale_altivec.c | 16 | ||||
-rw-r--r-- | libswscale/ppc/yuv2rgb_altivec.c | 64 | ||||
-rw-r--r-- | libswscale/ppc/yuv2yuv_altivec.c | 8 |
3 files changed, 44 insertions, 44 deletions
diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index e013f03c3b..9ca2868cc8 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -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; } diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index ade134d779..a8501d9a10 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -548,41 +548,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; @@ -631,7 +631,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; @@ -706,22 +706,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: @@ -798,22 +798,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: @@ -846,9 +846,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); diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index af78782b54..60d50a7baa 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -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; } } |