shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "inline vp9_get_segdata()"

--- a/vp9/common/vp9_loopfilter.c

+++ b/vp9/common/vp9_loopfilter.c

@@ -268,7 +268,7 @@

   for (seg_id = 0; seg_id < MAX_SEGMENTS; seg_id++) {

     int lvl_seg = default_filt_lvl;

     if (segfeature_active(seg, seg_id, SEG_LVL_ALT_LF)) {

-      const int data = vp9_get_segdata(seg, seg_id, SEG_LVL_ALT_LF);

+      const int data = get_segdata(seg, seg_id, SEG_LVL_ALT_LF);

       lvl_seg = clamp(seg->abs_delta == SEGMENT_ABSDATA ?

                       data : default_filt_lvl + data,

                       0, MAX_LOOP_FILTER);

--- a/vp9/common/vp9_quant_common.c

+++ b/vp9/common/vp9_quant_common.c

@@ -267,7 +267,7 @@

 int vp9_get_qindex(const struct segmentation *seg, int segment_id,

                    int base_qindex) {

   if (segfeature_active(seg, segment_id, SEG_LVL_ALT_Q)) {

-    const int data = vp9_get_segdata(seg, segment_id, SEG_LVL_ALT_Q);

+    const int data = get_segdata(seg, segment_id, SEG_LVL_ALT_Q);

     const int seg_qindex = seg->abs_delta == SEGMENT_ABSDATA ?

         data : base_qindex + data;

     return clamp(seg_qindex, 0, MAXQ);

--- a/vp9/common/vp9_seg_common.c

+++ b/vp9/common/vp9_seg_common.c

@@ -54,12 +54,6 @@

   seg->feature_data[segment_id][feature_id] = seg_data;

 }

-int vp9_get_segdata(const struct segmentation *seg, int segment_id,

-                    SEG_LVL_FEATURES feature_id) {

-  return seg->feature_data[segment_id][feature_id];

-}

-

-

 const vp9_tree_index vp9_segment_tree[TREE_SIZE(MAX_SEGMENTS)] = {

   2,  4,  6,  8, 10, 12,

   0, -1, -2, -3, -4, -5, -6, -7

--- a/vp9/common/vp9_seg_common.h

+++ b/vp9/common/vp9_seg_common.h

@@ -71,9 +71,10 @@

                      SEG_LVL_FEATURES feature_id,

                      int seg_data);

-int vp9_get_segdata(const struct segmentation *seg,

-                    int segment_id,

-                    SEG_LVL_FEATURES feature_id);

+static INLINE int get_segdata(const struct segmentation *seg, int segment_id,

+                              SEG_LVL_FEATURES feature_id) {

+  return seg->feature_data[segment_id][feature_id];

+}

 extern const vp9_tree_index vp9_segment_tree[TREE_SIZE(MAX_SEGMENTS)];

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -308,8 +308,8 @@

   FRAME_COUNTS *counts = xd->counts;

   if (segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {

-    ref_frame[0] = (MV_REFERENCE_FRAME)vp9_get_segdata(&cm->seg, segment_id,

-                                                       SEG_LVL_REF_FRAME);

+    ref_frame[0] = (MV_REFERENCE_FRAME)get_segdata(&cm->seg, segment_id,

+                                                   SEG_LVL_REF_FRAME);

     ref_frame[1] = NONE;

   } else {

     const REFERENCE_MODE mode = read_block_reference_mode(cm, xd, r);

@@ -445,8 +445,7 @@

 static int read_is_inter_block(VP9_COMMON *const cm, MACROBLOCKD *const xd,

                                int segment_id, vp9_reader *r) {

   if (segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {

-    return vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME) !=

-           INTRA_FRAME;

+    return get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME) != INTRA_FRAME;

   } else {

     const int ctx = vp9_get_intra_inter_context(xd);

     const int is_inter = vp9_read(r, cm->fc->intra_inter_prob[ctx]);

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -210,7 +210,7 @@

   if (segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {

     assert(!is_compound);

     assert(mbmi->ref_frame[0] ==

-               vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME));

+               get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME));

   } else {

     // does the feature use compound prediction or not

     // (if not specified at the frame/segment level)

@@ -790,7 +790,7 @@

         const int active = segfeature_active(seg, i, j);

         vp9_wb_write_bit(wb, active);

         if (active) {

-          const int data = vp9_get_segdata(seg, i, j);

+          const int data = get_segdata(seg, i, j);

           const int data_max = vp9_seg_feature_data_max(j);

           if (vp9_is_segfeature_signed(j)) {

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1693,7 +1693,7 @@

     // If the segment reference frame feature is enabled....

     // then do nothing if the current ref frame is not allowed..

     if (segfeature_active(seg, segment_id, SEG_LVL_REF_FRAME) &&

-        vp9_get_segdata(seg, segment_id, SEG_LVL_REF_FRAME) != (int)ref_frame)

+        get_segdata(seg, segment_id, SEG_LVL_REF_FRAME) != (int)ref_frame)

       continue;

     mbmi->ref_frame[0] = ref_frame;

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -3008,7 +3008,7 @@

     // If the segment reference frame feature is enabled....

     // then do nothing if the current ref frame is not allowed..

     if (segfeature_active(seg, segment_id, SEG_LVL_REF_FRAME) &&

-        vp9_get_segdata(seg, segment_id, SEG_LVL_REF_FRAME) != (int)ref_frame) {

+        get_segdata(seg, segment_id, SEG_LVL_REF_FRAME) != (int)ref_frame) {

       ref_frame_skip_mask[0] |= (1 << ref_frame);

       ref_frame_skip_mask[1] |= SECOND_REF_FRAME_MASK;

     }

@@ -3876,7 +3876,7 @@

     // If the segment reference frame feature is enabled....

     // then do nothing if the current ref frame is not allowed..

     if (segfeature_active(seg, segment_id, SEG_LVL_REF_FRAME) &&

-        vp9_get_segdata(seg, segment_id, SEG_LVL_REF_FRAME) != (int)ref_frame) {

+        get_segdata(seg, segment_id, SEG_LVL_REF_FRAME) != (int)ref_frame) {

       continue;

     // Disable this drop out case if the ref frame

     // segment level feature is enabled for this segment. This is to

-- 

⑨