History

avcodec/rv60: simplify fill_mv_skip_cand

Peter Ross committed 1 year ago

Commit f7e7d631 parent 566b7371 file · +17 −37Browse files

Unified · Split

libavcodec/rv60dec.c+17−37
@@ -862,50 +862,30 @@ static int get_skip_mv_index(enum MVRefEnum mvref) · 861 unmodified lines
862 }862 }
863}863}
864 864
865static int mvinfo_valid(const MVInfo * mvi)865static void add_if_valid(unique_list_mvinfo * skip_cand, const MVInfo * mvi)
866{866{
867 return mvi->mvref != MVREF_NONE;867 if (mvi->mvref != MVREF_NONE)
868 unique_list_mvinfo_add(skip_cand, *mvi);
868}869}
869 870
870static void fill_mv_skip_cand(RV60Context * s, const CUContext * cu, unique_list_mvinfo * skip_cand, int size)871static void fill_mv_skip_cand(RV60Context * s, const CUContext * cu, unique_list_mvinfo * skip_cand, int size)
871{872{
872 int mv_size = size >> 2;873 int mv_size = size >> 2;
873 874
874 if (cu->xpos > 0) {875 if (cu->xpos)
875 const MVInfo * mv = &s->blk_info[cu->blk_pos - 1].mv;876 add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - 1].mv);
876 if (mvinfo_valid(mv))877 if (cu->ypos)
877 unique_list_mvinfo_add(skip_cand, *mv);878 add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride].mv);
878 }879 if (cu->ypos && cu->xpos + size < s->awidth)
879 if (cu->ypos > 0) {880 add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride + mv_size].mv);
880 const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride].mv;881 if (cu->xpos && cu->ypos + size < s->aheight)
881 if (mvinfo_valid(mv))882 add_if_valid(skip_cand, &s->blk_info[cu->blk_pos + s->blk_stride * mv_size - 1].mv);
882 unique_list_mvinfo_add(skip_cand, *mv);883 if (cu->xpos)
883 }884 add_if_valid(skip_cand, &s->blk_info[cu->blk_pos + s->blk_stride * (mv_size - 1) - 1].mv);
884 if (cu->ypos > 0 && cu->xpos + size < s->awidth) {885 if (cu->ypos)
885 const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride + mv_size].mv;886 add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride + mv_size - 1].mv);
886 if (mvinfo_valid(mv))887 if (cu->xpos && cu->ypos)
887 unique_list_mvinfo_add(skip_cand, *mv);888 add_if_valid(skip_cand, &s->blk_info[cu->blk_pos - s->blk_stride - 1].mv);
888 }
889 if (cu->xpos > 0 && cu->ypos + size < s->aheight) {
890 const MVInfo * mv = &s->blk_info[cu->blk_pos + s->blk_stride * mv_size - 1].mv;
891 if (mvinfo_valid(mv))
892 unique_list_mvinfo_add(skip_cand, *mv);
893 }
894 if (has_left_block(s, cu->xpos, cu->ypos, 0, 0, size)) {
895 const MVInfo * mv = &s->blk_info[cu->blk_pos + s->blk_stride * (mv_size - 1) - 1].mv;
896 if (mvinfo_valid(mv))
897 unique_list_mvinfo_add(skip_cand, *mv);
898 }
899 if (has_top_block(s, cu->xpos, cu->ypos, 0, 0, size)) {
900 const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride + mv_size - 1].mv;
901 if (mvinfo_valid(mv))
902 unique_list_mvinfo_add(skip_cand, *mv);
903 }
904 if (cu->xpos > 0 && cu->ypos > 0) {
905 const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride - 1].mv;
906 if (mvinfo_valid(mv))
907 unique_list_mvinfo_add(skip_cand, *mv);
908 }
909 889
910 for (int i = skip_cand->size; i < 4; i++)890 for (int i = skip_cand->size; i < 4; i++)
911 skip_cand->list[i] = (MVInfo){.mvref=MVREF_REF0,.f_mv={0,0},.b_mv={0,0}};891 skip_cand->list[i] = (MVInfo){.mvref=MVREF_REF0,.f_mv={0,0},.b_mv={0,0}};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t