diff options
| author | James Zern <jzern@google.com> | 2016-01-30 00:17:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-30 00:17:16 +0000 |
| commit | 8faccb709a8402d68993e4a50b2e7b797c7bf3e8 (patch) | |
| tree | 18503af7d3324f47a7902d3ca56c502ff985083b /vp9/encoder/vp9_noise_estimate.c | |
| parent | 8050e0219fae86e4b0603904b576adf4d7f39d35 (diff) | |
| parent | fea27ccca040abd3d3e40e38aac6f87025d383d4 (diff) | |
| download | libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.tar libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.tar.gz libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.tar.bz2 libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.zip | |
Merge changes If13946e4,I61a1814d,I2ca9aa3c,I44d91eaa
* changes:
intrapred: protect functions w/CONFIG check
vp9_noise_estimate: protect copy_frame w/CONFIG check
vp8_cx_iface: delete 3 unused functions
vp8: mark intra_prediction_down_copy inline
Diffstat (limited to 'vp9/encoder/vp9_noise_estimate.c')
| -rw-r--r-- | vp9/encoder/vp9_noise_estimate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c index 008a40afc..b1a261986 100644 --- a/vp9/encoder/vp9_noise_estimate.c +++ b/vp9/encoder/vp9_noise_estimate.c @@ -66,6 +66,7 @@ int enable_noise_estimation(VP9_COMP *const cpi) { return 0; } +#if CONFIG_VP9_TEMPORAL_DENOISING static void copy_frame(YV12_BUFFER_CONFIG * const dest, const YV12_BUFFER_CONFIG * const src) { int r; @@ -81,6 +82,7 @@ static void copy_frame(YV12_BUFFER_CONFIG * const dest, srcbuf += src->y_stride; } } +#endif // CONFIG_VP9_TEMPORAL_DENOISING NOISE_LEVEL vp9_noise_estimate_extract_level(NOISE_ESTIMATE *const ne) { int noise_level = kLowLow; |