har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacenc: shorten name of ff_aac_adjust_common_prediction

Browse Source 
To keep it similar to the other functions which are all named *_pred.
This commit is contained in:
Rostislav Pehlivanov 2015-10-12 23:33:07 +01:00
parent 65f5b96dd8
commit 93e6b23c9f
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aaccoder.c
View File

@ -912,7 +912,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
quantize_and_encode_band, quantize_and_encode_band,
ff_aac_encode_tns_info, ff_aac_encode_tns_info,
ff_aac_encode_main_pred, ff_aac_encode_main_pred,
ff_aac_adjust_common_prediction, ff_aac_adjust_common_pred,
ff_aac_apply_main_pred, ff_aac_apply_main_pred,
ff_aac_apply_tns, ff_aac_apply_tns,
set_special_band_scalefactors, set_special_band_scalefactors,
@ -929,7 +929,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
quantize_and_encode_band, quantize_and_encode_band,
ff_aac_encode_tns_info, ff_aac_encode_tns_info,
ff_aac_encode_main_pred, ff_aac_encode_main_pred,
ff_aac_adjust_common_prediction, ff_aac_adjust_common_pred,
ff_aac_apply_main_pred, ff_aac_apply_main_pred,
ff_aac_apply_tns, ff_aac_apply_tns,
set_special_band_scalefactors, set_special_band_scalefactors,
@ -946,7 +946,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
quantize_and_encode_band, quantize_and_encode_band,
ff_aac_encode_tns_info, ff_aac_encode_tns_info,
ff_aac_encode_main_pred, ff_aac_encode_main_pred,
ff_aac_adjust_common_prediction, ff_aac_adjust_common_pred,
ff_aac_apply_main_pred, ff_aac_apply_main_pred,
ff_aac_apply_tns, ff_aac_apply_tns,
set_special_band_scalefactors, set_special_band_scalefactors,
@ -963,7 +963,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
quantize_and_encode_band, quantize_and_encode_band,
ff_aac_encode_tns_info, ff_aac_encode_tns_info,
ff_aac_encode_main_pred, ff_aac_encode_main_pred,
ff_aac_adjust_common_prediction, ff_aac_adjust_common_pred,
ff_aac_apply_main_pred, ff_aac_apply_main_pred,
ff_aac_apply_tns, ff_aac_apply_tns,
set_special_band_scalefactors, set_special_band_scalefactors,

4
libavcodec/aacenc.c
View File

@ -718,8 +718,8 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s->coder->search_for_pred(s, sce); s->coder->search_for_pred(s, sce);
if (cpe->ch[ch].ics.predictor_present) pred_mode = 1; if (cpe->ch[ch].ics.predictor_present) pred_mode = 1;
} }
if (s->coder->adjust_common_prediction) if (s->coder->adjust_common_pred)
s->coder->adjust_common_prediction(s, cpe); s->coder->adjust_common_pred(s, cpe);
for (ch = 0; ch < chans; ch++) { for (ch = 0; ch < chans; ch++) {
sce = &cpe->ch[ch]; sce = &cpe->ch[ch];
s->cur_channel = start_ch + ch; s->cur_channel = start_ch + ch;

2
libavcodec/aacenc.h
View File

@ -61,7 +61,7 @@ typedef struct AACCoefficientsEncoder {
int scale_idx, int cb, const float lambda, int rtz); int scale_idx, int cb, const float lambda, int rtz);
void (*encode_tns_info)(struct AACEncContext *s, SingleChannelElement *sce); void (*encode_tns_info)(struct AACEncContext *s, SingleChannelElement *sce);
void (*encode_main_pred)(struct AACEncContext *s, SingleChannelElement *sce); void (*encode_main_pred)(struct AACEncContext *s, SingleChannelElement *sce);
void (*adjust_common_prediction)(struct AACEncContext *s, ChannelElement *cpe); void (*adjust_common_pred)(struct AACEncContext *s, ChannelElement *cpe);
void (*apply_main_pred)(struct AACEncContext *s, SingleChannelElement *sce); void (*apply_main_pred)(struct AACEncContext *s, SingleChannelElement *sce);
void (*apply_tns_filt)(struct AACEncContext *s, SingleChannelElement *sce); void (*apply_tns_filt)(struct AACEncContext *s, SingleChannelElement *sce);
void (*set_special_band_scalefactors)(struct AACEncContext *s, SingleChannelElement *sce); void (*set_special_band_scalefactors)(struct AACEncContext *s, SingleChannelElement *sce);

2
libavcodec/aacenc_pred.c
View File

@ -148,7 +148,7 @@ static inline int update_counters(IndividualChannelStream *ics, int inc)
return 0; return 0;
} }
void ff_aac_adjust_common_prediction(AACEncContext *s, ChannelElement *cpe) void ff_aac_adjust_common_pred(AACEncContext *s, ChannelElement *cpe)
{ {
int start, w, w2, g, i, count = 0; int start, w, w2, g, i, count = 0;
SingleChannelElement *sce0 = &cpe->ch[0]; SingleChannelElement *sce0 = &cpe->ch[0];

2
libavcodec/aacenc_pred.h
View File

@ -40,7 +40,7 @@
#define PRED_SFB_START 10 #define PRED_SFB_START 10
void ff_aac_apply_main_pred(AACEncContext *s, SingleChannelElement *sce); void ff_aac_apply_main_pred(AACEncContext *s, SingleChannelElement *sce);
void ff_aac_adjust_common_prediction(AACEncContext *s, ChannelElement *cpe); void ff_aac_adjust_common_pred(AACEncContext *s, ChannelElement *cpe);
void ff_aac_search_for_pred(AACEncContext *s, SingleChannelElement *sce); void ff_aac_search_for_pred(AACEncContext *s, SingleChannelElement *sce);
void ff_aac_encode_main_pred(AACEncContext *s, SingleChannelElement *sce); void ff_aac_encode_main_pred(AACEncContext *s, SingleChannelElement *sce);