diff options
| author | Marco <marpan@google.com> | 2015-03-12 17:19:43 -0700 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2015-03-13 11:10:02 -0700 |
| commit | e38066a74df096a92f8a14734a632ae360bcb144 (patch) | |
| tree | 44bdd17a27997923b7e56ac7298be4b69eb99206 /vp9/encoder/vp9_encodeframe.c | |
| parent | deaf661f4548fe29c322801e169bfcfb14f4997a (diff) | |
| download | libvpx-e38066a74df096a92f8a14734a632ae360bcb144.tar libvpx-e38066a74df096a92f8a14734a632ae360bcb144.tar.gz libvpx-e38066a74df096a92f8a14734a632ae360bcb144.tar.bz2 libvpx-e38066a74df096a92f8a14734a632ae360bcb144.zip | |
Fix crash with vp9 denoiser on.
Crash occured on very first key frame, because denoiser
temporal function was beng entered.
Updated denoiser unittest to set cpu_used from first frame,
and verified fix fixes the crash.
Change-Id: I3be1124b52846fbbe7248d2c3d6136e086c80bc1
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 18a3734a7..724d0e761 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1592,7 +1592,8 @@ static void encode_b_rt(VP9_COMP *cpi, ThreadData *td, update_state_rt(cpi, td, ctx, mi_row, mi_col, bsize); #if CONFIG_VP9_TEMPORAL_DENOISING - if (cpi->oxcf.noise_sensitivity > 0 && output_enabled) { + if (cpi->oxcf.noise_sensitivity > 0 && output_enabled && + cpi->common.frame_type != KEY_FRAME) { vp9_denoiser_denoise(&cpi->denoiser, x, mi_row, mi_col, MAX(BLOCK_8X8, bsize), ctx); } |