Merge "Add static syntax to total_adj_strong_thresh"

This commit is contained in:
Jingning Han 2015-08-10 15:50:53 +00:00 committed by Gerrit Code Review
commit d705e17f5e
2 changed files with 6 additions and 5 deletions

View File

@ -63,10 +63,6 @@ static int sse_diff_thresh(BLOCK_SIZE bs, int increase_denoising,
} }
} }
int total_adj_strong_thresh(BLOCK_SIZE bs, int increase_denoising) {
return (1 << num_pels_log2_lookup[bs]) * (increase_denoising ? 3 : 2);
}
static int total_adj_weak_thresh(BLOCK_SIZE bs, int increase_denoising) { static int total_adj_weak_thresh(BLOCK_SIZE bs, int increase_denoising) {
return (1 << num_pels_log2_lookup[bs]) * (increase_denoising ? 3 : 2); return (1 << num_pels_log2_lookup[bs]) * (increase_denoising ? 3 : 2);
} }

View File

@ -57,7 +57,12 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
int border); int border);
#if CONFIG_VP9_TEMPORAL_DENOISING #if CONFIG_VP9_TEMPORAL_DENOISING
int total_adj_strong_thresh(BLOCK_SIZE bs, int increase_denoising); // This function is used by both c and sse2 denoiser implementations.
// Define it as a static function within the scope where vp9_denoiser.h
// is referenced.
static int total_adj_strong_thresh(BLOCK_SIZE bs, int increase_denoising) {
return (1 << num_pels_log2_lookup[bs]) * (increase_denoising ? 3 : 2);
}
#endif #endif
void vp9_denoiser_free(VP9_DENOISER *denoiser); void vp9_denoiser_free(VP9_DENOISER *denoiser);