Commit 1c75e77b authored by Paul Wilkins's avatar Paul Wilkins

Remove TX size segment feature

Change-Id: I0d226e4cb240caced37230f46905bf69b46e0cce
parent d8ffee45
......@@ -109,8 +109,7 @@ typedef enum {
SEG_LVL_ALT_LF = 1, // Use alternate loop filter value...
SEG_LVL_REF_FRAME = 2, // Optional Segment reference frame
SEG_LVL_SKIP = 3, // Optional Segment (0,0) + skip mode
SEG_LVL_TRANSFORM = 4, // Block transform size.
SEG_LVL_MAX = 5 // Number of MB level features supported
SEG_LVL_MAX = 4 // Number of MB level features supported
} SEG_LVL_FEATURES;
// Segment level features.
......
......@@ -12,9 +12,8 @@
#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_seg_common.h"
static const int segfeaturedata_signed[SEG_LVL_MAX] = { 1, 1, 0, 0, 0 };
static const int seg_feature_data_max[SEG_LVL_MAX] =
{ MAXQ, 63, 0xf, 0xf, TX_SIZE_MAX_SB - 1};
static const int segfeaturedata_signed[SEG_LVL_MAX] = { 1, 1, 0, 0 };
static const int seg_feature_data_max[SEG_LVL_MAX] = { MAXQ, 63, 0xf, 0xf };
// These functions provide access to new segment level features.
// Eventually these function may be "optimized out" but for the moment,
......@@ -103,10 +102,4 @@ int vp9_check_segref_inter(MACROBLOCKD *xd, int segment_id) {
~(1 << INTRA_FRAME)) ? 1 : 0;
}
int vp9_get_seg_tx_type(MACROBLOCKD *xd, int segment_id) {
if (vp9_segfeature_active(xd, segment_id, SEG_LVL_TRANSFORM))
return vp9_get_segdata(xd, segment_id, SEG_LVL_TRANSFORM);
else
return TX_4X4;
}
// TBD? Functions to read and write segment data with range / validity checking
......@@ -57,7 +57,5 @@ int vp9_check_segref(const MACROBLOCKD *xd,
int vp9_check_segref_inter(MACROBLOCKD *xd, int segment_id);
int vp9_get_seg_tx_type(MACROBLOCKD *xd, int segment_id);
#endif // VP9_COMMON_VP9_SEG_COMMON_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment