Commit 943f2c6e authored by michael's avatar michael

fix dequant matrix


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4246 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 839c8be9
...@@ -2066,7 +2066,6 @@ static void render_fragments(Vp3DecodeContext *s, ...@@ -2066,7 +2066,6 @@ static void render_fragments(Vp3DecodeContext *s,
/* set up plane-specific parameters */ /* set up plane-specific parameters */
if (plane == 0) { if (plane == 0) {
dequantizer = s->intra_y_dequant;
output_plane = s->current_frame.data[0]; output_plane = s->current_frame.data[0];
last_plane = s->last_frame.data[0]; last_plane = s->last_frame.data[0];
golden_plane = s->golden_frame.data[0]; golden_plane = s->golden_frame.data[0];
...@@ -2075,7 +2074,6 @@ static void render_fragments(Vp3DecodeContext *s, ...@@ -2075,7 +2074,6 @@ static void render_fragments(Vp3DecodeContext *s,
upper_motion_limit = 7 * s->current_frame.linesize[0]; upper_motion_limit = 7 * s->current_frame.linesize[0];
lower_motion_limit = height * s->current_frame.linesize[0] + width - 8; lower_motion_limit = height * s->current_frame.linesize[0] + width - 8;
} else if (plane == 1) { } else if (plane == 1) {
dequantizer = s->intra_c_dequant;
output_plane = s->current_frame.data[1]; output_plane = s->current_frame.data[1];
last_plane = s->last_frame.data[1]; last_plane = s->last_frame.data[1];
golden_plane = s->golden_frame.data[1]; golden_plane = s->golden_frame.data[1];
...@@ -2084,7 +2082,6 @@ static void render_fragments(Vp3DecodeContext *s, ...@@ -2084,7 +2082,6 @@ static void render_fragments(Vp3DecodeContext *s,
upper_motion_limit = 7 * s->current_frame.linesize[1]; upper_motion_limit = 7 * s->current_frame.linesize[1];
lower_motion_limit = height * s->current_frame.linesize[1] + width - 8; lower_motion_limit = height * s->current_frame.linesize[1] + width - 8;
} else { } else {
dequantizer = s->intra_c_dequant;
output_plane = s->current_frame.data[2]; output_plane = s->current_frame.data[2];
last_plane = s->last_frame.data[2]; last_plane = s->last_frame.data[2];
golden_plane = s->golden_frame.data[2]; golden_plane = s->golden_frame.data[2];
...@@ -2172,6 +2169,12 @@ av_log(s->avctx, AV_LOG_ERROR, " help! got beefy vector! (%X, %X)\n", motion_x, ...@@ -2172,6 +2169,12 @@ av_log(s->avctx, AV_LOG_ERROR, " help! got beefy vector! (%X, %X)\n", motion_x,
motion_source + stride + 1 + d, motion_source + stride + 1 + d,
stride, 8); stride, 8);
} }
dequantizer = s->inter_dequant;
}else{
if (plane == 0)
dequantizer = s->intra_y_dequant;
else
dequantizer = s->intra_c_dequant;
} }
/* dequantize the DCT coefficients */ /* dequantize the DCT coefficients */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment