diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-03-19 02:53:02 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2013-03-19 17:31:08 +0000 |
| commit | 1c75e77b6d58b09b59a6cd02a4e9443542f388ef (patch) | |
| tree | 1b19f3e59dd31c6bb7c4a76b232d680d4d690c93 /vp9/common | |
| parent | d8ffee45269b33ca4dda47472e909afc44fcc3fe (diff) | |
| download | libvpx-1c75e77b6d58b09b59a6cd02a4e9443542f388ef.tar libvpx-1c75e77b6d58b09b59a6cd02a4e9443542f388ef.tar.gz libvpx-1c75e77b6d58b09b59a6cd02a4e9443542f388ef.tar.bz2 libvpx-1c75e77b6d58b09b59a6cd02a4e9443542f388ef.zip | |
Remove TX size segment feature
Change-Id: I0d226e4cb240caced37230f46905bf69b46e0cce
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 3 | ||||
| -rw-r--r-- | vp9/common/vp9_seg_common.c | 11 | ||||
| -rw-r--r-- | vp9/common/vp9_seg_common.h | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 5adfa6952..3dfef41b2 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -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. diff --git a/vp9/common/vp9_seg_common.c b/vp9/common/vp9_seg_common.c index 07a4d4484..859e211bd 100644 --- a/vp9/common/vp9_seg_common.c +++ b/vp9/common/vp9_seg_common.c @@ -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 diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h index 681c701ba..2d0018b47 100644 --- a/vp9/common/vp9_seg_common.h +++ b/vp9/common/vp9_seg_common.h @@ -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_ |