History

lavc/hevcdec: rename HEVCContext.ref to cur_frame

Since it stores a pointer to the current frame.

Anton Khirnov committed 2 years ago

Commit 92265141 parent 7ad940014 files · +138 −138Browse files

Showing the changes to libavcodec/mips (1 of 14 files). Show all

Unified · Split

libavcodec/mips/hevcpred_msa.c+34−34
@@ -1980,7 +1980,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 1979 unmodified lines
19801980 cand_bottom_left = 0;
19811981 for (i = 0; i < max; i += 2)
19821982 cand_bottom_left |=
1983− ((s->ref->tab_mvf[(x_left_pu) +
1983+ ((s->cur_frame->tab_mvf[(x_left_pu) +
19841984 (y_bottom_pu +
19851985 i) * min_pu_width]).pred_flag ==
19861986 PF_INTRA);
@@ -1996,7 +1996,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 9 unmodified lines
19961996 cand_left = 0;
19971997 for (i = 0; i < max; i += 2)
19981998 cand_left |=
1999− ((s->ref->tab_mvf[(x_left_pu) +
1999+ ((s->cur_frame->tab_mvf[(x_left_pu) +
20002000 (y_left_pu +
20012001 i) * min_pu_width]).pred_flag ==
20022002 PF_INTRA);
@@ -2005,7 +2005,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 2 unmodified lines
20052005 int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);
20062006 int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);
20072007 cand_up_left =
2008− (s->ref->tab_mvf[(x_left_pu) +
2008+ (s->cur_frame->tab_mvf[(x_left_pu) +
20092009 (y_top_pu) * min_pu_width]).pred_flag ==
20102010 PF_INTRA;
20112011 }
@@ -2020,7 +2020,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 8 unmodified lines
20202020 cand_up = 0;
20212021 for (i = 0; i < max; i += 2)
20222022 cand_up |=
2023− ((s->ref->tab_mvf[(x_top_pu + i) +
2023+ ((s->cur_frame->tab_mvf[(x_top_pu + i) +
20242024 (y_top_pu) *
20252025 min_pu_width]).pred_flag == PF_INTRA);
20262026 }
@@ -2036,7 +2036,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 9 unmodified lines
20362036 cand_up_right = 0;
20372037 for (i = 0; i < max; i += 2)
20382038 cand_up_right |=
2039− ((s->ref->tab_mvf[(x_right_pu + i) +
2039+ ((s->cur_frame->tab_mvf[(x_right_pu + i) +
20402040 (y_top_pu) *
20412041 min_pu_width]).pred_flag == PF_INTRA);
20422042 }
@@ -2107,7 +2107,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 64 unmodified lines
21072107 if (cand_bottom_left || cand_left || cand_up_left) {
21082108 while (j > -1
21092109 &&
2110− !((s->ref->tab_mvf[(((x0 +
2110+ !((s->cur_frame->tab_mvf[(((x0 +
21112111 ((-1) << hshift)) >> s->ps.sps->
21122112 log2_min_pu_size)) + (((y0 +
21132113 ((j) <<
@@ -2118,7 +2118,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 4 unmodified lines
21182118 PF_INTRA))
21192119 j--;
21202120 if (!
2121− ((s->ref->tab_mvf[(((x0 +
2121+ ((s->cur_frame->tab_mvf[(((x0 +
21222122 ((-1) << hshift)) >> s->ps.sps->
21232123 log2_min_pu_size)) + (((y0 + ((j)
21242124 <<
@@ -2129,7 +2129,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 4 unmodified lines
21292129 j = 0;
21302130 while (j < size_max_x
21312131 &&
2132− !((s->ref->tab_mvf[(((x0 +
2132+ !((s->cur_frame->tab_mvf[(((x0 +
21332133 ((j) << hshift)) >> s->ps.sps->
21342134 log2_min_pu_size)) + (((y0 +
21352135 ((-1) <<
@@ -2142,7 +2142,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 6 unmodified lines
21422142 j++;
21432143 for (i = j; i > (j) - (j + 1); i--)
21442144 if (!
2145− ((s->ref->tab_mvf[(((x0 +
2145+ ((s->cur_frame->tab_mvf[(((x0 +
21462146 ((i -
21472147 1) << hshift)) >> s->ps.sps->
21482148 log2_min_pu_size)) + (((y0 +
@@ -2160,7 +2160,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 11 unmodified lines
21602160 j = 0;
21612161 while (j < size_max_x
21622162 &&
2163− !((s->ref->tab_mvf[(((x0 +
2163+ !((s->cur_frame->tab_mvf[(((x0 +
21642164 ((j) << hshift)) >> s->ps.sps->
21652165 log2_min_pu_size)) + (((y0 + ((-1)
21662166 <<
@@ -2174,7 +2174,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 7 unmodified lines
21742174 if (x0 > 0) {
21752175 for (i = j; i > (j) - (j + 1); i--)
21762176 if (!
2177− ((s->ref->tab_mvf[(((x0 +
2177+ ((s->cur_frame->tab_mvf[(((x0 +
21782178 ((i -
21792179 1) << hshift)) >>
21802180 s->ps.sps->log2_min_pu_size))
@@ -2189,7 +2189,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 8 unmodified lines
21892189 } else {
21902190 for (i = j; i > (j) - (j); i--)
21912191 if (!
2192− ((s->ref->tab_mvf[(((x0 +
2192+ ((s->cur_frame->tab_mvf[(((x0 +
21932193 ((i -
21942194 1) << hshift)) >>
21952195 s->ps.sps->log2_min_pu_size))
@@ -2210,7 +2210,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 14 unmodified lines
22102210 a = ((left[-1]) * 0x01010101U);
22112211 for (i = 0; i < (0) + (size_max_y); i += 4)
22122212 if (!
2213− ((s->ref->tab_mvf[(((x0 +
2213+ ((s->cur_frame->tab_mvf[(((x0 +
22142214 ((-1) << hshift)) >> s->ps.sps->
22152215 log2_min_pu_size)) + (((y0 +
22162216 ((i) <<
@@ -2239,7 +2239,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 22 unmodified lines
22392239 for (i = (size_max_y - 1);
22402240 i > (size_max_y - 1) - (size_max_y); i -= 4)
22412241 if (!
2242− ((s->ref->tab_mvf[(((x0 +
2242+ ((s->cur_frame->tab_mvf[(((x0 +
22432243 ((-1) << hshift)) >> s->ps.sps->
22442244 log2_min_pu_size)) + (((y0 +
22452245 ((i -
@@ -2253,7 +2253,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 7 unmodified lines
22532253 else
22542254 a = ((left[i - 3]) * 0x01010101U);
22552255 if (!
2256− ((s->ref->tab_mvf[(((x0 +
2256+ ((s->cur_frame->tab_mvf[(((x0 +
22572257 ((-1) << hshift)) >> s->ps.sps->
22582258 log2_min_pu_size)) + (((y0 + ((-1)
22592259 <<
@@ -2273,7 +2273,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 13 unmodified lines
22732273 for (i = (size_max_y - 1);
22742274 i > (size_max_y - 1) - (size_max_y); i -= 4)
22752275 if (!
2276− ((s->ref->tab_mvf[(((x0 +
2276+ ((s->cur_frame->tab_mvf[(((x0 +
22772277 ((-1) << hshift)) >> s->ps.sps->
22782278 log2_min_pu_size)) + (((y0 +
22792279 ((i -
@@ -2292,7 +2292,7 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 12 unmodified lines
22922292 a = ((left[-1]) * 0x01010101U);
22932293 for (i = 0; i < (0) + (size_max_x); i += 4)
22942294 if (!
2295− ((s->ref->tab_mvf[(((x0 +
2295+ ((s->cur_frame->tab_mvf[(((x0 +
22962296 ((i) << hshift)) >> s->ps.sps->
22972297 log2_min_pu_size)) + (((y0 + ((-1)
22982298 <<
@@ -2497,7 +2497,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 198 unmodified lines
24972497 cand_bottom_left = 0;
24982498 for (i = 0; i < max; i += 2)
24992499 cand_bottom_left |=
2500− ((s->ref->tab_mvf[(x_left_pu) +
2500+ ((s->cur_frame->tab_mvf[(x_left_pu) +
25012501 (y_bottom_pu +
25022502 i) * min_pu_width]).pred_flag ==
25032503 PF_INTRA);
@@ -2513,7 +2513,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 9 unmodified lines
25132513 cand_left = 0;
25142514 for (i = 0; i < max; i += 2)
25152515 cand_left |=
2516− ((s->ref->tab_mvf[(x_left_pu) +
2516+ ((s->cur_frame->tab_mvf[(x_left_pu) +
25172517 (y_left_pu +
25182518 i) * min_pu_width]).pred_flag ==
25192519 PF_INTRA);
@@ -2522,7 +2522,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 2 unmodified lines
25222522 int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);
25232523 int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);
25242524 cand_up_left =
2525− (s->ref->tab_mvf[(x_left_pu) +
2525+ (s->cur_frame->tab_mvf[(x_left_pu) +
25262526 (y_top_pu) * min_pu_width]).pred_flag ==
25272527 PF_INTRA;
25282528 }
@@ -2537,7 +2537,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 8 unmodified lines
25372537 cand_up = 0;
25382538 for (i = 0; i < max; i += 2)
25392539 cand_up |=
2540− ((s->ref->tab_mvf[(x_top_pu + i) +
2540+ ((s->cur_frame->tab_mvf[(x_top_pu + i) +
25412541 (y_top_pu) *
25422542 min_pu_width]).pred_flag == PF_INTRA);
25432543 }
@@ -2553,7 +2553,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 9 unmodified lines
25532553 cand_up_right = 0;
25542554 for (i = 0; i < max; i += 2)
25552555 cand_up_right |=
2556− ((s->ref->tab_mvf[(x_right_pu + i) +
2556+ ((s->cur_frame->tab_mvf[(x_right_pu + i) +
25572557 (y_top_pu) *
25582558 min_pu_width]).pred_flag == PF_INTRA);
25592559 }
@@ -2622,7 +2622,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 62 unmodified lines
26222622 if (cand_bottom_left || cand_left || cand_up_left) {
26232623 while (j > -1
26242624 &&
2625− !((s->ref->tab_mvf[(((x0 +
2625+ !((s->cur_frame->tab_mvf[(((x0 +
26262626 ((-1) << hshift)) >> s->ps.sps->
26272627 log2_min_pu_size)) + (((y0 +
26282628 ((j) <<
@@ -2633,7 +2633,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 4 unmodified lines
26332633 PF_INTRA))
26342634 j--;
26352635 if (!
2636− ((s->ref->tab_mvf[(((x0 +
2636+ ((s->cur_frame->tab_mvf[(((x0 +
26372637 ((-1) << hshift)) >> s->ps.sps->
26382638 log2_min_pu_size)) + (((y0 + ((j)
26392639 <<
@@ -2644,7 +2644,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 4 unmodified lines
26442644 j = 0;
26452645 while (j < size_max_x
26462646 &&
2647− !((s->ref->tab_mvf[(((x0 +
2647+ !((s->cur_frame->tab_mvf[(((x0 +
26482648 ((j) << hshift)) >> s->ps.sps->
26492649 log2_min_pu_size)) + (((y0 +
26502650 ((-1) <<
@@ -2657,7 +2657,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 6 unmodified lines
26572657 j++;
26582658 for (i = j; i > (j) - (j + 1); i--)
26592659 if (!
2660− ((s->ref->tab_mvf[(((x0 +
2660+ ((s->cur_frame->tab_mvf[(((x0 +
26612661 ((i -
26622662 1) << hshift)) >> s->ps.sps->
26632663 log2_min_pu_size)) + (((y0 +
@@ -2675,7 +2675,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 11 unmodified lines
26752675 j = 0;
26762676 while (j < size_max_x
26772677 &&
2678− !((s->ref->tab_mvf[(((x0 +
2678+ !((s->cur_frame->tab_mvf[(((x0 +
26792679 ((j) << hshift)) >> s->ps.sps->
26802680 log2_min_pu_size)) + (((y0 + ((-1)
26812681 <<
@@ -2689,7 +2689,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 7 unmodified lines
26892689 if (x0 > 0) {
26902690 for (i = j; i > (j) - (j + 1); i--)
26912691 if (!
2692− ((s->ref->tab_mvf[(((x0 +
2692+ ((s->cur_frame->tab_mvf[(((x0 +
26932693 ((i -
26942694 1) << hshift)) >>
26952695 s->ps.sps->log2_min_pu_size))
@@ -2704,7 +2704,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 8 unmodified lines
27042704 } else {
27052705 for (i = j; i > (j) - (j); i--)
27062706 if (!
2707− ((s->ref->tab_mvf[(((x0 +
2707+ ((s->cur_frame->tab_mvf[(((x0 +
27082708 ((i -
27092709 1) << hshift)) >>
27102710 s->ps.sps->log2_min_pu_size))
@@ -2725,7 +2725,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 14 unmodified lines
27252725 a = ((left[-1]) * 0x01010101U);
27262726 for (i = 0; i < (0) + (size_max_y); i += 4)
27272727 if (!
2728− ((s->ref->tab_mvf[(((x0 +
2728+ ((s->cur_frame->tab_mvf[(((x0 +
27292729 ((-1) << hshift)) >> s->ps.sps->
27302730 log2_min_pu_size)) + (((y0 +
27312731 ((i) <<
@@ -2753,7 +2753,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 21 unmodified lines
27532753 for (i = (size_max_y - 1);
27542754 i > (size_max_y - 1) - (size_max_y); i -= 4)
27552755 if (!
2756− ((s->ref->tab_mvf[(((x0 +
2756+ ((s->cur_frame->tab_mvf[(((x0 +
27572757 ((-1) << hshift)) >> s->ps.sps->
27582758 log2_min_pu_size)) + (((y0 +
27592759 ((i -
@@ -2767,7 +2767,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 7 unmodified lines
27672767 else
27682768 a = ((left[i - 3]) * 0x01010101U);
27692769 if (!
2770− ((s->ref->tab_mvf[(((x0 +
2770+ ((s->cur_frame->tab_mvf[(((x0 +
27712771 ((-1) << hshift)) >> s->ps.sps->
27722772 log2_min_pu_size)) + (((y0 + ((-1)
27732773 <<
@@ -2787,7 +2787,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 13 unmodified lines
27872787 for (i = (size_max_y - 1);
27882788 i > (size_max_y - 1) - (size_max_y); i -= 4)
27892789 if (!
2790− ((s->ref->tab_mvf[(((x0 +
2790+ ((s->cur_frame->tab_mvf[(((x0 +
27912791 ((-1) << hshift)) >> s->ps.sps->
27922792 log2_min_pu_size)) + (((y0 +
27932793 ((i -
@@ -2806,7 +2806,7 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx) · 12 unmodified lines
28062806 a = ((left[-1]) * 0x01010101U);
28072807 for (i = 0; i < (0) + (size_max_x); i += 4)
28082808 if (!
2809− ((s->ref->tab_mvf[(((x0 +
2809+ ((s->cur_frame->tab_mvf[(((x0 +
28102810 ((i) << hshift)) >> s->ps.sps->
28112811 log2_min_pu_size)) + (((y0 + ((-1)
28122812 <<

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