From 643e433bf7440740f9635f8ad89e8dfe52aa0785 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 27 Apr 2013 01:03:37 +0200 Subject: [PATCH 1/2] mpegaudiosp: More consistent names for ppc/x86 optimization files --- libavcodec/ppc/Makefile | 2 +- .../ppc/{mpegaudiodec_altivec.c => mpegaudiodsp_altivec.c} | 0 libavcodec/x86/Makefile | 2 +- libavcodec/x86/{mpegaudiodec.c => mpegaudiodsp.c} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename libavcodec/ppc/{mpegaudiodec_altivec.c => mpegaudiodsp_altivec.c} (100%) rename libavcodec/x86/{mpegaudiodec.c => mpegaudiodsp.c} (100%) diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index febbb0a231..bfd777f664 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -11,7 +11,7 @@ FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o ALTIVEC-OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o \ $(FFT-OBJS-yes) ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o -ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodec_altivec.o +ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodsp_altivec.o ALTIVEC-OBJS-$(CONFIG_MPEGVIDEO) += ppc/mpegvideo_altivec.o ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o ALTIVEC-OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o diff --git a/libavcodec/ppc/mpegaudiodec_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c similarity index 100% rename from libavcodec/ppc/mpegaudiodec_altivec.c rename to libavcodec/ppc/mpegaudiodsp_altivec.c diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index f6581f965b..a15d735733 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -13,7 +13,7 @@ OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel.o OBJS-$(CONFIG_HPELDSP) += x86/hpeldsp_init.o OBJS-$(CONFIG_LPC) += x86/lpc.o OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o -OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec.o +OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodsp.o OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodsp.c similarity index 100% rename from libavcodec/x86/mpegaudiodec.c rename to libavcodec/x86/mpegaudiodsp.c From 6b110d3a739c31602b59887ad65c67025df3f49d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 14 Apr 2013 14:42:24 +0200 Subject: [PATCH 2/2] ppc: More consistent names for H.264 optimizations files --- libavcodec/ppc/Makefile | 4 ++-- libavcodec/ppc/{h264_altivec.c => h264dsp.c} | 0 libavcodec/ppc/{h264_qpel.c => h264qpel.c} | 4 ++-- libavcodec/ppc/{h264_qpel_template.c => h264qpel_template.c} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename libavcodec/ppc/{h264_altivec.c => h264dsp.c} (100%) rename libavcodec/ppc/{h264_qpel.c => h264qpel.c} (99%) rename libavcodec/ppc/{h264_qpel_template.c => h264qpel_template.c} (100%) diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index bfd777f664..a7e1c87456 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -2,7 +2,7 @@ OBJS += ppc/dsputil_ppc.o \ ppc/videodsp_ppc.o \ OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o -OBJS-$(CONFIG_H264QPEL) += ppc/h264_qpel.o +OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o OBJS-$(CONFIG_HPELDSP) += ppc/hpeldsp_altivec.o OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o @@ -10,7 +10,7 @@ OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o ALTIVEC-OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o \ $(FFT-OBJS-yes) -ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o +ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodsp_altivec.o ALTIVEC-OBJS-$(CONFIG_MPEGVIDEO) += ppc/mpegvideo_altivec.o ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264dsp.c similarity index 100% rename from libavcodec/ppc/h264_altivec.c rename to libavcodec/ppc/h264dsp.c diff --git a/libavcodec/ppc/h264_qpel.c b/libavcodec/ppc/h264qpel.c similarity index 99% rename from libavcodec/ppc/h264_qpel.c rename to libavcodec/ppc/h264qpel.c index 9ee2c367fd..7700294bb3 100644 --- a/libavcodec/ppc/h264_qpel.c +++ b/libavcodec/ppc/h264qpel.c @@ -39,7 +39,7 @@ #define PREFIX_h264_qpel16_v_lowpass_num altivec_put_h264_qpel16_v_lowpass_num #define PREFIX_h264_qpel16_hv_lowpass_altivec put_h264_qpel16_hv_lowpass_altivec #define PREFIX_h264_qpel16_hv_lowpass_num altivec_put_h264_qpel16_hv_lowpass_num -#include "h264_qpel_template.c" +#include "h264qpel_template.c" #undef OP_U8_ALTIVEC #undef PREFIX_h264_qpel16_h_lowpass_altivec #undef PREFIX_h264_qpel16_h_lowpass_num @@ -55,7 +55,7 @@ #define PREFIX_h264_qpel16_v_lowpass_num altivec_avg_h264_qpel16_v_lowpass_num #define PREFIX_h264_qpel16_hv_lowpass_altivec avg_h264_qpel16_hv_lowpass_altivec #define PREFIX_h264_qpel16_hv_lowpass_num altivec_avg_h264_qpel16_hv_lowpass_num -#include "h264_qpel_template.c" +#include "h264qpel_template.c" #undef OP_U8_ALTIVEC #undef PREFIX_h264_qpel16_h_lowpass_altivec #undef PREFIX_h264_qpel16_h_lowpass_num diff --git a/libavcodec/ppc/h264_qpel_template.c b/libavcodec/ppc/h264qpel_template.c similarity index 100% rename from libavcodec/ppc/h264_qpel_template.c rename to libavcodec/ppc/h264qpel_template.c