coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-01-01 03:12:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

lint fixes for psnr

Browse Source 
BUG=339
TESTED=lint
R=harryjin@google.com

Review URL: https://webrtc-codereview.appspot.com/14789004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1024 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-06-26 22:47:01 +00:00
parent b7d674e305
commit 40b21e20d1
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 1023
Version: 1024
License: BSD
License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1023
#define LIBYUV_VERSION 1024
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

39
util/psnr_main.cc
View File

@ -243,9 +243,12 @@ bool UpdateMetrics(uint8* ch_org, uint8* ch_rec,
const uint8* const v_rec = ch_rec + y_size + uv_size;
if (do_psnr) {
#ifdef HAVE_JPEG
double y_err = (double)libyuv::ComputeSumSquareError(ch_org, ch_rec, y_size);
double u_err = (double)libyuv::ComputeSumSquareError(u_org, u_rec, uv_size);
double v_err = (double)libyuv::ComputeSumSquareError(v_org, v_rec, uv_size);
double y_err = static_cast<double>(
libyuv::ComputeSumSquareError(ch_org, ch_rec, y_size));
double u_err = static_cast<double>(
libyuv::ComputeSumSquareError(u_org, u_rec, uv_size));
double v_err = static_cast<double>(
libyuv::ComputeSumSquareError(v_org, v_rec, uv_size));
#else
double y_err = ComputeSumSquareError(ch_org, ch_rec, y_size);
double u_err = ComputeSumSquareError(u_org, u_rec, uv_size);
@ -427,11 +430,16 @@ int main(int argc, const char* argv[]) {
memset(ch_org, 0, total_size);
if (0 != libyuv::MJPGToI420(ch_jpeg, bytes_org,
ch_org, image_width,
ch_org + y_size, (image_width + 1) / 2,
ch_org + y_size + uv_size, (image_width + 1) / 2,
image_width, image_height,
image_width, image_height)) {
ch_org,
image_width,
ch_org + y_size,
(image_width + 1) / 2,
ch_org + y_size + uv_size,
(image_width + 1) / 2,
image_width,
image_height,
image_width,
image_height)) {
delete[] ch_jpeg;
break;
}
@ -452,11 +460,16 @@ int main(int argc, const char* argv[]) {
memset(ch_rec, 0, total_size);
if (0 != libyuv::MJPGToI420(ch_jpeg, bytes_rec,
ch_rec, image_width,
ch_rec + y_size, (image_width + 1) / 2,
ch_rec + y_size + uv_size, (image_width + 1) / 2,
image_width, image_height,
image_width, image_height)) {
ch_rec,
image_width,
ch_rec + y_size,
(image_width + 1) / 2,
ch_rec + y_size + uv_size,
(image_width + 1) / 2,
image_width,
image_height,
image_width,
image_height)) {
delete[] ch_jpeg;
break;
}