[FFmpeg-cvslog] aacenc: Add missing ff_ prefixes
Timothy Gu
git at videolan.org
Sat Aug 22 07:12:48 CEST 2015
ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Sat Aug 22 06:11:23 2015 +0100| [21dd5279c3c48aec82fe566744b4a3fb4f729c60] | committer: Rostislav Pehlivanov
aacenc: Add missing ff_ prefixes
Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag at mit.edu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21dd5279c3c48aec82fe566744b4a3fb4f729c60
---
libavcodec/aaccoder.c | 64 +++++++++++++++++++++++-----------------------
libavcodec/aacenc_is.c | 20 +++++++--------
libavcodec/aacenc_is.h | 10 ++++----
libavcodec/aacenc_pred.c | 10 ++++----
libavcodec/aacenc_pred.h | 10 ++++----
libavcodec/aacenc_tns.c | 7 ++---
libavcodec/aacenc_tns.h | 4 +--
7 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index a23f173..c273c54 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -960,64 +960,64 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
search_for_quantizers_faac,
encode_window_bands_info,
quantize_and_encode_band,
- encode_tns_info,
- encode_main_pred,
- adjust_common_prediction,
- apply_main_pred,
- update_main_pred,
+ ff_aac_encode_tns_info,
+ ff_aac_encode_main_pred,
+ ff_aac_adjust_common_prediction,
+ ff_aac_apply_main_pred,
+ ff_aac_update_main_pred,
set_special_band_scalefactors,
search_for_pns,
- search_for_tns,
+ ff_aac_search_for_tns,
search_for_ms,
- search_for_is,
- search_for_pred,
+ ff_aac_search_for_is,
+ ff_aac_search_for_pred,
},
[AAC_CODER_ANMR] = {
search_for_quantizers_anmr,
encode_window_bands_info,
quantize_and_encode_band,
- encode_tns_info,
- encode_main_pred,
- adjust_common_prediction,
- apply_main_pred,
- update_main_pred,
+ ff_aac_encode_tns_info,
+ ff_aac_encode_main_pred,
+ ff_aac_adjust_common_prediction,
+ ff_aac_apply_main_pred,
+ ff_aac_update_main_pred,
set_special_band_scalefactors,
search_for_pns,
- search_for_tns,
+ ff_aac_search_for_tns,
search_for_ms,
- search_for_is,
- search_for_pred,
+ ff_aac_search_for_is,
+ ff_aac_search_for_pred,
},
[AAC_CODER_TWOLOOP] = {
search_for_quantizers_twoloop,
codebook_trellis_rate,
quantize_and_encode_band,
- encode_tns_info,
- encode_main_pred,
- adjust_common_prediction,
- apply_main_pred,
- update_main_pred,
+ ff_aac_encode_tns_info,
+ ff_aac_encode_main_pred,
+ ff_aac_adjust_common_prediction,
+ ff_aac_apply_main_pred,
+ ff_aac_update_main_pred,
set_special_band_scalefactors,
search_for_pns,
- search_for_tns,
+ ff_aac_search_for_tns,
search_for_ms,
- search_for_is,
- search_for_pred,
+ ff_aac_search_for_is,
+ ff_aac_search_for_pred,
},
[AAC_CODER_FAST] = {
search_for_quantizers_fast,
encode_window_bands_info,
quantize_and_encode_band,
- encode_tns_info,
- encode_main_pred,
- adjust_common_prediction,
- apply_main_pred,
- update_main_pred,
+ ff_aac_encode_tns_info,
+ ff_aac_encode_main_pred,
+ ff_aac_adjust_common_prediction,
+ ff_aac_apply_main_pred,
+ ff_aac_update_main_pred,
set_special_band_scalefactors,
search_for_pns,
- search_for_tns,
+ ff_aac_search_for_tns,
search_for_ms,
- search_for_is,
- search_for_pred,
+ ff_aac_search_for_is,
+ ff_aac_search_for_pred,
},
};
diff --git a/libavcodec/aacenc_is.c b/libavcodec/aacenc_is.c
index 4ae1054..32a5404 100644
--- a/libavcodec/aacenc_is.c
+++ b/libavcodec/aacenc_is.c
@@ -30,15 +30,15 @@
#include "aacenc_is.h"
#include "aacenc_quantization.h"
-struct is_error calc_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
- int start, int w, int g, float ener0,
- float ener1, float ener01, int phase)
+struct ff_aac_is_error ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
+ int start, int w, int g, float ener0,
+ float ener1, float ener01, int phase)
{
int i, w2;
float *L34 = &s->scoefs[256*0], *R34 = &s->scoefs[256*1];
float *IS = &s->scoefs[256*2], *I34 = &s->scoefs[256*3];
float dist1 = 0.0f, dist2 = 0.0f;
- struct is_error is_error = {0};
+ struct ff_aac_is_error is_error = {0};
SingleChannelElement *sce0 = &cpe->ch[0];
SingleChannelElement *sce1 = &cpe->ch[1];
@@ -89,7 +89,7 @@ struct is_error calc_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
return is_error;
}
-void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe)
+void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe)
{
SingleChannelElement *sce0 = &cpe->ch[0];
SingleChannelElement *sce1 = &cpe->ch[1];
@@ -106,7 +106,7 @@ void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe)
cpe->ch[0].band_type[w*16+g] != NOISE_BT && !cpe->ch[0].zeroes[w*16+g] &&
cpe->ch[1].band_type[w*16+g] != NOISE_BT && !cpe->ch[1].zeroes[w*16+g]) {
float ener0 = 0.0f, ener1 = 0.0f, ener01 = 0.0f;
- struct is_error ph_err1, ph_err2, *erf;
+ struct ff_aac_is_error ph_err1, ph_err2, *erf;
for (w2 = 0; w2 < sce0->ics.group_len[w]; w2++) {
for (i = 0; i < sce0->ics.swb_sizes[g]; i++) {
float coef0 = sce0->pcoeffs[start+(w+w2)*128+i];
@@ -116,10 +116,10 @@ void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe)
ener01 += (coef0 + coef1)*(coef0 + coef1);
}
}
- ph_err1 = calc_is_encoding_err(s, cpe, start, w, g,
- ener0, ener1, ener01, -1);
- ph_err2 = calc_is_encoding_err(s, cpe, start, w, g,
- ener0, ener1, ener01, +1);
+ ph_err1 = ff_aac_is_encoding_err(s, cpe, start, w, g,
+ ener0, ener1, ener01, -1);
+ ph_err2 = ff_aac_is_encoding_err(s, cpe, start, w, g,
+ ener0, ener1, ener01, +1);
erf = ph_err1.error < ph_err2.error ? &ph_err1 : &ph_err2;
if (erf->pass) {
cpe->is_mask[w*16+g] = 1;
diff --git a/libavcodec/aacenc_is.h b/libavcodec/aacenc_is.h
index 55f5d68..07e1a9d 100644
--- a/libavcodec/aacenc_is.h
+++ b/libavcodec/aacenc_is.h
@@ -31,7 +31,7 @@
/** Frequency in Hz for lower limit of intensity stereo **/
#define INT_STEREO_LOW_LIMIT 6100
-struct is_error {
+struct ff_aac_is_error {
int pass; /* 1 if dist2 <= dist1 */
int phase; /* -1 or +1 */
float error; /* fabs(dist1 - dist2) */
@@ -39,9 +39,9 @@ struct is_error {
float dist2; /* From IS'd coeffs */
};
-struct is_error calc_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
- int start, int g, int w, float ener0,
- float ener1, float ener01, int phase);
-void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe);
+struct ff_aac_is_error ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
+ int start, int w, int g, float ener0,
+ float ener1, float ener01, int phase);
+void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe);
#endif /* AVCODEC_AACENC_IS_H */
diff --git a/libavcodec/aacenc_pred.c b/libavcodec/aacenc_pred.c
index 5fbcd29..c638b70 100644
--- a/libavcodec/aacenc_pred.c
+++ b/libavcodec/aacenc_pred.c
@@ -125,7 +125,7 @@ static inline void reset_predictor_group(SingleChannelElement *sce, int group_nu
reset_predict_state(&ps[i]);
}
-void apply_main_pred(AACEncContext *s, SingleChannelElement *sce)
+void ff_aac_apply_main_pred(AACEncContext *s, SingleChannelElement *sce)
{
int sfb, k;
@@ -185,7 +185,7 @@ static inline void prepare_predictors(SingleChannelElement *sce)
predict(&sce->predictor_state[k], &sce->coeffs[k], &sce->prcoeffs[k], 0);
}
-void update_main_pred(AACEncContext *s, SingleChannelElement *sce, ChannelElement *cpe)
+void ff_aac_update_main_pred(AACEncContext *s, SingleChannelElement *sce, ChannelElement *cpe)
{
int k;
@@ -218,7 +218,7 @@ static inline int update_counters(IndividualChannelStream *ics, int inc)
return rg;
}
-void adjust_common_prediction(AACEncContext *s, ChannelElement *cpe)
+void ff_aac_adjust_common_prediction(AACEncContext *s, ChannelElement *cpe)
{
int start, w, g, count = 0;
SingleChannelElement *sce0 = &cpe->ch[0];
@@ -289,7 +289,7 @@ static void update_pred_resets(SingleChannelElement *sce)
}
}
-void search_for_pred(AACEncContext *s, SingleChannelElement *sce)
+void ff_aac_search_for_pred(AACEncContext *s, SingleChannelElement *sce)
{
int sfb, i, count = 0;
float *O34 = &s->scoefs[256*0], *P34 = &s->scoefs[256*1];
@@ -349,7 +349,7 @@ void search_for_pred(AACEncContext *s, SingleChannelElement *sce)
/**
* Encoder predictors data.
*/
-void encode_main_pred(AACEncContext *s, SingleChannelElement *sce)
+void ff_aac_encode_main_pred(AACEncContext *s, SingleChannelElement *sce)
{
int sfb;
diff --git a/libavcodec/aacenc_pred.h b/libavcodec/aacenc_pred.h
index dc93c82..0694c8a 100644
--- a/libavcodec/aacenc_pred.h
+++ b/libavcodec/aacenc_pred.h
@@ -42,10 +42,10 @@
/* Offset for the number of bits to encode normal coefficients */
#define PRICE_OFFSET 440
-void apply_main_pred(AACEncContext *s, SingleChannelElement *sce);
-void update_main_pred(AACEncContext *s, SingleChannelElement *sce, ChannelElement *cpe);
-void adjust_common_prediction(AACEncContext *s, ChannelElement *cpe);
-void search_for_pred(AACEncContext *s, SingleChannelElement *sce);
-void encode_main_pred(AACEncContext *s, SingleChannelElement *sce);
+void ff_aac_apply_main_pred(AACEncContext *s, SingleChannelElement *sce);
+void ff_aac_update_main_pred(AACEncContext *s, SingleChannelElement *sce, ChannelElement *cpe);
+void ff_aac_adjust_common_prediction(AACEncContext *s, ChannelElement *cpe);
+void ff_aac_search_for_pred(AACEncContext *s, SingleChannelElement *sce);
+void ff_aac_encode_main_pred(AACEncContext *s, SingleChannelElement *sce);
#endif /* AVCODEC_AACENC_PRED_H */
diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c
index d43dd0d..0ac9ba9 100644
--- a/libavcodec/aacenc_tns.c
+++ b/libavcodec/aacenc_tns.c
@@ -72,7 +72,7 @@ static inline int compress_coef(int *coefs, int num)
* Encode TNS data.
* Coefficient compression saves a single bit.
*/
-void encode_tns_info(AACEncContext *s, SingleChannelElement *sce)
+void ff_aac_encode_tns_info(AACEncContext *s, SingleChannelElement *sce)
{
int i, w, filt, coef_len, coef_compress;
const int coef_res = MAX_LPC_PRECISION == 4 ? 1 : 0;
@@ -149,7 +149,8 @@ static int process_tns_coeffs(TemporalNoiseShaping *tns, float *tns_coefs_raw,
}
static void apply_tns_filter(float *out, float *in, int order, int direction,
- float *tns_coefs, int ltp_used, int w, int filt, int start_i, int len)
+ float *tns_coefs, int ltp_used, int w, int filt,
+ int start_i, int len)
{
int i, j, inc, start = start_i;
float tmp[TNS_MAX_ORDER+1];
@@ -175,7 +176,7 @@ static void apply_tns_filter(float *out, float *in, int order, int direction,
}
}
-void search_for_tns(AACEncContext *s, SingleChannelElement *sce)
+void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce)
{
TemporalNoiseShaping *tns = &sce->tns;
int w, g, order, sfb_start, sfb_len, coef_start, shift[MAX_LPC_ORDER], count = 0;
diff --git a/libavcodec/aacenc_tns.h b/libavcodec/aacenc_tns.h
index 3b11ca0..44afe03 100644
--- a/libavcodec/aacenc_tns.h
+++ b/libavcodec/aacenc_tns.h
@@ -39,7 +39,7 @@
#define TNS_LPC_PASSES 2
#define MAX_LPC_SHIFT 4
-void encode_tns_info(AACEncContext *s, SingleChannelElement *sce);
-void search_for_tns(AACEncContext *s, SingleChannelElement *sce);
+void ff_aac_encode_tns_info(AACEncContext *s, SingleChannelElement *sce);
+void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce);
#endif /* AVCODEC_AACENC_TNS_H */
More information about the ffmpeg-cvslog
mailing list