From a6b650118543e1580e872896d8976042b7c32d01 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 23 Aug 2013 18:50:53 +0200 Subject: [PATCH] ppc: cosmetics: Consistently format CPU flag detection invocations --- libavcodec/ppc/h264chroma_init.c | 5 +++-- libavcodec/ppc/h264dsp.c | 5 +++-- libavcodec/ppc/h264qpel.c | 5 +++-- libavcodec/ppc/hpeldsp_altivec.c | 23 ++++++++++++----------- libavcodec/ppc/mpegvideo_altivec.c | 5 +++-- libavcodec/ppc/vorbisdsp_altivec.c | 7 ++++--- libavcodec/ppc/vp3dsp_altivec.c | 9 +++++---- libswscale/ppc/yuv2yuv_altivec.c | 7 +++++-- 8 files changed, 38 insertions(+), 28 deletions(-) diff --git a/libavcodec/ppc/h264chroma_init.c b/libavcodec/ppc/h264chroma_init.c index f36d8e94bd..415a8df1ee 100644 --- a/libavcodec/ppc/h264chroma_init.c +++ b/libavcodec/ppc/h264chroma_init.c @@ -53,11 +53,12 @@ av_cold void ff_h264chroma_init_ppc(H264ChromaContext *c, int bit_depth) #if HAVE_ALTIVEC const int high_bit_depth = bit_depth > 8; - if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return; + if (!high_bit_depth) { c->put_h264_chroma_pixels_tab[0] = put_h264_chroma_mc8_altivec; c->avg_h264_chroma_pixels_tab[0] = avg_h264_chroma_mc8_altivec; } - } #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/ppc/h264dsp.c b/libavcodec/ppc/h264dsp.c index a46327f8be..df298dd21f 100644 --- a/libavcodec/ppc/h264dsp.c +++ b/libavcodec/ppc/h264dsp.c @@ -745,7 +745,9 @@ av_cold void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) { #if HAVE_ALTIVEC - if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return; + if (bit_depth == 8) { c->h264_idct_add = h264_idct_add_altivec; if (chroma_format_idc == 1) @@ -764,6 +766,5 @@ av_cold void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, c->biweight_h264_pixels_tab[0] = biweight_h264_pixels16_altivec; c->biweight_h264_pixels_tab[1] = biweight_h264_pixels8_altivec; } - } #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/ppc/h264qpel.c b/libavcodec/ppc/h264qpel.c index 113617c98f..f99c8f8126 100644 --- a/libavcodec/ppc/h264qpel.c +++ b/libavcodec/ppc/h264qpel.c @@ -288,7 +288,9 @@ av_cold void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth) #if HAVE_ALTIVEC const int high_bit_depth = bit_depth > 8; - if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return; + if (!high_bit_depth) { #define dspfunc(PFX, IDX, NUM) \ c->PFX ## _pixels_tab[IDX][ 0] = PFX ## NUM ## _mc00_altivec; \ @@ -312,6 +314,5 @@ av_cold void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth) dspfunc(avg_h264_qpel, 0, 16); #undef dspfunc } - } #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c index cbec12a071..d40c5d8cce 100644 --- a/libavcodec/ppc/hpeldsp_altivec.c +++ b/libavcodec/ppc/hpeldsp_altivec.c @@ -449,18 +449,19 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi av_cold void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags) { #if HAVE_ALTIVEC - if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { - c->avg_pixels_tab[0][0] = ff_avg_pixels16_altivec; - c->avg_pixels_tab[1][0] = avg_pixels8_altivec; - c->avg_pixels_tab[1][3] = avg_pixels8_xy2_altivec; + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return; - c->put_pixels_tab[0][0] = ff_put_pixels16_altivec; - c->put_pixels_tab[1][3] = put_pixels8_xy2_altivec; - c->put_pixels_tab[0][3] = put_pixels16_xy2_altivec; + c->avg_pixels_tab[0][0] = ff_avg_pixels16_altivec; + c->avg_pixels_tab[1][0] = avg_pixels8_altivec; + c->avg_pixels_tab[1][3] = avg_pixels8_xy2_altivec; - c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec; - c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_altivec; - c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_altivec; - } + c->put_pixels_tab[0][0] = ff_put_pixels16_altivec; + c->put_pixels_tab[1][3] = put_pixels8_xy2_altivec; + c->put_pixels_tab[0][3] = put_pixels16_xy2_altivec; + + c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec; + c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_altivec; + c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_altivec; #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 4ad24b98d8..3d74029b5a 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -118,10 +118,11 @@ static void dct_unquantize_h263_altivec(MpegEncContext *s, av_cold void ff_MPV_common_init_ppc(MpegEncContext *s) { #if HAVE_ALTIVEC - if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) return; + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return; if ((s->avctx->dct_algo == FF_DCT_AUTO) || - (s->avctx->dct_algo == FF_DCT_ALTIVEC)) { + (s->avctx->dct_algo == FF_DCT_ALTIVEC)) { s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec; s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec; } diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index 251be130a9..56a865d94e 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/libavcodec/ppc/vorbisdsp_altivec.c @@ -54,8 +54,9 @@ static void vorbis_inverse_coupling_altivec(float *mag, float *ang, av_cold void ff_vorbisdsp_init_ppc(VorbisDSPContext *c) { #if HAVE_ALTIVEC - if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { - c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec; - } + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return; + + c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec; #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c index 48436f3337..bf50c02822 100644 --- a/libavcodec/ppc/vp3dsp_altivec.c +++ b/libavcodec/ppc/vp3dsp_altivec.c @@ -180,9 +180,10 @@ static void vp3_idct_add_altivec(uint8_t *dst, int stride, int16_t block[64]) av_cold void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags) { #if HAVE_ALTIVEC - if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { - c->idct_put = vp3_idct_put_altivec; - c->idct_add = vp3_idct_add_altivec; - } + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return; + + c->idct_put = vp3_idct_put_altivec; + c->idct_add = vp3_idct_add_altivec; #endif } diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 3d483914c6..a8fa9c65f0 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -187,8 +187,11 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[], av_cold void ff_get_unscaled_swscale_ppc(SwsContext *c) { #if HAVE_ALTIVEC - if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) && - !(c->flags & SWS_BITEXACT) && c->srcFormat == AV_PIX_FMT_YUV420P) { + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return NULL; + + if (!(c->srcW & 15) && !(c->flags & SWS_BITEXACT) && + c->srcFormat == AV_PIX_FMT_YUV420P) { enum AVPixelFormat dstFormat = c->dstFormat; // unscaled YV12 -> packed YUV, we want speed