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

calculate_modified_err() cleanup.

Browse Source 
Change-Id: Ia24c9b1ff2d51dd9cb133722a041a615e1b8419f
This commit is contained in:
Dmitry Kovalev
2014-01-15 12:23:16 -08:00
parent a26899ada5
commit efdbd29928
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vp9/encoder/vp9_firstpass.c
View File

@@ -49,9 +49,6 @@
#define DOUBLE_DIVIDE_CHECK(x) ((x) < 0 ? (x) - 0.000001 : (x) + 0.000001) #define DOUBLE_DIVIDE_CHECK(x) ((x) < 0 ? (x) - 0.000001 : (x) + 0.000001)
#define POW1 (double)cpi->oxcf.two_pass_vbrbias/100.0
#define POW2 (double)cpi->oxcf.two_pass_vbrbias/100.0
static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) { static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) {
YV12_BUFFER_CONFIG temp = *a; YV12_BUFFER_CONFIG temp = *a;
*a = *b; *a = *b;
@@ -269,20 +266,15 @@ static void avg_stats(FIRSTPASS_STATS *section) {
// harder frames. // harder frames.
static double calculate_modified_err(VP9_COMP *cpi, static double calculate_modified_err(VP9_COMP *cpi,
FIRSTPASS_STATS *this_frame) { FIRSTPASS_STATS *this_frame) {
const FIRSTPASS_STATS *const stats = &cpi->twopass.total_stats; struct twopass_rc *const twopass = &cpi->twopass;
const FIRSTPASS_STATS *const stats = &twopass->total_stats;
const double av_err = stats->ssim_weighted_pred_err / stats->count; const double av_err = stats->ssim_weighted_pred_err / stats->count;
const double this_err = this_frame->ssim_weighted_pred_err; double modified_error = av_err * pow(this_frame->ssim_weighted_pred_err /
double modified_error; DOUBLE_DIVIDE_CHECK(av_err),
cpi->oxcf.two_pass_vbrbias / 100.0);
modified_error = av_err * pow(this_err / DOUBLE_DIVIDE_CHECK(av_err), return fclamp(modified_error,
this_err > av_err ? POW1 : POW2); twopass->modified_error_min, twopass->modified_error_max);
if (modified_error < cpi->twopass.modified_error_min)
modified_error = cpi->twopass.modified_error_min;
else if (modified_error > cpi->twopass.modified_error_max)
modified_error = cpi->twopass.modified_error_max;
return modified_error;
} }
static const double weight_table[256] = { static const double weight_table[256] = {