From 5da85349633d393e750c47aeaa877429c6967a4e Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Thu, 21 Feb 2013 10:34:33 -0800 Subject: [PATCH] Code cleanup. Removing redundant 'extern' keyword from function declarations and making function arguments lower case. Change-Id: Idae9a2183b067f2b6c85ad84738d275e8bbff9d9 --- vp9/encoder/vp9_psnr.c | 9 ++++----- vp9/encoder/vp9_psnr.h | 2 +- vp9/encoder/vp9_segmentation.c | 2 +- vp9/encoder/vp9_segmentation.h | 24 ++++++++++-------------- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/vp9/encoder/vp9_psnr.c b/vp9/encoder/vp9_psnr.c index eb00f41..9439434 100644 --- a/vp9/encoder/vp9_psnr.c +++ b/vp9/encoder/vp9_psnr.c @@ -11,17 +11,16 @@ #include "vpx_scale/yv12config.h" #include "math.h" -#include "vp9/common/vp9_systemdependent.h" /* for vp9_clear_system_state() */ #define MAX_PSNR 100 -double vp9_mse2psnr(double Samples, double Peak, double Mse) { +double vp9_mse2psnr(double samples, double peak, double mse) { double psnr; - if ((double)Mse > 0.0) - psnr = 10.0 * log10(Peak * Peak * Samples / Mse); + if (mse > 0.0) + psnr = 10.0 * log10(peak * peak * samples / mse); else - psnr = MAX_PSNR; // Limit to prevent / 0 + psnr = MAX_PSNR; // Limit to prevent / 0 if (psnr > MAX_PSNR) psnr = MAX_PSNR; diff --git a/vp9/encoder/vp9_psnr.h b/vp9/encoder/vp9_psnr.h index 121f0dc..15dd836 100644 --- a/vp9/encoder/vp9_psnr.h +++ b/vp9/encoder/vp9_psnr.h @@ -12,6 +12,6 @@ #ifndef VP9_ENCODER_VP9_PSNR_H_ #define VP9_ENCODER_VP9_PSNR_H_ -extern double vp9_mse2psnr(double Samples, double Peak, double Mse); +double vp9_mse2psnr(double samples, double peak, double mse); #endif // VP9_ENCODER_VP9_PSNR_H_ diff --git a/vp9/encoder/vp9_segmentation.c b/vp9/encoder/vp9_segmentation.c index b125a48..cfaf5f5 100644 --- a/vp9/encoder/vp9_segmentation.c +++ b/vp9/encoder/vp9_segmentation.c @@ -9,7 +9,7 @@ */ -#include "limits.h" +#include #include "vpx_mem/vpx_mem.h" #include "vp9/encoder/vp9_segmentation.h" #include "vp9/common/vp9_pred_common.h" diff --git a/vp9/encoder/vp9_segmentation.h b/vp9/encoder/vp9_segmentation.h index 3c75c68..1c90c2f 100644 --- a/vp9/encoder/vp9_segmentation.h +++ b/vp9/encoder/vp9_segmentation.h @@ -9,23 +9,20 @@ */ -#include "string.h" -#include "vp9/common/vp9_blockd.h" -#include "vp9/encoder/vp9_onyx_int.h" - #ifndef VP9_ENCODER_VP9_SEGMENTATION_H_ #define VP9_ENCODER_VP9_SEGMENTATION_H_ -extern void vp9_update_gf_useage_maps(VP9_COMP *cpi, VP9_COMMON *cm, - MACROBLOCK *x); +#include "vp9/common/vp9_blockd.h" +#include "vp9/encoder/vp9_onyx_int.h" + +void vp9_update_gf_useage_maps(VP9_COMP *cpi, VP9_COMMON *cm, MACROBLOCK *x); -extern void vp9_enable_segmentation(VP9_PTR ptr); -extern void vp9_disable_segmentation(VP9_PTR ptr); +void vp9_enable_segmentation(VP9_PTR ptr); +void vp9_disable_segmentation(VP9_PTR ptr); // Valid values for a segment are 0 to 3 // Segmentation map is arrange as [Rows][Columns] -extern void vp9_set_segmentation_map(VP9_PTR ptr, - unsigned char *segmentation_map); +void vp9_set_segmentation_map(VP9_PTR ptr, unsigned char *segmentation_map); // The values given for each segment can be either deltas (from the default // value chosen for the frame) or absolute values. @@ -37,10 +34,9 @@ extern void vp9_set_segmentation_map(VP9_PTR ptr, // // abs_delta = SEGMENT_DELTADATA (deltas) abs_delta = SEGMENT_ABSDATA (use // the absolute values given). -// -extern void vp9_set_segment_data(VP9_PTR ptr, signed char *feature_data, - unsigned char abs_delta); +void vp9_set_segment_data(VP9_PTR ptr, signed char *feature_data, + unsigned char abs_delta); -extern void vp9_choose_segmap_coding_method(VP9_COMP *cpi); +void vp9_choose_segmap_coding_method(VP9_COMP *cpi); #endif // VP9_ENCODER_VP9_SEGMENTATION_H_ -- 2.7.4