# HG changeset patch # User Ashok Kumar Mishra <as...@multicorewareinc.com> # Date 1542009042 -19800 # Mon Nov 12 13:20:42 2018 +0530 # Branch stable # Node ID 27d8424c799db31ca0d3b6fbbb44643348b0535c # Parent 083302c06e3a18ea752fd10a222e5ecd5a6ece73 remove whitespace
diff -r 083302c06e3a -r 27d8424c799d source/encoder/api.cpp --- a/source/encoder/api.cpp Mon Nov 05 11:04:01 2018 +0530 +++ b/source/encoder/api.cpp Mon Nov 12 13:20:42 2018 +0530 @@ -1483,11 +1483,11 @@ double x265_calculate_vmafscore(x265_param *param, x265_vmaf_data *data) { double score; - + data->width = param->sourceWidth; data->height = param->sourceHeight; data->internalBitDepth = param->internalBitDepth; - + if (param->internalCsp == X265_CSP_I420) { if ((param->sourceWidth * param->sourceHeight) % 2 != 0) @@ -1500,8 +1500,8 @@ data->offset = param->sourceWidth * param->sourceHeight * 2; else x265_log(NULL, X265_LOG_ERROR, "Invalid format\n"); - - compute_vmaf(&score, vcd->format, data->width, data->height, read_frame, data, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval); + + compute_vmaf(&score, vcd->format, data->width, data->height, read_frame, data, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval); return score; } @@ -1514,11 +1514,11 @@ PicYuv *distorted_frame = (PicYuv *)user_data->distorted_frame; if(!user_data->frame_set) { - + int reference_stride = reference_frame->m_stride; int distorted_stride = distorted_frame->m_stride; - const uint16_t *reference_ptr = (const uint16_t *)reference_frame->m_picOrg[0]; + const uint16_t *reference_ptr = (const uint16_t *)reference_frame->m_picOrg[0]; const uint16_t *distorted_ptr = (const uint16_t *)distorted_frame->m_picOrg[0]; temp_data = reference_data; @@ -1534,7 +1534,7 @@ reference_ptr += reference_stride; temp_data += stride / sizeof(*temp_data); } - + temp_data = distorted_data; for (i = 0; i < height; i++) { for (j = 0; j < width; j++) { @@ -1546,8 +1546,8 @@ user_data->frame_set = 1; return 0; - } - return 2; + } + return 2; } int read_frame_8bit(float *reference_data, float *distorted_data, float *temp_data, int stride, void *s) @@ -1578,7 +1578,7 @@ reference_ptr += reference_stride; temp_data += stride / sizeof(*temp_data); } - + temp_data = distorted_data; for (i = 0; i < height; i++) { for (j = 0; j < width; j++) { @@ -1590,8 +1590,8 @@ user_data->frame_set = 1; return 0; - } - return 2; + } + return 2; } double x265_calculate_vmaf_framelevelscore(x265_vmaf_framedata *vmafframedata) @@ -1604,7 +1604,7 @@ else read_frame = read_frame_10bit; compute_vmaf(&score, vcd->format, vmafframedata->width, vmafframedata->height, read_frame, vmafframedata, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval); - + return score; } #endif
# HG changeset patch # User Ashok Kumar Mishra <as...@multicorewareinc.com> # Date 1542009042 -19800 # Mon Nov 12 13:20:42 2018 +0530 # Branch stable # Node ID 27d8424c799db31ca0d3b6fbbb44643348b0535c # Parent 083302c06e3a18ea752fd10a222e5ecd5a6ece73 remove whitespace diff -r 083302c06e3a -r 27d8424c799d source/encoder/api.cpp --- a/source/encoder/api.cpp Mon Nov 05 11:04:01 2018 +0530 +++ b/source/encoder/api.cpp Mon Nov 12 13:20:42 2018 +0530 @@ -1483,11 +1483,11 @@ double x265_calculate_vmafscore(x265_param *param, x265_vmaf_data *data) { double score; - + data->width = param->sourceWidth; data->height = param->sourceHeight; data->internalBitDepth = param->internalBitDepth; - + if (param->internalCsp == X265_CSP_I420) { if ((param->sourceWidth * param->sourceHeight) % 2 != 0) @@ -1500,8 +1500,8 @@ data->offset = param->sourceWidth * param->sourceHeight * 2; else x265_log(NULL, X265_LOG_ERROR, "Invalid format\n"); - - compute_vmaf(&score, vcd->format, data->width, data->height, read_frame, data, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval); + + compute_vmaf(&score, vcd->format, data->width, data->height, read_frame, data, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval); return score; } @@ -1514,11 +1514,11 @@ PicYuv *distorted_frame = (PicYuv *)user_data->distorted_frame; if(!user_data->frame_set) { - + int reference_stride = reference_frame->m_stride; int distorted_stride = distorted_frame->m_stride; - const uint16_t *reference_ptr = (const uint16_t *)reference_frame->m_picOrg[0]; + const uint16_t *reference_ptr = (const uint16_t *)reference_frame->m_picOrg[0]; const uint16_t *distorted_ptr = (const uint16_t *)distorted_frame->m_picOrg[0]; temp_data = reference_data; @@ -1534,7 +1534,7 @@ reference_ptr += reference_stride; temp_data += stride / sizeof(*temp_data); } - + temp_data = distorted_data; for (i = 0; i < height; i++) { for (j = 0; j < width; j++) { @@ -1546,8 +1546,8 @@ user_data->frame_set = 1; return 0; - } - return 2; + } + return 2; } int read_frame_8bit(float *reference_data, float *distorted_data, float *temp_data, int stride, void *s) @@ -1578,7 +1578,7 @@ reference_ptr += reference_stride; temp_data += stride / sizeof(*temp_data); } - + temp_data = distorted_data; for (i = 0; i < height; i++) { for (j = 0; j < width; j++) { @@ -1590,8 +1590,8 @@ user_data->frame_set = 1; return 0; - } - return 2; + } + return 2; } double x265_calculate_vmaf_framelevelscore(x265_vmaf_framedata *vmafframedata) @@ -1604,7 +1604,7 @@ else read_frame = read_frame_10bit; compute_vmaf(&score, vcd->format, vmafframedata->width, vmafframedata->height, read_frame, vmafframedata, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval); - + return score; } #endif
_______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel