highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec: Rename ff_kbd_window_init() as it will be needed from outside libavcodec

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-06-16 19:22:49 +02:00
parent cf00f60bab
commit fd5aa93a37
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aacdec_template.c
View File

@ -1159,8 +1159,8 @@ static av_cold void aac_static_table_init(void)
352); 352);
// window initialization // window initialization
AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960); AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960);
AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120); AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120);
#if !USE_FIXED #if !USE_FIXED
AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960); AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960);
@ -1168,8 +1168,8 @@ static av_cold void aac_static_table_init(void)
AAC_RENAME(ff_init_ff_sine_windows)(9); AAC_RENAME(ff_init_ff_sine_windows)(9);
ff_aac_float_common_init(); ff_aac_float_common_init();
#else #else
AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024);
AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128);
init_sine_windows_fixed(); init_sine_windows_fixed();
#endif #endif

4
libavcodec/aactab.c
View File

@ -48,8 +48,8 @@ DECLARE_ALIGNED(32, float, ff_aac_kbd_short_128)[128];
static av_cold void aac_float_common_init(void) static av_cold void aac_float_common_init(void)
{ {
ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); avpriv_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024);
ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); avpriv_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128);
ff_init_ff_sine_windows(10); ff_init_ff_sine_windows(10);
ff_init_ff_sine_windows(7); ff_init_ff_sine_windows(7);
} }

2
libavcodec/ac3dec.c
View File

@ -228,7 +228,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
if ((ret = av_tx_init(&s->tx_256, &s->tx_fn_256, IMDCT_TYPE, 1, 256, &scale, 0))) if ((ret = av_tx_init(&s->tx_256, &s->tx_fn_256, IMDCT_TYPE, 1, 256, &scale, 0)))
return ret; return ret;
AC3_RENAME(ff_kbd_window_init)(s->window, 5.0, 256); AC3_RENAME(avpriv_kbd_window_init)(s->window, 5.0, 256);
ff_bswapdsp_init(&s->bdsp); ff_bswapdsp_init(&s->bdsp);
#if (USE_FIXED) #if (USE_FIXED)

2
libavcodec/ac3enc_fixed.c
View File

@ -82,7 +82,7 @@ static av_cold int ac3_fixed_mdct_init(AC3EncodeContext *s)
if (!iwin) if (!iwin)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ff_kbd_window_init(fwin, 5.0, AC3_BLOCK_SIZE); avpriv_kbd_window_init(fwin, 5.0, AC3_BLOCK_SIZE);
for (int i = 0; i < AC3_BLOCK_SIZE; i++) for (int i = 0; i < AC3_BLOCK_SIZE; i++)
iwin[i] = lrintf(fwin[i] * (1 << 22)); iwin[i] = lrintf(fwin[i] * (1 << 22));

2
libavcodec/ac3enc_float.c
View File

@ -92,7 +92,7 @@ static av_cold int ac3_float_mdct_init(AC3EncodeContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
ff_kbd_window_init(window, 5.0, AC3_BLOCK_SIZE); avpriv_kbd_window_init(window, 5.0, AC3_BLOCK_SIZE);
s->mdct_window = window; s->mdct_window = window;
return av_tx_init(&s->tx, &s->tx_fn, AV_TX_FLOAT_MDCT, 0, return av_tx_init(&s->tx, &s->tx_fn, AV_TX_FLOAT_MDCT, 0,

4
libavcodec/dolby_e.c
View File

@ -1200,7 +1200,7 @@ static av_cold void init_tables(void)
gain_tab[i] = exp2f((i - 960) / 64.0f); gain_tab[i] = exp2f((i - 960) / 64.0f);
// short 1 // short 1
ff_kbd_window_init(window, 3.0f, 128); avpriv_kbd_window_init(window, 3.0f, 128);
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
window[128 + i] = window[127 - i]; window[128 + i] = window[127 - i];
@ -1227,7 +1227,7 @@ static av_cold void init_tables(void)
window[1088 + i] = 1.0f; window[1088 + i] = 1.0f;
// long // long
ff_kbd_window_init(window + 1408, 3.0f, 256); avpriv_kbd_window_init(window + 1408, 3.0f, 256);
for (i = 0; i < 640; i++) for (i = 0; i < 640; i++)
window[1664 + i] = 1.0f; window[1664 + i] = 1.0f;
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)

4
libavcodec/kbdwin.c
View File

@ -56,12 +56,12 @@ av_cold static int kbd_window_init(float *float_window, int *int_window, float a
return 0; return 0;
} }
av_cold int ff_kbd_window_init(float *window, float alpha, int n) av_cold int avpriv_kbd_window_init(float *window, float alpha, int n)
{ {
return kbd_window_init(window, NULL, alpha, n); return kbd_window_init(window, NULL, alpha, n);
} }
av_cold int ff_kbd_window_init_fixed(int32_t *window, float alpha, int n) av_cold int avpriv_kbd_window_init_fixed(int32_t *window, float alpha, int n)
{ {
return kbd_window_init(NULL, window, alpha, n); return kbd_window_init(NULL, window, alpha, n);
} }

6
libavcodec/kbdwin.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
/** /**
* Maximum window size for ff_kbd_window_init. * Maximum window size for avpriv_kbd_window_init.
*/ */
#define FF_KBD_WINDOW_MAX 1024 #define FF_KBD_WINDOW_MAX 1024
@ -34,7 +34,7 @@
* *
* @return if n is larger than FF_KBD_WINDOW_MAX then AVERROR(ENOMEM) is possible * @return if n is larger than FF_KBD_WINDOW_MAX then AVERROR(ENOMEM) is possible
*/ */
int ff_kbd_window_init(float *window, float alpha, int n); int avpriv_kbd_window_init(float *window, float alpha, int n);
int ff_kbd_window_init_fixed(int32_t *window, float alpha, int n); int avpriv_kbd_window_init_fixed(int32_t *window, float alpha, int n);
#endif /* AVCODEC_KBDWIN_H */ #endif /* AVCODEC_KBDWIN_H */