diff mbox series

[FFmpeg-devel,1/3] avcodec/hevc_mvs: Cleanup ff_hevc_set_neighbour_available()

Message ID 20201016113029.25585-1-michael@niedermayer.cc
State Accepted
Commit 060e1ad69d4d3e6b6c15de842a406ce310abd100
Headers show
Series [FFmpeg-devel,1/3] avcodec/hevc_mvs: Cleanup ff_hevc_set_neighbour_available() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Michael Niedermayer Oct. 16, 2020, 11:30 a.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/hevc_mvs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer Oct. 17, 2020, 12:40 p.m. UTC | #1 
On Fri, Oct 16, 2020 at 01:30:27PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/hevc_mvs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

will apply patchset

[...]
diff mbox series

Patch

diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index fd0dbd9a56..1f6ca5a314 100644
--- a/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@ -48,9 +48,9 @@  void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0,
 
     lc->na.cand_up       = (lc->ctb_up_flag   || y0b);
     lc->na.cand_left     = (lc->ctb_left_flag || x0b);
-    lc->na.cand_up_left  = (!x0b && !y0b) ? lc->ctb_up_left_flag : lc->na.cand_left && lc->na.cand_up;
+    lc->na.cand_up_left  = (x0b || y0b) ? lc->na.cand_left && lc->na.cand_up : lc->ctb_up_left_flag;
     lc->na.cand_up_right_sap =
-            ((x0b + nPbW) == (1 << s->ps.sps->log2_ctb_size)) ?
+            (x0b + nPbW == 1 << s->ps.sps->log2_ctb_size) ?
                     lc->ctb_up_right_flag && !y0b : lc->na.cand_up;
     lc->na.cand_up_right =
             lc->na.cand_up_right_sap