apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-19 15:15:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  dcadsp: split lfe_dir cases

Conflicts:
	libavcodec/arm/dcadsp_init_arm.c

See: 45854df9a5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-08 02:16:47 +01:00
parent 45854df9a5 5fdbfcb5b7
commit 5794e9fce2
3 changed files with 38 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/arm/dcadsp_init_arm.c
View File

@@ -24,16 +24,22 @@
#include "libavutil/attributes.h"
#include "libavcodec/dcadsp.h"
void ff_dca_lfe_fir_vfp(float *out, const float *in, const float *coefs,
int decifactor, float scale);
void ff_dca_lfe_fir0_neon(float *out, const float *in, const float *coefs,
float scale);
void ff_dca_lfe_fir1_neon(float *out, const float *in, const float *coefs,
float scale);
void ff_dca_lfe_fir32_vfp(float *out, const float *in, const float *coefs,
float scale);
void ff_dca_lfe_fir64_vfp(float *out, const float *in, const float *coefs,
float scale);
void ff_dca_qmf_32_subbands_vfp(float samples_in[32][8], int sb_act,
SynthFilterContext *synth, FFTContext *imdct,
float synth_buf_ptr[512],
int *synth_buf_offset, float synth_buf2[32],
const float window[512], float *samples_out,
float raXin[32], float scale);
void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs,
int decifactor, float scale);
void ff_synth_filter_float_vfp(FFTContext *imdct,
float *synth_buf_ptr, int *synth_buf_offset,
@@ -47,42 +53,18 @@ void ff_synth_filter_float_neon(FFTContext *imdct,
float out[32], const float in[32],
float scale);
static void lfe_fir0_vfp(float *out, const float *in, const float *coefs,
float scale)
{
ff_dca_lfe_fir_vfp(out, in, coefs, 32, scale);
}
static void lfe_fir1_vfp(float *out, const float *in, const float *coefs,
float scale)
{
ff_dca_lfe_fir_vfp(out, in, coefs, 64, scale);
}
static void lfe_fir0_neon(float *out, const float *in, const float *coefs,
float scale)
{
ff_dca_lfe_fir_neon(out, in, coefs, 32, scale);
}
static void lfe_fir1_neon(float *out, const float *in, const float *coefs,
float scale)
{
ff_dca_lfe_fir_neon(out, in, coefs, 64, scale);
}
av_cold void ff_dcadsp_init_arm(DCADSPContext *s)
{
int cpu_flags = av_get_cpu_flags();
if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) {
s->lfe_fir[0] = lfe_fir0_vfp;
s->lfe_fir[1] = lfe_fir1_vfp;
s->lfe_fir[0] = ff_dca_lfe_fir32_vfp;
s->lfe_fir[1] = ff_dca_lfe_fir64_vfp;
s->qmf_32_subbands = ff_dca_qmf_32_subbands_vfp;
}
if (have_neon(cpu_flags)) {
s->lfe_fir[0] = lfe_fir0_neon;
s->lfe_fir[1] = lfe_fir1_neon;
s->lfe_fir[0] = ff_dca_lfe_fir0_neon;
s->lfe_fir[1] = ff_dca_lfe_fir1_neon;
}
}