diff options
| author | Frank Barchard <fbarchard@google.com> | 2017-02-22 18:01:07 -0800 |
|---|---|---|
| committer | Frank Barchard <fbarchard@google.com> | 2017-03-06 09:54:15 -0800 |
| commit | b83bb38f0a92bedeb52baa31e515220927ef53bb (patch) | |
| tree | a31c9da19db3f909cad22293ad2964d1c41c953a /files/include/libyuv/compare.h | |
| parent | 04676c9f110180a5ae1fa259a38fab17101c6b5b (diff) | |
| download | libyuv-b83bb38f0a92bedeb52baa31e515220927ef53bb.tar.gz | |
libyuv r1645 to fix android build warnings
r1602 under android.mk had unused parameter build warnings.
The warnings were disabled. This CL fixes the source and re-enables
the warning.
Bug: 35099807
Test: mm for libyuv builds cleanly.
Change-Id: If6b344ca39b2c321e277421cdeb817a5b1cc2514
Diffstat (limited to 'files/include/libyuv/compare.h')
| -rw-r--r-- | files/include/libyuv/compare.h | 76 |
1 files changed, 49 insertions, 27 deletions
diff --git a/files/include/libyuv/compare.h b/files/include/libyuv/compare.h index 08b2bb2e..4deca97f 100644 --- a/files/include/libyuv/compare.h +++ b/files/include/libyuv/compare.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_COMPARE_H_ // NOLINT +#ifndef INCLUDE_LIBYUV_COMPARE_H_ #define INCLUDE_LIBYUV_COMPARE_H_ #include "libyuv/basic_types.h" @@ -29,13 +29,15 @@ uint32 ARGBDetect(const uint8* argb, int stride_argb, int width, int height); // Sum Square Error - used to compute Mean Square Error or PSNR. LIBYUV_API -uint64 ComputeSumSquareError(const uint8* src_a, - const uint8* src_b, int count); +uint64 ComputeSumSquareError(const uint8* src_a, const uint8* src_b, int count); LIBYUV_API -uint64 ComputeSumSquareErrorPlane(const uint8* src_a, int stride_a, - const uint8* src_b, int stride_b, - int width, int height); +uint64 ComputeSumSquareErrorPlane(const uint8* src_a, + int stride_a, + const uint8* src_b, + int stride_b, + int width, + int height); static const int kMaxPsnr = 128; @@ -43,36 +45,56 @@ LIBYUV_API double SumSquareErrorToPsnr(uint64 sse, uint64 count); LIBYUV_API -double CalcFramePsnr(const uint8* src_a, int stride_a, - const uint8* src_b, int stride_b, - int width, int height); +double CalcFramePsnr(const uint8* src_a, + int stride_a, + const uint8* src_b, + int stride_b, + int width, + int height); LIBYUV_API -double I420Psnr(const uint8* src_y_a, int stride_y_a, - const uint8* src_u_a, int stride_u_a, - const uint8* src_v_a, int stride_v_a, - const uint8* src_y_b, int stride_y_b, - const uint8* src_u_b, int stride_u_b, - const uint8* src_v_b, int stride_v_b, - int width, int height); +double I420Psnr(const uint8* src_y_a, + int stride_y_a, + const uint8* src_u_a, + int stride_u_a, + const uint8* src_v_a, + int stride_v_a, + const uint8* src_y_b, + int stride_y_b, + const uint8* src_u_b, + int stride_u_b, + const uint8* src_v_b, + int stride_v_b, + int width, + int height); LIBYUV_API -double CalcFrameSsim(const uint8* src_a, int stride_a, - const uint8* src_b, int stride_b, - int width, int height); +double CalcFrameSsim(const uint8* src_a, + int stride_a, + const uint8* src_b, + int stride_b, + int width, + int height); LIBYUV_API -double I420Ssim(const uint8* src_y_a, int stride_y_a, - const uint8* src_u_a, int stride_u_a, - const uint8* src_v_a, int stride_v_a, - const uint8* src_y_b, int stride_y_b, - const uint8* src_u_b, int stride_u_b, - const uint8* src_v_b, int stride_v_b, - int width, int height); +double I420Ssim(const uint8* src_y_a, + int stride_y_a, + const uint8* src_u_a, + int stride_u_a, + const uint8* src_v_a, + int stride_v_a, + const uint8* src_y_b, + int stride_y_b, + const uint8* src_u_b, + int stride_u_b, + const uint8* src_v_b, + int stride_v_b, + int width, + int height); #ifdef __cplusplus } // extern "C" } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_COMPARE_H_ NOLINT +#endif // INCLUDE_LIBYUV_COMPARE_H_ |