[SCM] libav/experimental: hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:04:16 UTC 2014


The following commit has been merged in the experimental branch:
commit 52a2c17ec006282f388071a831dfb21288611253
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sun Jul 27 18:52:12 2014 +0000

    hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()
    
    It makes no sense and cannot happen in any place from which this
    function is called.

diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index c924227..658ead7 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -51,16 +51,12 @@ void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags)
 
 RefPicList *ff_hevc_get_ref_list(HEVCContext *s, HEVCFrame *ref, int x0, int y0)
 {
-    if (x0 < 0 || y0 < 0) {
-        return s->ref->refPicList;
-    } else {
-        int x_cb         = x0 >> s->sps->log2_ctb_size;
-        int y_cb         = y0 >> s->sps->log2_ctb_size;
-        int pic_width_cb = (s->sps->width + (1 << s->sps->log2_ctb_size) - 1) >>
-                           s->sps->log2_ctb_size;
-        int ctb_addr_ts  = s->pps->ctb_addr_rs_to_ts[y_cb * pic_width_cb + x_cb];
-        return (RefPicList *)ref->rpl_tab[ctb_addr_ts];
-    }
+    int x_cb         = x0 >> s->sps->log2_ctb_size;
+    int y_cb         = y0 >> s->sps->log2_ctb_size;
+    int pic_width_cb = (s->sps->width + (1 << s->sps->log2_ctb_size) - 1) >>
+        s->sps->log2_ctb_size;
+    int ctb_addr_ts  = s->pps->ctb_addr_rs_to_ts[y_cb * pic_width_cb + x_cb];
+    return (RefPicList *)ref->rpl_tab[ctb_addr_ts];
 }
 
 void ff_hevc_clear_refs(HEVCContext *s)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list