Fix: Incorrect 'cols' calculation in temporal filter.
Change-Id: I37f10fbe4fbb505c1d34980a59af3e817c287e22
This commit is contained in:
@@ -3218,6 +3218,7 @@ void write_cx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame)
|
|||||||
#if VP8_TEMPORAL_ALT_REF
|
#if VP8_TEMPORAL_ALT_REF
|
||||||
static void vp8cx_temp_blur1_c
|
static void vp8cx_temp_blur1_c
|
||||||
(
|
(
|
||||||
|
VP8_COMP *cpi,
|
||||||
unsigned char **frames,
|
unsigned char **frames,
|
||||||
int frame_count,
|
int frame_count,
|
||||||
unsigned char *src,
|
unsigned char *src,
|
||||||
@@ -3236,17 +3237,16 @@ static void vp8cx_temp_blur1_c
|
|||||||
int modifier = 0;
|
int modifier = 0;
|
||||||
int i, j, k;
|
int i, j, k;
|
||||||
int block_ofset;
|
int block_ofset;
|
||||||
int Cols, Rows;
|
int cols;
|
||||||
unsigned char Shift = (block_size == 16) ? 4 : 3;
|
unsigned char Shift = (block_size == 16) ? 4 : 3;
|
||||||
|
|
||||||
Cols = width / block_size;
|
cols = cpi->common.mb_cols;
|
||||||
Rows = height / block_size;
|
|
||||||
|
|
||||||
for (i = 0; i < height; i++)
|
for (i = 0; i < height; i++)
|
||||||
{
|
{
|
||||||
block_ofset = (i >> Shift) * Cols;
|
block_ofset = (i >> Shift) * cols;
|
||||||
|
|
||||||
for (j = 0; j < Cols; j ++)
|
for (j = 0; j < cols; j ++)
|
||||||
{
|
{
|
||||||
if (motion_map_ptr[block_ofset] > 2)
|
if (motion_map_ptr[block_ofset] > 2)
|
||||||
{
|
{
|
||||||
@@ -3436,6 +3436,7 @@ static void vp8cx_temp_filter_c
|
|||||||
|
|
||||||
// Blur Y
|
// Blur Y
|
||||||
vp8cx_temp_blur1_c(
|
vp8cx_temp_blur1_c(
|
||||||
|
cpi,
|
||||||
cpi->frames,
|
cpi->frames,
|
||||||
frames_to_blur,
|
frames_to_blur,
|
||||||
temp_source_buffer->y_buffer, // cpi->Source->y_buffer,
|
temp_source_buffer->y_buffer, // cpi->Source->y_buffer,
|
||||||
@@ -3460,6 +3461,7 @@ static void vp8cx_temp_filter_c
|
|||||||
|
|
||||||
// Blur U
|
// Blur U
|
||||||
vp8cx_temp_blur1_c(
|
vp8cx_temp_blur1_c(
|
||||||
|
cpi,
|
||||||
cpi->frames,
|
cpi->frames,
|
||||||
frames_to_blur,
|
frames_to_blur,
|
||||||
temp_source_buffer->u_buffer,
|
temp_source_buffer->u_buffer,
|
||||||
@@ -3484,6 +3486,7 @@ static void vp8cx_temp_filter_c
|
|||||||
|
|
||||||
// Blur V
|
// Blur V
|
||||||
vp8cx_temp_blur1_c(
|
vp8cx_temp_blur1_c(
|
||||||
|
cpi,
|
||||||
cpi->frames,
|
cpi->frames,
|
||||||
frames_to_blur,
|
frames_to_blur,
|
||||||
temp_source_buffer->v_buffer,
|
temp_source_buffer->v_buffer,
|
||||||
|
Reference in New Issue
Block a user