virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

SBR DSP: use intptr_t for the ixh parameter.

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Christophe GISQUET
2012-02-23 22:25:48 +01:00
committed by Ronald S. Bultje
parent 31632e73f4
commit 2e74a5abc2
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/sbrdsp_init_arm.c
View File

@@ -30,7 +30,7 @@ void ff_sbr_qmf_post_shuffle_neon(float W[32][2], const float *z);
void ff_sbr_qmf_deint_neg_neon(float *v, const float *src); void ff_sbr_qmf_deint_neg_neon(float *v, const float *src);
void ff_sbr_qmf_deint_bfly_neon(float *v, const float *src0, const float *src1); void ff_sbr_qmf_deint_bfly_neon(float *v, const float *src0, const float *src1);
void ff_sbr_hf_g_filt_neon(float (*Y)[2], const float (*X_high)[40][2], void ff_sbr_hf_g_filt_neon(float (*Y)[2], const float (*X_high)[40][2],
const float *g_filt, int m_max, int ixh); const float *g_filt, int m_max, intptr_t ixh);
void ff_sbr_hf_gen_neon(float (*X_high)[2], const float (*X_low)[2], void ff_sbr_hf_gen_neon(float (*X_high)[2], const float (*X_low)[2],
const float alpha0[2], const float alpha1[2], const float alpha0[2], const float alpha1[2],
float bw, int start, int end); float bw, int start, int end);

2
libavcodec/sbrdsp.c
View File

@@ -151,7 +151,7 @@ static void sbr_hf_gen_c(float (*X_high)[2], const float (*X_low)[2],
} }
static void sbr_hf_g_filt_c(float (*Y)[2], const float (*X_high)[40][2], static void sbr_hf_g_filt_c(float (*Y)[2], const float (*X_high)[40][2],
const float *g_filt, int m_max, int ixh) const float *g_filt, int m_max, intptr_t ixh)
{ {
int m; int m;

4
libavcodec/sbrdsp.h
View File

@@ -21,6 +21,8 @@
#ifndef LIBAVCODEC_SBRDSP_H #ifndef LIBAVCODEC_SBRDSP_H
#define LIBAVCODEC_SBRDSP_H #define LIBAVCODEC_SBRDSP_H
#include <stdint.h>
typedef struct SBRDSPContext { typedef struct SBRDSPContext {
void (*sum64x5)(float *z); void (*sum64x5)(float *z);
float (*sum_square)(float (*x)[2], int n); float (*sum_square)(float (*x)[2], int n);
@@ -34,7 +36,7 @@ typedef struct SBRDSPContext {
const float alpha0[2], const float alpha1[2], const float alpha0[2], const float alpha1[2],
float bw, int start, int end); float bw, int start, int end);
void (*hf_g_filt)(float (*Y)[2], const float (*X_high)[40][2], void (*hf_g_filt)(float (*Y)[2], const float (*X_high)[40][2],
const float *g_filt, int m_max, int ixh); const float *g_filt, int m_max, intptr_t ixh);
void (*hf_apply_noise[4])(float (*Y)[2], const float *s_m, void (*hf_apply_noise[4])(float (*Y)[2], const float *s_m,
const float *q_filt, int noise, const float *q_filt, int noise,
int kx, int m_max); int kx, int m_max);