diff options
| author | Tim Kopp <tkopp@google.com> | 2014-06-18 09:05:32 -0700 |
|---|---|---|
| committer | Tim Kopp <tkopp@google.com> | 2014-07-01 14:07:40 -0700 |
| commit | 1a66dab93ae32adbc2586db1ec51dac9b9da0c02 (patch) | |
| tree | 5ff56e041e37cf56c2631eaaff0b3dbf02127e00 | |
| parent | 2f71de77f00c222aab6dfd37e3b8a1273595e0aa (diff) | |
| download | libvpx-1a66dab93ae32adbc2586db1ec51dac9b9da0c02.tar libvpx-1a66dab93ae32adbc2586db1ec51dac9b9da0c02.tar.gz libvpx-1a66dab93ae32adbc2586db1ec51dac9b9da0c02.tar.bz2 libvpx-1a66dab93ae32adbc2586db1ec51dac9b9da0c02.zip | |
VP9 denoiser used s/int/enum where appropriate
Change-Id: Id52a7869fd1f31bb060de170e3295da7435adb9e
| -rw-r--r-- | vp9/encoder/vp9_denoiser.c | 26 | ||||
| -rw-r--r-- | vp9/encoder/vp9_denoiser.h | 4 |
2 files changed, 16 insertions, 14 deletions
diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c index 4eab79392..1cdbdab0b 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -22,14 +22,13 @@ static void make_grayscale(YV12_BUFFER_CONFIG *yuv); static const int widths[] = {4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 32, 64, 64}; static const int heights[] = {4, 8, 4, 8, 16, 8, 16, 32, 16, 32, 64, 32, 64}; -int vp9_denoiser_filter() { - return 0; -} - -static int update_running_avg(const uint8_t *mc_avg, int mc_avg_stride, - uint8_t *avg, int avg_stride, - const uint8_t *sig, int sig_stride, - int increase_denoising, BLOCK_SIZE bs) { +static VP9_DENOISER_DECISION update_running_avg(const uint8_t *mc_avg, + int mc_avg_stride, + uint8_t *avg, int avg_stride, + const uint8_t *sig, + int sig_stride, + int increase_denoising, + BLOCK_SIZE bs) { int r, c; int diff, adj, absdiff; int shift_inc1 = 0, shift_inc2 = 1; @@ -94,9 +93,12 @@ void copy_block(uint8_t *dest, int dest_stride, } } -static int perform_motion_compensation(VP9_DENOISER *denoiser, MACROBLOCK *mb, - BLOCK_SIZE bs, int increase_denoising, - int mi_row, int mi_col) { +static VP9_DENOISER_DECISION perform_motion_compensation(VP9_DENOISER *denoiser, + MACROBLOCK *mb, + BLOCK_SIZE bs, + int increase_denoising, + int mi_row, + int mi_col) { // constants // TODO(tkopp): empirically determine good constants, or functions of block // size. @@ -228,7 +230,7 @@ static int perform_motion_compensation(VP9_DENOISER *denoiser, MACROBLOCK *mb, void vp9_denoiser_denoise(VP9_DENOISER *denoiser, MACROBLOCK *mb, int mi_row, int mi_col, BLOCK_SIZE bs) { - int decision = COPY_BLOCK; + VP9_DENOISER_DECISION decision = FILTER_BLOCK; YV12_BUFFER_CONFIG avg = denoiser->running_avg_y[INTRA_FRAME]; YV12_BUFFER_CONFIG mc_avg = denoiser->mc_running_avg_y; diff --git a/vp9/encoder/vp9_denoiser.h b/vp9/encoder/vp9_denoiser.h index 78559896b..cbb6423c2 100644 --- a/vp9/encoder/vp9_denoiser.h +++ b/vp9/encoder/vp9_denoiser.h @@ -18,10 +18,10 @@ extern "C" { #endif -enum vp9_denoiser_decision { +typedef enum vp9_denoiser_decision { COPY_BLOCK, FILTER_BLOCK -}; +} VP9_DENOISER_DECISION; typedef struct vp9_denoiser { YV12_BUFFER_CONFIG running_avg_y[MAX_REF_FRAMES]; |