virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

aacenc: TLS: Save maximum values for each swb in a table.

Browse Source 
This gives an almost 20% speedup.

Originally committed as revision 24484 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-07-24 17:11:51 +00:00
parent 031d5cea04
commit 63e1278d88
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/aaccoder.c
View File

@ -697,6 +697,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
int start = 0, i, w, w2, g; int start = 0, i, w, w2, g;
int destbits = avctx->bit_rate * 1024.0 / avctx->sample_rate / avctx->channels; int destbits = avctx->bit_rate * 1024.0 / avctx->sample_rate / avctx->channels;
float dists[128], uplims[128]; float dists[128], uplims[128];
float maxvals[128];
int fflag, minscaler; int fflag, minscaler;
int its = 0; int its = 0;
int allz = 0; int allz = 0;
@ -738,6 +739,16 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
if (!allz) if (!allz)
return; return;
abs_pow34_v(s->scoefs, sce->coeffs, 1024); abs_pow34_v(s->scoefs, sce->coeffs, 1024);
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
start = w*128;
for (g = 0; g < sce->ics.num_swb; g++) {
const float *scaled = s->scoefs + start;
maxvals[w*16+g] = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled);
start += sce->ics.swb_sizes[g];
}
}
//perform two-loop search //perform two-loop search
//outer loop - improve quality //outer loop - improve quality
do { do {
@ -763,7 +774,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
continue; continue;
} }
minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]); minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]);
cb = find_min_book(find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled), sce->sf_idx[w*16+g]); cb = find_min_book(maxvals[w*16+g], sce->sf_idx[w*16+g]);
for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
int b; int b;
dist += quantize_band_cost(s, coefs + w2*128, dist += quantize_band_cost(s, coefs + w2*128,
@ -802,12 +813,10 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
fflag = 0; fflag = 0;
minscaler = av_clip(minscaler, 60, 255 - SCALE_MAX_DIFF); minscaler = av_clip(minscaler, 60, 255 - SCALE_MAX_DIFF);
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) { for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
start = w*128;
for (g = 0; g < sce->ics.num_swb; g++) { for (g = 0; g < sce->ics.num_swb; g++) {
int prevsc = sce->sf_idx[w*16+g]; int prevsc = sce->sf_idx[w*16+g];
const float *scaled = s->scoefs + start;
if (dists[w*16+g] > uplims[w*16+g] && sce->sf_idx[w*16+g] > 60) { if (dists[w*16+g] > uplims[w*16+g] && sce->sf_idx[w*16+g] > 60) {
if (find_min_book(find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled), sce->sf_idx[w*16+g]-1)) if (find_min_book(maxvals[w*16+g], sce->sf_idx[w*16+g]-1))
sce->sf_idx[w*16+g]--; sce->sf_idx[w*16+g]--;
else //Try to make sure there is some energy in every band else //Try to make sure there is some energy in every band
sce->sf_idx[w*16+g]-=2; sce->sf_idx[w*16+g]-=2;
@ -816,8 +825,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
sce->sf_idx[w*16+g] = FFMIN(sce->sf_idx[w*16+g], 219); sce->sf_idx[w*16+g] = FFMIN(sce->sf_idx[w*16+g], 219);
if (sce->sf_idx[w*16+g] != prevsc) if (sce->sf_idx[w*16+g] != prevsc)
fflag = 1; fflag = 1;
sce->band_type[w*16+g] = find_min_book(find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled), sce->sf_idx[w*16+g]); sce->band_type[w*16+g] = find_min_book(maxvals[w*16+g], sce->sf_idx[w*16+g]);
start += sce->ics.swb_sizes[g];
} }
} }
its++; its++;