Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/rv60: simplify fill_mv_skip_cand

Browse Source
pull/391/head
Peter Ross 4 months ago
parent 566b737a7a
commit f7e7d63cbc
1 changed files with 17 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      libavcodec/rv60dec.c

54
libavcodec/rv60dec.c
Unescape View File

@ -862,50 +862,30 @@ static int get_skip_mv_index(enum MVRefEnum mvref)
} }
} }
static int mvinfo_valid(const MVInfo * mvi) static void add_if_valid(unique_list_mvinfo * skip_cand, const MVInfo * mvi)
{ {
return mvi->mvref != MVREF_NONE; if (mvi->mvref != MVREF_NONE)
unique_list_mvinfo_add(skip_cand, *mvi);
} }
static void fill_mv_skip_cand(RV60Context * s, const CUContext * cu, unique_list_mvinfo * skip_cand, int size) static void fill_mv_skip_cand(RV60Context * s, const CUContext * cu, unique_list_mvinfo * skip_cand, int size)
{ {
int mv_size = size >> 2; int mv_size = size >> 2;
if (cu->xpos > 0) { if (cu->xpos)
const MVInfo * mv = &s->blk_info[cu->blk_pos - 1].mv; add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - 1].mv);
if (mvinfo_valid(mv)) if (cu->ypos)
unique_list_mvinfo_add(skip_cand, *mv); add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride].mv);
} if (cu->ypos && cu->xpos + size < s->awidth)
if (cu->ypos > 0) { add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride + mv_size].mv);
const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride].mv; if (cu->xpos && cu->ypos + size < s->aheight)
if (mvinfo_valid(mv)) add_if_valid(skip_cand, &s->blk_info[cu->blk_pos + s->blk_stride * mv_size - 1].mv);
unique_list_mvinfo_add(skip_cand, *mv); if (cu->xpos)
} add_if_valid(skip_cand, &s->blk_info[cu->blk_pos + s->blk_stride * (mv_size - 1) - 1].mv);
if (cu->ypos > 0 && cu->xpos + size < s->awidth) { if (cu->ypos)
const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride + mv_size].mv; add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride + mv_size - 1].mv);
if (mvinfo_valid(mv)) if (cu->xpos && cu->ypos)
unique_list_mvinfo_add(skip_cand, *mv); add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride - 1].mv);
}
if (cu->xpos > 0 && cu->ypos + size < s->aheight) {
const MVInfo * mv = &s->blk_info[cu->blk_pos + s->blk_stride * mv_size - 1].mv;
if (mvinfo_valid(mv))
unique_list_mvinfo_add(skip_cand, *mv);
}
if (has_left_block(s, cu->xpos, cu->ypos, 0, 0, size)) {
const MVInfo * mv = &s->blk_info[cu->blk_pos + s->blk_stride * (mv_size - 1) - 1].mv;
if (mvinfo_valid(mv))
unique_list_mvinfo_add(skip_cand, *mv);
}
if (has_top_block(s, cu->xpos, cu->ypos, 0, 0, size)) {
const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride + mv_size - 1].mv;
if (mvinfo_valid(mv))
unique_list_mvinfo_add(skip_cand, *mv);
}
if (cu->xpos > 0 && cu->ypos > 0) {
const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride - 1].mv;
if (mvinfo_valid(mv))
unique_list_mvinfo_add(skip_cand, *mv);
}
for (int i = skip_cand->size; i < 4; i++) for (int i = skip_cand->size; i < 4; i++)
skip_cand->list[i] = (MVInfo){.mvref=MVREF_REF0,.f_mv={0,0},.b_mv={0,0}}; skip_cand->list[i] = (MVInfo){.mvref=MVREF_REF0,.f_mv={0,0},.b_mv={0,0}};

Write Preview
Loading…
Cancel
Save