diff options
| author | James Zern <jzern@google.com> | 2016-02-03 00:51:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-03 00:51:42 +0000 |
| commit | dee831c484c7e4a95a78c96c5264a9a3f5df931a (patch) | |
| tree | a16588ac392190b36386f065d7d898eb653c7ba2 /vp9 | |
| parent | 614f0727e4a0e823ec5345215cbfaf62e0eba14c (diff) | |
| parent | ebf258688e2dd20c9cdfd42d3572b3ad14f684ea (diff) | |
| download | libvpx-dee831c484c7e4a95a78c96c5264a9a3f5df931a.tar libvpx-dee831c484c7e4a95a78c96c5264a9a3f5df931a.tar.gz libvpx-dee831c484c7e4a95a78c96c5264a9a3f5df931a.tar.bz2 libvpx-dee831c484c7e4a95a78c96c5264a9a3f5df931a.zip | |
Merge changes I4a365757,I14a3b328
* changes:
vp10: remove unused (read|write)_uniform
vp9_denoiser: mark total_adj_strong_thresh inline
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_denoiser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_denoiser.h b/vp9/encoder/vp9_denoiser.h index 12dd5b5fa..9f13bd533 100644 --- a/vp9/encoder/vp9_denoiser.h +++ b/vp9/encoder/vp9_denoiser.h @@ -75,7 +75,8 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, // 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) { +static INLINE int total_adj_strong_thresh(BLOCK_SIZE bs, + int increase_denoising) { return (1 << num_pels_log2_lookup[bs]) * (increase_denoising ? 3 : 2); } #endif |