Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mips: rename mipsdspr1 to mipsdsp

Browse Source 
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/162/merge
Vicente Olivert Riera 9 years ago committed by Michael Niedermayer
parent eb3628d87f
commit a27401a05b
11 changed files with 27 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Changelog
  2. 2
      Makefile
  3. 2
      arch.mak
  4. 28
      configure
  5. 2
      libavcodec/aacenc.c
  6. 4
      libavcodec/mips/Makefile
  7. 4
      libavcodec/mips/ac3dsp_mips.c
  8. 2
      libavcodec/mips/mpegaudiodsp_mips_fixed.c
  9. 4
      libavcodec/mpegaudiodec_template.c
  10. 2
      libavcodec/mpegaudiodsp.c
  11. 2
      libavcodec/mpegaudiodsp.h

1
Changelog
Unescape View File

@ -39,6 +39,7 @@ version <next>:
- support encoding 16-bit RLE SGI images
- apulsator filter
- sidechaingate audio filter
- mipsdspr1 option has been renamed to mipsdsp
version 2.8:

2
Makefile
Unescape View File

@ -85,7 +85,7 @@ SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \
ALTIVEC-OBJS MMX-OBJS YASM-OBJS \
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MSA-OBJS \
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
define RESET

2
arch.mak
Unescape View File

@ -5,7 +5,7 @@ OBJS-$(HAVE_VFP) += $(VFP-OBJS) $(VFP-OBJS-yes)
OBJS-$(HAVE_NEON) += $(NEON-OBJS) $(NEON-OBJS-yes)
OBJS-$(HAVE_MIPSFPU) += $(MIPSFPU-OBJS) $(MIPSFPU-OBJS-yes)
OBJS-$(HAVE_MIPSDSPR1) += $(MIPSDSPR1-OBJS) $(MIPSDSPR1-OBJS-yes)
OBJS-$(HAVE_MIPSDSP) += $(MIPSDSP-OBJS) $(MIPSDSP-OBJS-yes)
OBJS-$(HAVE_MIPSDSPR2) += $(MIPSDSPR2-OBJS) $(MIPSDSPR2-OBJS-yes)
OBJS-$(HAVE_MSA) += $(MSA-OBJS) $(MSA-OBJS-yes)
OBJS-$(HAVE_MMI) += $(MMI-OBJS) $(MMI-OBJS-yes)

28
configure vendored
Unescape View File

@ -384,7 +384,7 @@ Optimization options (experts only):
--disable-yasm disable use of nasm/yasm assembly
--disable-mips32r5 disable MIPS32R5 optimizations
--disable-mips64r6 disable MIPS64R6 optimizations
--disable-mipsdspr1 disable MIPS DSP ASE R1 optimizations
--disable-mipsdsp disable MIPS DSP ASE R1 optimizations
--disable-mipsdspr2 disable MIPS DSP ASE R2 optimizations
--disable-msa disable MSA optimizations
--disable-mipsfpu disable floating point MIPS optimizations
@ -1633,7 +1633,7 @@ ARCH_EXT_LIST_MIPS="
mips32r2
mips32r5
mips64r6
mipsdspr1
mipsdsp
mipsdspr2
msa
"
@ -2106,7 +2106,7 @@ setend_deps="arm"
map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
mipsfpu_deps="mips"
mipsdspr1_deps="mips"
mipsdsp_deps="mips"
mipsdspr2_deps="mips"
mips32r2_deps="mips"
mips32r5_deps="mips"
@ -4068,14 +4068,14 @@ elif enabled mips; then
disable mips32r5
disable mips64r6
disable mipsfpu
disable mipsdspr1
disable mipsdsp
disable mipsdspr2
disable msa
;;
24kf*)
disable mips32r5
disable mips64r6
disable mipsdspr1
disable mipsdsp
disable mipsdspr2
disable msa
;;
@ -4105,14 +4105,14 @@ elif enabled mips; then
;;
p5600)
disable mips64r6
disable mipsdspr1
disable mipsdsp
disable mipsdspr2
check_cflags "-mtune=p5600"
;;
i6400)
disable mips32r5
disable mipsdspr1
disable mipsdsp
disable mipsdspr2
disable mipsfpu
@ -4124,7 +4124,7 @@ elif enabled mips; then
disable mips32r2
disable mips32r5
disable mips64r6
disable mipsdspr1
disable mipsdsp
disable mipsdspr2
disable msa
enable local_aligned_8 local_aligned_16 local_aligned_32
@ -4156,7 +4156,7 @@ elif enabled mips; then
disable mips32r2
disable mips32r5
disable mips64r6
disable mipsdspr1
disable mipsdsp
disable mipsdspr2
disable msa
;;
@ -4952,13 +4952,13 @@ elif enabled mips; then
enabled mmi && check_inline_asm mmi '"punpcklhw $f0, $f0, $f0"'
# Enable minimum ISA based on selected options
if enabled mips64 && (enabled mipsdspr1 || enabled mipsdspr2); then
if enabled mips64 && (enabled mipsdsp || enabled mipsdspr2); then
add_cflags "-mips64r2"
add_asflags "-mips64r2"
elif enabled mips64 && enabled mipsfpu && disabled loongson2 && disabled loongson3; then
add_cflags "-mips64"
add_asflags "-mips64"
elif enabled mipsdspr1 || enabled mipsdspr2; then
elif enabled mipsdsp || enabled mipsdspr2; then
add_cflags "-mips32r2 -mfp32"
add_asflags "-mips32r2 -mfp32"
elif enabled mips32r5 || enabled mips64r6; then
@ -4972,8 +4972,8 @@ elif enabled mips; then
enabled mips64r6 && check_cflags "-mips64r6 -msched-weight -mload-store-pairs -funroll-loops" &&
check_ldflags "-mips64r6" &&
check_inline_asm mips64r6 '"aui $t0, $t1, 1"'
enabled mipsdspr1 && add_cflags "-mdsp" && add_asflags "-mdsp" &&
check_inline_asm mipsdspr1 '"addu.qb $t0, $t1, $t2"'
enabled mipsdsp && add_cflags "-mdsp" && add_asflags "-mdsp" &&
check_inline_asm mipsdsp '"addu.qb $t0, $t1, $t2"'
enabled mipsdspr2 && add_cflags "-mdspr2" && add_asflags "-mdspr2" &&
check_inline_asm mipsdspr2 '"absq_s.qb $t0, $t1"'
enabled mipsfpu && add_cflags "-mhard-float" && add_asflags "-mhard-float" &&
@ -6051,7 +6051,7 @@ if enabled mips; then
echo "MIPS FPU enabled ${mipsfpu-no}"
echo "MIPS32R5 enabled ${mips32r5-no}"
echo "MIPS64R6 enabled ${mips64r6-no}"
echo "MIPS DSP R1 enabled ${mipsdspr1-no}"
echo "MIPS DSP R1 enabled ${mipsdsp-no}"
echo "MIPS DSP R2 enabled ${mipsdspr2-no}"
echo "MIPS MSA enabled ${msa-no}"
echo "LOONGSON MMI enabled ${mmi-no}"

2
libavcodec/aacenc.c
Unescape View File

@ -991,7 +991,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
s->psypp = ff_psy_preprocess_init(avctx);
ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON);
if (HAVE_MIPSDSPR1)
if (HAVE_MIPSDSP)
ff_aac_coder_init_mips(s);
if ((ret = ff_thread_once(&aac_table_init, &aac_encode_init_tables)) != 0)

4
libavcodec/mips/Makefile
Unescape View File

@ -8,7 +8,7 @@ MIPSFPU-OBJS-$(CONFIG_AMRWB_DECODER) += mips/acelp_filters_mips.o \
mips/celp_math_mips.o \
mips/acelp_vectors_mips.o
MIPSFPU-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_float.o
MIPSDSPR1-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_fixed.o
MIPSDSP-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_fixed.o
MIPSFPU-OBJS-$(CONFIG_FFT) += mips/fft_mips.o
MIPSFPU-OBJS-$(CONFIG_FMTCONVERT) += mips/fmtconvert_mips.o
OBJS-$(CONFIG_AC3DSP) += mips/ac3dsp_mips.o
@ -16,7 +16,7 @@ OBJS-$(CONFIG_AAC_DECODER) += mips/aacdec_mips.o \
mips/aacsbr_mips.o \
mips/sbrdsp_mips.o \
mips/aacpsdsp_mips.o
MIPSDSPR1-OBJS-$(CONFIG_AAC_ENCODER) += mips/aaccoder_mips.o
MIPSDSP-OBJS-$(CONFIG_AAC_ENCODER) += mips/aaccoder_mips.o
MIPSFPU-OBJS-$(CONFIG_AAC_ENCODER) += mips/iirfilter_mips.o
OBJS-$(CONFIG_HEVC_DECODER) += mips/hevcdsp_init_mips.o \
mips/hevcpred_init_mips.o

4
libavcodec/mips/ac3dsp_mips.c
Unescape View File

@ -59,7 +59,7 @@
#include "libavutil/mips/asmdefs.h"
#if HAVE_INLINE_ASM
#if HAVE_MIPSDSPR1
#if HAVE_MIPSDSP
static void ac3_bit_alloc_calc_bap_mips(int16_t *mask, int16_t *psd,
int start, int end,
int snr_offset, int floor,
@ -400,7 +400,7 @@ static void ac3_downmix_mips(float **samples, float (*matrix)[2],
void ff_ac3dsp_init_mips(AC3DSPContext *c, int bit_exact) {
#if HAVE_INLINE_ASM
#if HAVE_MIPSDSPR1
#if HAVE_MIPSDSP
c->bit_alloc_calc_bap = ac3_bit_alloc_calc_bap_mips;
c->update_bap_counts = ac3_update_bap_counts_mips;
#endif

2
libavcodec/mips/mpegaudiodsp_mips_fixed.c
Unescape View File

@ -901,7 +901,7 @@ static void ff_imdct36_blocks_mips_fixed(int *out, int *buf, int *in,
}
}
void ff_mpadsp_init_mipsdspr1(MPADSPContext *s)
void ff_mpadsp_init_mipsdsp(MPADSPContext *s)
{
s->apply_window_fixed = ff_mpadsp_apply_window_mips_fixed;
s->imdct36_blocks_fixed = ff_imdct36_blocks_mips_fixed;

4
libavcodec/mpegaudiodec_template.c
Unescape View File

@ -1172,9 +1172,9 @@ found2:
# include "mips/compute_antialias_float.h"
#endif /* HAVE_MIPSFPU */
#else
#if HAVE_MIPSDSPR1
#if HAVE_MIPSDSP
# include "mips/compute_antialias_fixed.h"
#endif /* HAVE_MIPSDSPR1 */
#endif /* HAVE_MIPSDSP */
#endif /* USE_FLOATS */
#ifndef compute_antialias

2
libavcodec/mpegaudiodsp.c
Unescape View File

@ -46,5 +46,5 @@ av_cold void ff_mpadsp_init(MPADSPContext *s)
if (ARCH_PPC) ff_mpadsp_init_ppc(s);
if (ARCH_X86) ff_mpadsp_init_x86(s);
if (HAVE_MIPSFPU) ff_mpadsp_init_mipsfpu(s);
if (HAVE_MIPSDSPR1) ff_mpadsp_init_mipsdspr1(s);
if (HAVE_MIPSDSP) ff_mpadsp_init_mipsdsp(s);
}

2
libavcodec/mpegaudiodsp.h
Unescape View File

@ -60,7 +60,7 @@ void ff_mpadsp_init_arm(MPADSPContext *s);
void ff_mpadsp_init_ppc(MPADSPContext *s);
void ff_mpadsp_init_x86(MPADSPContext *s);
void ff_mpadsp_init_mipsfpu(MPADSPContext *s);
void ff_mpadsp_init_mipsdspr1(MPADSPContext *s);
void ff_mpadsp_init_mipsdsp(MPADSPContext *s);
void ff_mpa_synth_init_float(float *window);
void ff_mpa_synth_init_fixed(int32_t *window);

Write Preview
Loading…
Cancel
Save