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

ffv1enc: better heuristic to calculate initial states

Browse Source 
Slightly improves compression of 2pass files

Tested-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-04 17:33:07 +01:00
parent c177f2ec4a
commit 0aa1d848ec
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/ffv1enc.c
View File

@ -856,17 +856,28 @@ static av_cold int encode_init(AVCodecContext *avctx)
find_best_state(best_state, s->state_transition); find_best_state(best_state, s->state_transition);
for (i = 0; i < s->quant_table_count; i++) { for (i = 0; i < s->quant_table_count; i++) {
for (j = 0; j < s->context_count[i]; j++)
for (k = 0; k < 32; k++) { for (k = 0; k < 32; k++) {
double a=0, b=0;
int jp = 0;
for (j = 0; j < s->context_count[i]; j++) {
double p = 128; double p = 128;
if (s->rc_stat2[i][j][k][0] + s->rc_stat2[i][j][k][1]) { if (s->rc_stat2[i][j][k][0] + s->rc_stat2[i][j][k][1] > 200 && j || a+b > 200) {
p = 256.0 * s->rc_stat2[i][j][k][1] / if (a+b)
(s->rc_stat2[i][j][k][0] + s->rc_stat2[i][j][k][1]); p = 256.0 * b / (a + b);
s->initial_states[i][jp][k] =
best_state[av_clip(round(p), 1, 255)][av_clip((a + b) / gob_count, 0, 255)];
for(jp++; jp<j; jp++)
s->initial_states[i][jp][k] = s->initial_states[i][jp-1][k];
a=b=0;
}
a += s->rc_stat2[i][j][k][0];
b += s->rc_stat2[i][j][k][1];
if (a+b) {
p = 256.0 * b / (a + b);
} }
s->initial_states[i][j][k] = s->initial_states[i][j][k] =
best_state[av_clip(round(p), 1, 255)][av_clip((s->rc_stat2[i][j][k][0] + best_state[av_clip(round(p), 1, 255)][av_clip((a + b) / gob_count, 0, 255)];
s->rc_stat2[i][j][k][1]) / }
gob_count, 0, 255)];
} }
} }
} }