diff options
| author | Jingning Han <jingning@google.com> | 2015-01-16 16:58:37 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-16 16:58:37 -0800 |
| commit | 0220255fa0241168829ff3c0fc867826992e4dc1 (patch) | |
| tree | e651228ba32b35b560eb1c5d441f558777055cea | |
| parent | 31614c7fdb3cc5f303160da20a5ab86b95b43e3b (diff) | |
| parent | dfda5cebc7f6ff667ffd749b16cd11bea5dfb105 (diff) | |
| download | libvpx-0220255fa0241168829ff3c0fc867826992e4dc1.tar libvpx-0220255fa0241168829ff3c0fc867826992e4dc1.tar.gz libvpx-0220255fa0241168829ff3c0fc867826992e4dc1.tar.bz2 libvpx-0220255fa0241168829ff3c0fc867826992e4dc1.zip | |
Merge "Fix frame buffer swap in denoiser"
| -rw-r--r-- | vp9/encoder/vp9_denoiser.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c index ab8533703..a7aaff0cf 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -352,6 +352,7 @@ static void copy_frame(YV12_BUFFER_CONFIG dest, const YV12_BUFFER_CONFIG src) { int r; const uint8_t *srcbuf = src.y_buffer; uint8_t *destbuf = dest.y_buffer; + assert(dest.y_width == src.y_width); assert(dest.y_height == src.y_height); @@ -362,13 +363,13 @@ static void copy_frame(YV12_BUFFER_CONFIG dest, const YV12_BUFFER_CONFIG src) { } } -static void swap_frame_buffer(YV12_BUFFER_CONFIG dest, - YV12_BUFFER_CONFIG src) { - uint8_t *tmp_buf = dest.y_buffer; - assert(dest.y_width == src.y_width); - assert(dest.y_height == src.y_height); - dest.y_buffer = src.y_buffer; - src.y_buffer = tmp_buf; +static void swap_frame_buffer(YV12_BUFFER_CONFIG *dest, + YV12_BUFFER_CONFIG *src) { + uint8_t *tmp_buf = dest->y_buffer; + assert(dest->y_width == src->y_width); + assert(dest->y_height == src->y_height); + dest->y_buffer = src->y_buffer; + src->y_buffer = tmp_buf; } void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser, @@ -387,16 +388,16 @@ void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser, /* For non key frames */ if (refresh_alt_ref_frame) { - swap_frame_buffer(denoiser->running_avg_y[ALTREF_FRAME], - denoiser->running_avg_y[INTRA_FRAME]); + swap_frame_buffer(&denoiser->running_avg_y[ALTREF_FRAME], + &denoiser->running_avg_y[INTRA_FRAME]); } if (refresh_golden_frame) { - swap_frame_buffer(denoiser->running_avg_y[GOLDEN_FRAME], - denoiser->running_avg_y[INTRA_FRAME]); + swap_frame_buffer(&denoiser->running_avg_y[GOLDEN_FRAME], + &denoiser->running_avg_y[INTRA_FRAME]); } if (refresh_last_frame) { - swap_frame_buffer(denoiser->running_avg_y[LAST_FRAME], - denoiser->running_avg_y[INTRA_FRAME]); + swap_frame_buffer(&denoiser->running_avg_y[LAST_FRAME], + &denoiser->running_avg_y[INTRA_FRAME]); } } |