You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
141 lines
5.0 KiB
141 lines
5.0 KiB
From 875ba2333340c2e13af370832e49c9371ffb0f91 Mon Sep 17 00:00:00 2001
|
|
From: Rosen Penev <rosenp@gmail.com>
|
|
Date: Sun, 5 Apr 2020 20:37:10 -0700
|
|
Subject: [PATCH] avcodec/aacdec: fix compilation under soft float MIPS
|
|
|
|
Place HAVE_MIPSFPU further up so that functions that use floating point
|
|
ASM are defined away. Otherwise compilation failures result when soft
|
|
float in enabled on the toolchain.
|
|
|
|
Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
|
---
|
|
libavcodec/mips/aacdec_mips.c | 4 ++--
|
|
libavcodec/mips/aacpsdsp_mips.c | 4 ++--
|
|
libavcodec/mips/aacsbr_mips.c | 4 ++--
|
|
libavcodec/mips/sbrdsp_mips.c | 4 ++--
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/libavcodec/mips/aacdec_mips.c b/libavcodec/mips/aacdec_mips.c
|
|
index 01a2b3087ba..8e306529351 100644
|
|
--- a/libavcodec/mips/aacdec_mips.c
|
|
+++ b/libavcodec/mips/aacdec_mips.c
|
|
@@ -59,6 +59,7 @@
|
|
#include "libavutil/mips/asmdefs.h"
|
|
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
static av_always_inline void float_copy(float *dst, const float *src, int count)
|
|
{
|
|
// Copy 'count' floats from src to dst
|
|
@@ -282,7 +283,6 @@ static void apply_ltp_mips(AACContext *ac, SingleChannelElement *sce)
|
|
}
|
|
}
|
|
|
|
-#if HAVE_MIPSFPU
|
|
static av_always_inline void fmul_and_reverse(float *dst, const float *src0, const float *src1, int count)
|
|
{
|
|
/* Multiply 'count' floats in src0 by src1 and store the results in dst in reverse */
|
|
@@ -433,9 +433,9 @@ static void update_ltp_mips(AACContext *ac, SingleChannelElement *sce)
|
|
void ff_aacdec_init_mips(AACContext *c)
|
|
{
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
c->imdct_and_windowing = imdct_and_windowing_mips;
|
|
c->apply_ltp = apply_ltp_mips;
|
|
-#if HAVE_MIPSFPU
|
|
c->update_ltp = update_ltp_mips;
|
|
#endif /* HAVE_MIPSFPU */
|
|
#endif /* HAVE_INLINE_ASM */
|
|
diff --git a/libavcodec/mips/aacpsdsp_mips.c b/libavcodec/mips/aacpsdsp_mips.c
|
|
index 83fdc2f9dbd..ef47e31a9ea 100644
|
|
--- a/libavcodec/mips/aacpsdsp_mips.c
|
|
+++ b/libavcodec/mips/aacpsdsp_mips.c
|
|
@@ -57,6 +57,7 @@
|
|
#include "libavutil/mips/asmdefs.h"
|
|
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
static void ps_hybrid_analysis_ileave_mips(float (*out)[32][2], float L[2][38][64],
|
|
int i, int len)
|
|
{
|
|
@@ -187,7 +188,6 @@ static void ps_hybrid_synthesis_deint_mips(float out[2][38][64],
|
|
}
|
|
}
|
|
|
|
-#if HAVE_MIPSFPU
|
|
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
|
|
static void ps_add_squares_mips(float *dst, const float (*src)[2], int n)
|
|
{
|
|
@@ -450,9 +450,9 @@ static void ps_stereo_interpolate_mips(float (*l)[2], float (*r)[2],
|
|
void ff_psdsp_init_mips(PSDSPContext *s)
|
|
{
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
s->hybrid_analysis_ileave = ps_hybrid_analysis_ileave_mips;
|
|
s->hybrid_synthesis_deint = ps_hybrid_synthesis_deint_mips;
|
|
-#if HAVE_MIPSFPU
|
|
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
|
|
s->add_squares = ps_add_squares_mips;
|
|
s->mul_pair_single = ps_mul_pair_single_mips;
|
|
diff --git a/libavcodec/mips/aacsbr_mips.c b/libavcodec/mips/aacsbr_mips.c
|
|
index 56aa4e86822..2e0cd723d7e 100644
|
|
--- a/libavcodec/mips/aacsbr_mips.c
|
|
+++ b/libavcodec/mips/aacsbr_mips.c
|
|
@@ -58,6 +58,7 @@
|
|
#define ENVELOPE_ADJUSTMENT_OFFSET 2
|
|
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
static int sbr_lf_gen_mips(AACContext *ac, SpectralBandReplication *sbr,
|
|
float X_low[32][40][2], const float W[2][32][32][2],
|
|
int buf_idx)
|
|
@@ -310,7 +311,6 @@ static int sbr_x_gen_mips(SpectralBandReplication *sbr, float X[2][38][64],
|
|
return 0;
|
|
}
|
|
|
|
-#if HAVE_MIPSFPU
|
|
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
|
|
static void sbr_hf_assemble_mips(float Y1[38][64][2],
|
|
const float X_high[64][40][2],
|
|
@@ -611,9 +611,9 @@ static void sbr_hf_inverse_filter_mips(SBRDSPContext *dsp,
|
|
void ff_aacsbr_func_ptr_init_mips(AACSBRContext *c)
|
|
{
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
c->sbr_lf_gen = sbr_lf_gen_mips;
|
|
c->sbr_x_gen = sbr_x_gen_mips;
|
|
-#if HAVE_MIPSFPU
|
|
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
|
|
c->sbr_hf_inverse_filter = sbr_hf_inverse_filter_mips;
|
|
c->sbr_hf_assemble = sbr_hf_assemble_mips;
|
|
diff --git a/libavcodec/mips/sbrdsp_mips.c b/libavcodec/mips/sbrdsp_mips.c
|
|
index 1b0a10608de..83039fd802a 100644
|
|
--- a/libavcodec/mips/sbrdsp_mips.c
|
|
+++ b/libavcodec/mips/sbrdsp_mips.c
|
|
@@ -59,6 +59,7 @@
|
|
#include "libavutil/mips/asmdefs.h"
|
|
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
static void sbr_qmf_pre_shuffle_mips(float *z)
|
|
{
|
|
int Temp1, Temp2, Temp3, Temp4, Temp5, Temp6;
|
|
@@ -165,7 +166,6 @@ static void sbr_qmf_post_shuffle_mips(float W[32][2], const float *z)
|
|
);
|
|
}
|
|
|
|
-#if HAVE_MIPSFPU
|
|
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
|
|
static void sbr_sum64x5_mips(float *z)
|
|
{
|
|
@@ -890,9 +890,9 @@ static void sbr_hf_apply_noise_3_mips(float (*Y)[2], const float *s_m,
|
|
void ff_sbrdsp_init_mips(SBRDSPContext *s)
|
|
{
|
|
#if HAVE_INLINE_ASM
|
|
+#if HAVE_MIPSFPU
|
|
s->qmf_pre_shuffle = sbr_qmf_pre_shuffle_mips;
|
|
s->qmf_post_shuffle = sbr_qmf_post_shuffle_mips;
|
|
-#if HAVE_MIPSFPU
|
|
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
|
|
s->sum64x5 = sbr_sum64x5_mips;
|
|
s->sum_square = sbr_sum_square_mips;
|