diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 16:35:49 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 16:35:49 +0400 |
commit | 60a0bc46cdba5f13d557624d3448628328ad0fb0 (patch) | |
tree | 65788b23d15f155b742e5fd6d85e10c601f1d772 /libavcodec | |
parent | c4e394e46008c9e208f666d156f49f7ba500d73a (diff) | |
parent | a846dccb29d2bb0798af1d47d06100eda9ca87cc (diff) |
Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
h264chroma: x86: Fix building with yasm disabled
rv34: Drop now unnecessary dsputil dependencies
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/arm/rv34dsp_init_arm.c | 2 | ||||
-rw-r--r-- | libavcodec/arm/rv40dsp_init_arm.c | 2 | ||||
-rw-r--r-- | libavcodec/rv30dsp.c | 5 | ||||
-rw-r--r-- | libavcodec/rv34.c | 4 | ||||
-rw-r--r-- | libavcodec/rv34dsp.c | 9 | ||||
-rw-r--r-- | libavcodec/rv34dsp.h | 14 | ||||
-rw-r--r-- | libavcodec/rv40dsp.c | 10 | ||||
-rw-r--r-- | libavcodec/x86/Makefile | 4 | ||||
-rw-r--r-- | libavcodec/x86/h264chroma_init.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/rv34dsp_init.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 2 |
11 files changed, 30 insertions, 26 deletions
diff --git a/libavcodec/arm/rv34dsp_init_arm.c b/libavcodec/arm/rv34dsp_init_arm.c index 10ff64704b..8bfe90b3d3 100644 --- a/libavcodec/arm/rv34dsp_init_arm.c +++ b/libavcodec/arm/rv34dsp_init_arm.c @@ -32,7 +32,7 @@ void ff_rv34_inv_transform_noround_dc_neon(int16_t *block); void ff_rv34_idct_add_neon(uint8_t *dst, ptrdiff_t stride, int16_t *block); void ff_rv34_idct_dc_add_neon(uint8_t *dst, ptrdiff_t stride, int dc); -av_cold void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv34dsp_init_arm(RV34DSPContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/arm/rv40dsp_init_arm.c b/libavcodec/arm/rv40dsp_init_arm.c index 8fd0b9f6e3..59ef10b24b 100644 --- a/libavcodec/arm/rv40dsp_init_arm.c +++ b/libavcodec/arm/rv40dsp_init_arm.c @@ -139,7 +139,7 @@ static av_cold void ff_rv40dsp_init_neon(RV34DSPContext *c) c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon; } -av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c index 2f54a5fbe8..2a667e31f4 100644 --- a/libavcodec/rv30dsp.c +++ b/libavcodec/rv30dsp.c @@ -254,11 +254,12 @@ RV30_MC(put_, 16) RV30_MC(avg_, 8) RV30_MC(avg_, 16) -av_cold void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv30dsp_init(RV34DSPContext *c) +{ H264ChromaContext h264chroma; H264QpelContext qpel; - ff_rv34dsp_init(c, dsp); + ff_rv34dsp_init(c); ff_h264chroma_init(&h264chroma, 8); ff_h264qpel_init(&qpel, 8); diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 7a9778a101..eb431ee1e2 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1495,11 +1495,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) #if CONFIG_RV30_DECODER if (avctx->codec_id == AV_CODEC_ID_RV30) - ff_rv30dsp_init(&r->rdsp, &r->s.dsp); + ff_rv30dsp_init(&r->rdsp); #endif #if CONFIG_RV40_DECODER if (avctx->codec_id == AV_CODEC_ID_RV40) - ff_rv40dsp_init(&r->rdsp, &r->s.dsp); + ff_rv40dsp_init(&r->rdsp); #endif if ((ret = rv34_decoder_alloc(r)) < 0) diff --git a/libavcodec/rv34dsp.c b/libavcodec/rv34dsp.c index 676e823787..7234ee808b 100644 --- a/libavcodec/rv34dsp.c +++ b/libavcodec/rv34dsp.c @@ -24,7 +24,7 @@ * @file * RV30/40 decoder common dsp functions */ -#include "dsputil.h" + #include "rv34dsp.h" #include "libavutil/common.h" @@ -128,7 +128,8 @@ static void rv34_inv_transform_dc_noround_c(int16_t *block) /** @} */ // transform -av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv34dsp_init(RV34DSPContext *c) +{ c->rv34_inv_transform = rv34_inv_transform_noround_c; c->rv34_inv_transform_dc = rv34_inv_transform_dc_noround_c; @@ -136,7 +137,7 @@ av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) { c->rv34_idct_dc_add = rv34_idct_dc_add_c; if (ARCH_ARM) - ff_rv34dsp_init_arm(c, dsp); + ff_rv34dsp_init_arm(c); if (ARCH_X86) - ff_rv34dsp_init_x86(c, dsp); + ff_rv34dsp_init_x86(c); } diff --git a/libavcodec/rv34dsp.h b/libavcodec/rv34dsp.h index 6d2f8345cc..c5d4e39f4f 100644 --- a/libavcodec/rv34dsp.h +++ b/libavcodec/rv34dsp.h @@ -74,14 +74,14 @@ typedef struct RV34DSPContext { rv40_loop_filter_strength_func rv40_loop_filter_strength[2]; } RV34DSPContext; -void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp); -void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp); -void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp); +void ff_rv30dsp_init(RV34DSPContext *c); +void ff_rv34dsp_init(RV34DSPContext *c); +void ff_rv40dsp_init(RV34DSPContext *c); -void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext *dsp); -void ff_rv34dsp_init_x86(RV34DSPContext *c, DSPContext *dsp); +void ff_rv34dsp_init_arm(RV34DSPContext *c); +void ff_rv34dsp_init_x86(RV34DSPContext *c); -void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp); -void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp); +void ff_rv40dsp_init_x86(RV34DSPContext *c); +void ff_rv40dsp_init_arm(RV34DSPContext *c); #endif /* AVCODEC_RV34DSP_H */ diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 99b458c8f0..cea4552a51 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "h264qpel.h" #include "rv34dsp.h" #include "libavutil/avassert.h" @@ -519,10 +518,11 @@ static int rv40_v_loop_filter_strength(uint8_t *src, ptrdiff_t stride, return rv40_loop_filter_strength(src, 1, stride, beta, beta2, edge, p1, q1); } -av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv40dsp_init(RV34DSPContext *c) +{ H264QpelContext qpel; - ff_rv34dsp_init(c, dsp); + ff_rv34dsp_init(c); ff_h264qpel_init(&qpel, 8); c->put_pixels_tab[0][ 0] = qpel.put_h264_qpel_pixels_tab[0][0]; @@ -608,7 +608,7 @@ av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { c->rv40_loop_filter_strength[1] = rv40_v_loop_filter_strength; if (ARCH_X86) - ff_rv40dsp_init_x86(c, dsp); + ff_rv40dsp_init_x86(c); if (ARCH_ARM) - ff_rv40dsp_init_arm(c, dsp); + ff_rv40dsp_init_arm(c); } diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 111fdedf47..30264d78c6 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,6 +6,7 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_GPL) += x86/idct_mmx.o +OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel.o @@ -51,8 +52,7 @@ YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o x86/dwt_yasm.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o -YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o \ - x86/h264_chromamc.o \ +YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ x86/h264_chromamc_10bit.o YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \ x86/h264_deblock_10bit.o \ diff --git a/libavcodec/x86/h264chroma_init.c b/libavcodec/x86/h264chroma_init.c index b9783d6693..6fc9a436d3 100644 --- a/libavcodec/x86/h264chroma_init.c +++ b/libavcodec/x86/h264chroma_init.c @@ -68,6 +68,7 @@ CHROMA_MC(avg, 8, 10, avx) void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) { +#if HAVE_YASM int high_bit_depth = bit_depth > 8; int mm_flags = av_get_cpu_flags(); @@ -113,4 +114,5 @@ void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx; c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx; } +#endif } diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index a93096791b..70f86299bb 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -31,7 +31,7 @@ void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, int16_t *block); -av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) +av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c) { int mm_flags = av_get_cpu_flags(); diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 21cde04c00..51e98520cf 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -188,7 +188,7 @@ QPEL_FUNCS_SET (OP, 3, 2, OPT) #endif /* HAVE_YASM */ -av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) { #if HAVE_YASM int mm_flags = av_get_cpu_flags(); |