Unified · Split
| @@ -309,8 +309,8 @@ static int update_dimensions_clear_info(RV60Context *s, int width, int height) · 308 unmodified lines | |||
| 309 | return ret; | 309 | return ret; |
| 310 | 310 | ||
| 311 | for (int j = 0; j < s->cu_height << 4; j++) | 311 | for (int j = 0; j < s->cu_height << 4; j++) |
| 312 | for (int i = 0; i < s->cu_width << 4; i++) | 312 | for (int i = 0; i < s->cu_width << 4; i++) |
| 313 | s->blk_info[j*s->blk_stride + i].mv.mvref = MVREF_NONE; | 313 | s->blk_info[j*s->blk_stride + i].mv.mvref = MVREF_NONE; |
| 314 | 314 | ||
| 315 | if (s->deblock) { | 315 | if (s->deblock) { |
| 316 | int size; | 316 | int size; |
| @@ -335,7 +335,7 @@ static int update_dimensions_clear_info(RV60Context *s, int width, int height) · 18 unmodified lines | |||
| 335 | static int read_code012(GetBitContext * gb) | 335 | static int read_code012(GetBitContext * gb) |
| 336 | { | 336 | { |
| 337 | if (!get_bits1(gb)) | 337 | if (!get_bits1(gb)) |
| 338 | return 0; | 338 | return 0; |
| 339 | return get_bits1(gb) + 1; | 339 | return get_bits1(gb) + 1; |
| 340 | } | 340 | } |
| 341 | 341 | ||
| @@ -1400,10 +1400,10 @@ static void avg_plane(uint8_t * dst, int dst_stride, const uint8_t * src, int sr · 1058 unmodified lines | |||
| 1400 | static void avg(AVFrame * frame, uint8_t * prev_frame_data[3], int prev_frame_linesize[3], int x, int y, int w, int h) | 1400 | static void avg(AVFrame * frame, uint8_t * prev_frame_data[3], int prev_frame_linesize[3], int x, int y, int w, int h) |
| 1401 | { | 1401 | { |
| 1402 | for (int plane = 0; plane < 3; plane++) { | 1402 | for (int plane = 0; plane < 3; plane++) { |
| 1403 | int shift = !plane ? 0 : 1; | 1403 | int shift = !plane ? 0 : 1; |
| 1404 | avg_plane(frame->data[plane] + (y >> shift) * frame->linesize[plane] + (x >> shift), frame->linesize[plane], | 1404 | avg_plane(frame->data[plane] + (y >> shift) * frame->linesize[plane] + (x >> shift), frame->linesize[plane], |
| 1405 | prev_frame_data[plane], prev_frame_linesize[plane], | 1405 | prev_frame_data[plane], prev_frame_linesize[plane], |
| 1406 | w >> shift, h >> shift); | 1406 | w >> shift, h >> shift); |
| 1407 | } | 1407 | } |
| 1408 | } | 1408 | } |
| 1409 | 1409 | ||
| @@ -2151,7 +2151,7 @@ static void deblock_cu_r(RV60Context * s, AVFrame * frame, ThreadContext * threa · 741 unmodified lines | |||
| 2151 | enum CUType cu_type; | 2151 | enum CUType cu_type; |
| 2152 | 2152 | ||
| 2153 | if (xpos >= s->awidth || ypos >= s->aheight) | 2153 | if (xpos >= s->awidth || ypos >= s->aheight) |
| 2154 | return; | 2154 | return; |
| 2155 | 2155 | ||
| 2156 | if (thread->cu_split[thread->cu_split_pos++]) { | 2156 | if (thread->cu_split[thread->cu_split_pos++]) { |
| 2157 | int hsize = 1 << (log_size - 1); | 2157 | int hsize = 1 << (log_size - 1); |