shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Moving get_tx_eob() from common to encoder."

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -328,13 +328,6 @@

                       BLOCK_SIZE plane_bsize, TX_SIZE tx_size, int has_eob,

                       int aoff, int loff);

-

-static INLINE int get_tx_eob(const struct segmentation *seg, int segment_id,

-                             TX_SIZE tx_size) {

-  const int eob_max = 16 << (tx_size << 1);

-  return vp9_segfeature_active(seg, segment_id, SEG_LVL_SKIP) ? 0 : eob_max;

-}

-

 #ifdef __cplusplus

 }  // extern "C"

 #endif

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -199,6 +199,12 @@

   ++counts[token];

 }

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

+                             TX_SIZE tx_size) {

+  const int eob_max = 16 << (tx_size << 1);

+  return vp9_segfeature_active(seg, segment_id, SEG_LVL_SKIP) ? 0 : eob_max;

+}

+

 static void tokenize_b(int plane, int block, BLOCK_SIZE plane_bsize,

                        TX_SIZE tx_size, void *arg) {

   struct tokenize_b_args* const args = arg;

-- 

⑨