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

avcodec/ffv1enc: Fix 2 pass mode with the default rc table

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-12-19 20:06:58 +01:00
parent ebe1ca01d1
commit 2d2b41d169
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/ffv1enc.c
View File

@@ -155,6 +155,10 @@ static void find_best_state(uint8_t best_state[256][256],
double occ[256] = { 0 }; double occ[256] = { 0 };
double len = 0; double len = 0;
occ[j] = 1.0; occ[j] = 1.0;
if (!one_state[j])
continue;
for (k = 0; k < 256; k++) { for (k = 0; k < 256; k++) {
double newocc[256] = { 0 }; double newocc[256] = { 0 };
for (m = 1; m < 256; m++) for (m = 1; m < 256; m++)
@@ -821,9 +825,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (s->ac == AC_RANGE_CUSTOM_TAB) if (s->ac == AC_RANGE_CUSTOM_TAB) {
for (i = 1; i < 256; i++) for (i = 1; i < 256; i++)
s->state_transition[i] = ver2_state[i]; s->state_transition[i] = ver2_state[i];
} else {
RangeCoder c;
ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8);
for (i = 1; i < 256; i++)
s->state_transition[i] = c.one_state[i];
}
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
s->quant_table_count = 2; s->quant_table_count = 2;
@@ -934,7 +944,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (p[0] == 0) if (p[0] == 0)
break; break;
} }
sort_stt(s, s->state_transition); if (s->ac == AC_RANGE_CUSTOM_TAB)
sort_stt(s, s->state_transition);
find_best_state(best_state, s->state_transition); find_best_state(best_state, s->state_transition);