---
libavcodec/aaccoder.c | 64 ++++++++++++++++++++++++------------------------
libavcodec/aacenc_is.c | 2 +-
libavcodec/aacenc_is.h | 2 +-
libavcodec/aacenc_pred.c | 10 ++++----
libavcodec/aacenc_pred.h | 10 ++++----
libavcodec/aacenc_tns.c | 4 +--
libavcodec/aacenc_tns.h | 4 +--
7 files changed, 48 insertions(+), 48 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 2a0ed86..0759ff3 100644
--- a/libavcodec/aacenc_is.c
+++ b/libavcodec/aacenc_is.c
@@ -97,7 +97,7 @@ static struct is_error calc_is_encoding_err(AACEncContext *s,
ChannelElement *cp
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];
diff --git a/libavcodec/aacenc_is.h b/libavcodec/aacenc_is.h
index e213ef0..e2f08b3 100644
--- a/libavcodec/aacenc_is.h
+++ b/libavcodec/aacenc_is.h
@@ -31,6 +31,6 @@
/** Frequency in Hz for lower limit of intensity stereo **/
#define INT_STEREO_LOW_LIMIT 6100
-void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement
*cpe);
+void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx,
ChannelElement *cpe);
#endif /* AVCODEC_AACENC_INTENSITY_STEREO_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..c12df97 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;
@@ -175,7 +175,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 */
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
