generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Added stricter Q control flag." into experimental

Browse Source
This commit is contained in:
Paul Wilkins 2013-03-06 04:32:22 -08:00 committed by Gerrit Code Review
commit 72a6201050
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_onyx_if.c
View File

@ -2845,7 +2845,15 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
cpi->active_best_quality * 15 / 16;
}
} else {
#ifdef ONE_SHOT_Q_ESTIMATE
#ifdef STRICT_ONE_SHOT_Q
cpi->active_best_quality = Q;
#else
cpi->active_best_quality = inter_minq[Q];
#endif
#else
cpi->active_best_quality = inter_minq[Q];
#endif
// For the constant/constrained quality mode we dont want
// q to fall below the cq level.

1
vp9/encoder/vp9_onyx_int.h
View File

@ -31,6 +31,7 @@
// Experimental rate control switches
// #define ONE_SHOT_Q_ESTIMATE 1
// #define STRICT_ONE_SHOT_Q 1
// #define DISABLE_RC_LONG_TERM_MEM 1
// #define SPEEDSTATS 1

7
vp9/encoder/vp9_ratectrl.c
View File

@ -120,11 +120,14 @@ int vp9_bits_per_mb(FRAME_TYPE frame_type, int qindex,
double q = vp9_convert_qindex_to_q(qindex);
if (frame_type == KEY_FRAME) {
enumerator = 4500000;
enumerator = 4000000;
} else {
enumerator = 2850000;
enumerator = 2500000;
}
// Q based adjustment to baseline enumberator
enumerator += (int)(enumerator * q) >> 12;
return (int)(0.5 + (enumerator * correction_factor / q));
}