diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-15 12:01:34 -0700 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2014-05-16 10:17:13 -0700 |
commit | 51545f57530b15b2b8901f9786293475590c80ad (patch) | |
tree | 1a56e09c212babe5c3b951329d9f43d69ed6ef58 /vp9/encoder/vp9_block.h | |
parent | b334bfc32209882f1823ed441b7d962e96e0b6fb (diff) | |
download | libvpx-51545f57530b15b2b8901f9786293475590c80ad.tar libvpx-51545f57530b15b2b8901f9786293475590c80ad.tar.gz libvpx-51545f57530b15b2b8901f9786293475590c80ad.tar.bz2 libvpx-51545f57530b15b2b8901f9786293475590c80ad.zip |
Moving PC_TREE from MACROBLOCK to VP9_COMP.
Because PC_TREE is encoder-level data, not MACROBLOCK-level data.
Change-Id: I4f620c0781acd3a2744860610117e74948e0b2b5
Diffstat (limited to 'vp9/encoder/vp9_block.h')
-rw-r--r-- | vp9/encoder/vp9_block.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index 2ccf4f80e..0504a4985 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -20,43 +20,6 @@ extern "C" { #endif -// Structure to hold snapshot of coding context during the mode picking process -typedef struct { - MODE_INFO mic; - uint8_t *zcoeff_blk; - int16_t *coeff[MAX_MB_PLANE][3]; - int16_t *qcoeff[MAX_MB_PLANE][3]; - int16_t *dqcoeff[MAX_MB_PLANE][3]; - uint16_t *eobs[MAX_MB_PLANE][3]; - - // dual buffer pointers, 0: in use, 1: best in store - int16_t *coeff_pbuf[MAX_MB_PLANE][3]; - int16_t *qcoeff_pbuf[MAX_MB_PLANE][3]; - int16_t *dqcoeff_pbuf[MAX_MB_PLANE][3]; - uint16_t *eobs_pbuf[MAX_MB_PLANE][3]; - - int is_coded; - int num_4x4_blk; - int skip; - int_mv best_ref_mv[2]; - int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES]; - int rate; - int distortion; - int best_mode_index; - int rddiv; - int rdmult; - int hybrid_pred_diff; - int comp_pred_diff; - int single_pred_diff; - int64_t tx_rd_diff[TX_MODES]; - int64_t best_filter_diff[SWITCHABLE_FILTER_CONTEXTS]; - - // motion vector cache for adaptive motion search control in partition - // search loop - int_mv pred_mv[MAX_REF_FRAMES]; - INTERP_FILTER pred_interp_filter; -} PICK_MODE_CONTEXT; - struct macroblock_plane { DECLARE_ALIGNED(16, int16_t, src_diff[64 * 64]); int16_t *qcoeff; @@ -73,18 +36,6 @@ struct macroblock_plane { // Zbin Over Quant value int16_t zbin_extra; }; -typedef struct PC_TREE { - int index; - PARTITION_TYPE partitioning; - BLOCK_SIZE block_size; - PICK_MODE_CONTEXT none; - PICK_MODE_CONTEXT horizontal[2]; - PICK_MODE_CONTEXT vertical[2]; - union { - struct PC_TREE *split[4]; - PICK_MODE_CONTEXT *leaf_split[4]; - }; -} PC_TREE; /* The [2] dimension is for whether we skip the EOB node (i.e. if previous * coefficient in this block was zero) or not. */ @@ -157,15 +108,9 @@ struct macroblock { // Used to store sub partition's choices. int_mv pred_mv[MAX_REF_FRAMES]; - PICK_MODE_CONTEXT *leaf_tree; - PC_TREE *pc_tree; - PC_TREE *pc_root; - int partition_cost[PARTITION_CONTEXTS][PARTITION_TYPES]; - void (*fwd_txm4x4)(const int16_t *input, int16_t *output, int stride); }; - #ifdef __cplusplus } // extern "C" #endif |