ref: b1dcaf7f1e17af1697dd842521cb1fecf330f221
parent: 7f2daa74a05beee77003ef4288eafb3e3db9a531
parent: 0d1e5a21c4a89bc875e8600c753348963ef7e78a
author: Jerome Jiang <[email protected]>
date: Tue Feb 21 23:44:55 EST 2017
Merge "Fix segmentation fault caused by denoiser working with spatial SVC."
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -1228,7 +1228,7 @@
// Check basic rate targeting for 1 pass CBR SVC with denoising.
// 2 spatial layers and 3 temporal layer. Run CIF clip with 1 thread.
-TEST_P(DatarateOnePassCbrSvc, DISABLED_OnePassCbrSvc2SpatialLayersDenoiserOn) {+TEST_P(DatarateOnePassCbrSvc, OnePassCbrSvc2SpatialLayersDenoiserOn) {cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 500;
cfg_.rc_buf_sz = 1000;
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3000,8 +3000,9 @@
case 6: l = 150; break;
}
if (!cpi->common.postproc_state.limits) {- cpi->common.postproc_state.limits = vpx_calloc(
- cpi->common.width, sizeof(*cpi->common.postproc_state.limits));
+ cpi->common.postproc_state.limits =
+ vpx_calloc(cpi->un_scaled_source->y_width,
+ sizeof(*cpi->common.postproc_state.limits));
}
vp9_denoise(cpi->Source, cpi->Source, l, cpi->common.postproc_state.limits);
}
--- a/vpx_dsp/x86/deblock_sse2.asm
+++ b/vpx_dsp/x86/deblock_sse2.asm
@@ -78,8 +78,8 @@
%endmacro
%macro UPDATE_FLIMIT 0
- movdqa xmm2, XMMWORD PTR [rbx]
- movdqa [rsp], xmm2
+ movdqu xmm2, XMMWORD PTR [rbx]
+ movdqu [rsp], xmm2
add rbx, 16
%endmacro