generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavcodec: Add ff_ prefix to some nonstatic symbols

Browse Source 
Prefix the functions atrac_generate_tables, atrac_iqmf, dct_quantize_c.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-02-15 11:40:48 +02:00
parent e96b4a53df
commit 99560a4caa
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/atrac.c
View File

@ -48,7 +48,7 @@ static const float qmf_48tap_half[24] = {
* Generate common tables * Generate common tables
*/ */
void atrac_generate_tables(void) void ff_atrac_generate_tables(void)
{ {
int i; int i;
float s; float s;
@ -79,7 +79,7 @@ void atrac_generate_tables(void)
*/ */
void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp) void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)
{ {
int i, j; int i, j;
float *p1, *p3; float *p1, *p3;

4
libavcodec/atrac.h
View File

@ -30,7 +30,7 @@
extern float ff_atrac_sf_table[64]; extern float ff_atrac_sf_table[64];
void atrac_generate_tables(void); void ff_atrac_generate_tables(void);
void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp); void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp);
#endif /* AVCODEC_ATRAC_H */ #endif /* AVCODEC_ATRAC_H */

6
libavcodec/atrac1.c
View File

@ -262,14 +262,14 @@ static void at1_subband_synthesis(AT1Ctx *q, AT1SUCtx* su, float *pOut)
float iqmf_temp[512 + 46]; float iqmf_temp[512 + 46];
/* combine low and middle bands */ /* combine low and middle bands */
atrac_iqmf(q->bands[0], q->bands[1], 128, temp, su->fst_qmf_delay, iqmf_temp); ff_atrac_iqmf(q->bands[0], q->bands[1], 128, temp, su->fst_qmf_delay, iqmf_temp);
/* delay the signal of the high band by 23 samples */ /* delay the signal of the high band by 23 samples */
memcpy( su->last_qmf_delay, &su->last_qmf_delay[256], sizeof(float) * 23); memcpy( su->last_qmf_delay, &su->last_qmf_delay[256], sizeof(float) * 23);
memcpy(&su->last_qmf_delay[23], q->bands[2], sizeof(float) * 256); memcpy(&su->last_qmf_delay[23], q->bands[2], sizeof(float) * 256);
/* combine (low + middle) and high bands */ /* combine (low + middle) and high bands */
atrac_iqmf(temp, su->last_qmf_delay, 256, pOut, su->snd_qmf_delay, iqmf_temp); ff_atrac_iqmf(temp, su->last_qmf_delay, 256, pOut, su->snd_qmf_delay, iqmf_temp);
} }
@ -378,7 +378,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
ff_init_ff_sine_windows(5); ff_init_ff_sine_windows(5);
atrac_generate_tables(); ff_atrac_generate_tables();
dsputil_init(&q->dsp, avctx); dsputil_init(&q->dsp, avctx);
ff_fmt_convert_init(&q->fmt_conv, avctx); ff_fmt_convert_init(&q->fmt_conv, avctx);

8
libavcodec/atrac3.c
View File

@ -812,9 +812,9 @@ static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf,
p2= p1+256; p2= p1+256;
p3= p2+256; p3= p2+256;
p4= p3+256; p4= p3+256;
atrac_iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf); ff_atrac_iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf);
atrac_iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf); ff_atrac_iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf);
atrac_iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf); ff_atrac_iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf);
} }
return 0; return 0;
@ -1014,7 +1014,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
return ret; return ret;
} }
atrac_generate_tables(); ff_atrac_generate_tables();
/* Generate gain tables. */ /* Generate gain tables. */
for (i=0 ; i<16 ; i++) for (i=0 ; i<16 ; i++)

2
libavcodec/dnxhdenc.c
View File

@ -264,7 +264,7 @@ static int dnxhd_encode_init(AVCodecContext *avctx)
dsputil_init(&ctx->m.dsp, avctx); dsputil_init(&ctx->m.dsp, avctx);
ff_dct_common_init(&ctx->m); ff_dct_common_init(&ctx->m);
if (!ctx->m.dct_quantize) if (!ctx->m.dct_quantize)
ctx->m.dct_quantize = dct_quantize_c; ctx->m.dct_quantize = ff_dct_quantize_c;
if (ctx->cid_table->bit_depth == 10) { if (ctx->cid_table->bit_depth == 10) {
ctx->m.dct_quantize = dnxhd_10bit_dct_quantize; ctx->m.dct_quantize = dnxhd_10bit_dct_quantize;

2
libavcodec/mpegvideo_common.h
View File

@ -39,7 +39,7 @@
#include "faandct.h" #include "faandct.h"
#include <limits.h> #include <limits.h>
int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); int ff_dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
/** /**
* Set the given MpegEncContext to common defaults (same for encoding and decoding). * Set the given MpegEncContext to common defaults (same for encoding and decoding).

6
libavcodec/mpegvideo_enc.c
View File

@ -768,7 +768,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
return -1; return -1;
if (!s->dct_quantize) if (!s->dct_quantize)
s->dct_quantize = dct_quantize_c; s->dct_quantize = ff_dct_quantize_c;
if (!s->denoise_dct) if (!s->denoise_dct)
s->denoise_dct = denoise_dct_c; s->denoise_dct = denoise_dct_c;
s->fast_dct_quantize = s->dct_quantize; s->fast_dct_quantize = s->dct_quantize;
@ -1976,7 +1976,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s,
} }
// non c quantize code returns incorrect block_last_index FIXME // non c quantize code returns incorrect block_last_index FIXME
if (s->alternate_scan && s->dct_quantize != dct_quantize_c) { if (s->alternate_scan && s->dct_quantize != ff_dct_quantize_c) {
for (i = 0; i < mb_block_count; i++) { for (i = 0; i < mb_block_count; i++) {
int j; int j;
if (s->block_last_index[i] > 0) { if (s->block_last_index[i] > 0) {
@ -3940,7 +3940,7 @@ STOP_TIMER("iterative search")
return last_non_zero; return last_non_zero;
} }
int dct_quantize_c(MpegEncContext *s, int ff_dct_quantize_c(MpegEncContext *s,
DCTELEM *block, int n, DCTELEM *block, int n,
int qscale, int *overflow) int qscale, int *overflow)
{ {