|
|
@ -309,8 +309,8 @@ static int update_dimensions_clear_info(RV60Context *s, int width, int height) |
|
|
|
return ret; |
|
|
|
return ret; |
|
|
|
|
|
|
|
|
|
|
|
for (int j = 0; j < s->cu_height << 4; j++) |
|
|
|
for (int j = 0; j < s->cu_height << 4; j++) |
|
|
|
for (int i = 0; i < s->cu_width << 4; i++) |
|
|
|
for (int i = 0; i < s->cu_width << 4; i++) |
|
|
|
s->blk_info[j*s->blk_stride + i].mv.mvref = MVREF_NONE; |
|
|
|
s->blk_info[j*s->blk_stride + i].mv.mvref = MVREF_NONE; |
|
|
|
|
|
|
|
|
|
|
|
if (s->deblock) { |
|
|
|
if (s->deblock) { |
|
|
|
int size; |
|
|
|
int size; |
|
|
@ -335,7 +335,7 @@ static int update_dimensions_clear_info(RV60Context *s, int width, int height) |
|
|
|
static int read_code012(GetBitContext * gb) |
|
|
|
static int read_code012(GetBitContext * gb) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!get_bits1(gb)) |
|
|
|
if (!get_bits1(gb)) |
|
|
|
return 0; |
|
|
|
return 0; |
|
|
|
return get_bits1(gb) + 1; |
|
|
|
return get_bits1(gb) + 1; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1400,10 +1400,10 @@ static void avg_plane(uint8_t * dst, int dst_stride, const uint8_t * src, int sr |
|
|
|
static void avg(AVFrame * frame, uint8_t * prev_frame_data[3], int prev_frame_linesize[3], int x, int y, int w, int h) |
|
|
|
static void avg(AVFrame * frame, uint8_t * prev_frame_data[3], int prev_frame_linesize[3], int x, int y, int w, int h) |
|
|
|
{ |
|
|
|
{ |
|
|
|
for (int plane = 0; plane < 3; plane++) { |
|
|
|
for (int plane = 0; plane < 3; plane++) { |
|
|
|
int shift = !plane ? 0 : 1; |
|
|
|
int shift = !plane ? 0 : 1; |
|
|
|
avg_plane(frame->data[plane] + (y >> shift) * frame->linesize[plane] + (x >> shift), frame->linesize[plane], |
|
|
|
avg_plane(frame->data[plane] + (y >> shift) * frame->linesize[plane] + (x >> shift), frame->linesize[plane], |
|
|
|
prev_frame_data[plane], prev_frame_linesize[plane], |
|
|
|
prev_frame_data[plane], prev_frame_linesize[plane], |
|
|
|
w >> shift, h >> shift); |
|
|
|
w >> shift, h >> shift); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -2151,7 +2151,7 @@ static void deblock_cu_r(RV60Context * s, AVFrame * frame, ThreadContext * threa |
|
|
|
enum CUType cu_type; |
|
|
|
enum CUType cu_type; |
|
|
|
|
|
|
|
|
|
|
|
if (xpos >= s->awidth || ypos >= s->aheight) |
|
|
|
if (xpos >= s->awidth || ypos >= s->aheight) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
if (thread->cu_split[thread->cu_split_pos++]) { |
|
|
|
if (thread->cu_split[thread->cu_split_pos++]) { |
|
|
|
int hsize = 1 << (log_size - 1); |
|
|
|
int hsize = 1 << (log_size - 1); |
|
|
|