virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-02-07 13:35:49 +01:00
commit 60a0bc46cd
11 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/rv34dsp_init_arm.c
View File

@ -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();

2
libavcodec/arm/rv40dsp_init_arm.c
View File

@ -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();

5
libavcodec/rv30dsp.c
View File

@ -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);

4
libavcodec/rv34.c
View File

@ -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)

9
libavcodec/rv34dsp.c
View File

@ -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);
}

14
libavcodec/rv34dsp.h
View File

@ -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 */

10
libavcodec/rv40dsp.c
View File

@ -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);
}

4
libavcodec/x86/Makefile
View File

@ -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 \

2
libavcodec/x86/h264chroma_init.c
View File

@ -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
}

2
libavcodec/x86/rv34dsp_init.c
View File

@ -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();

2
libavcodec/x86/rv40dsp_init.c
View File

@ -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();