Remove deprecated data structures related to hash table Change-Id: I19ada675eb70fe6dceafd7d8152393f25450ccf2
diff --git a/av1/encoder/block.h b/av1/encoder/block.h index 3198c80..9696859 100644 --- a/av1/encoder/block.h +++ b/av1/encoder/block.h
@@ -252,8 +252,8 @@ */ typedef struct { //! Circular buffer that stores the txfm search results. - MB_RD_INFO tx_rd_info[RD_RECORD_BUFFER_LEN]; // Circular buffer. - //! Index to insert the newest \ref TXB_RD_INFO. + MB_RD_INFO tx_rd_info[RD_RECORD_BUFFER_LEN]; + //! Index to insert the newest rd record. int index_start; //! Number of info stored in this record. int num; @@ -261,44 +261,6 @@ CRC32C crc_calculator; } MB_RD_RECORD; -/*! \brief Txfm search results for a tx block. - */ -typedef struct { - //! Distortion after the txfm process - int64_t dist; - //! SSE of the prediction before the txfm process - int64_t sse; - //! Rate used to encode the txfm. - int rate; - //! Location of the end of non-zero entries. - uint16_t eob; - //! Transform type used on the current block. - TX_TYPE tx_type; - //! Unknown usage - uint16_t entropy_context; - //! Context used to code the coefficients. - uint8_t txb_entropy_ctx; - //! Whether the current info block contains valid info - uint8_t valid; - //! Unused - uint8_t fast; - //! Whether trellis optimization is done. - uint8_t perform_block_coeff_opt; -} TXB_RD_INFO; - -/*! \brief Hash records of txfm search result for each tx block. - */ -typedef struct { - //! The hash values. - uint32_t hash_vals[TX_SIZE_RD_RECORD_BUFFER_LEN]; - //! The txfm search results - TXB_RD_INFO tx_rd_info[TX_SIZE_RD_RECORD_BUFFER_LEN]; - //! Index to insert the newest \ref TXB_RD_INFO. - int index_start; - //! Number of info stored in this record. - int num; -} TXB_RD_RECORD; - //! Number of compound rd stats #define MAX_COMP_RD_STATS 64 /*! \brief Rdcost stats in compound mode. @@ -499,16 +461,6 @@ //! Txfm hash record for the whole coding block. MB_RD_RECORD mb_rd_record; - //! Inter mode txfm hash record for TX_8X8 blocks. - TXB_RD_RECORD txb_rd_record_8X8[MAX_NUM_8X8_TXBS]; - //! Inter mode txfm hash record for TX_16X16 blocks. - TXB_RD_RECORD txb_rd_record_16X16[MAX_NUM_16X16_TXBS]; - //! Inter mode txfm hash record for TX_32X32 blocks. - TXB_RD_RECORD txb_rd_record_32X32[MAX_NUM_32X32_TXBS]; - //! Inter mode txfm hash record for TX_64X64 blocks. - TXB_RD_RECORD txb_rd_record_64X64[MAX_NUM_64X64_TXBS]; - //! Intra mode txfm hash record for square tx blocks. - TXB_RD_RECORD txb_rd_record_intra; /**@}*/ } TxbRdRecords;
diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h index c33d9fa..7256ff9 100644 --- a/av1/encoder/rd.h +++ b/av1/encoder/rd.h
@@ -301,9 +301,6 @@ // Used to reset the state of tx/mb rd hash information static INLINE void reset_hash_records(TxfmSearchInfo *const txfm_info) { if (!txfm_info->txb_rd_records) return; - // Reset the state for use_intra_txb_hash - txfm_info->txb_rd_records->txb_rd_record_intra.num = - txfm_info->txb_rd_records->txb_rd_record_intra.index_start = 0; // Reset the state for use_mb_rd_hash txfm_info->txb_rd_records->mb_rd_record.num =
diff --git a/av1/encoder/tx_search.c b/av1/encoder/tx_search.c index 2343e26..a3ac0d9 100644 --- a/av1/encoder/tx_search.c +++ b/av1/encoder/tx_search.c
@@ -49,11 +49,6 @@ int8_t children[4]; } RD_RECORD_IDX_NODE; -typedef struct tx_size_rd_info_node { - TXB_RD_INFO *rd_info_array; // Points to array of size TX_TYPES. - struct tx_size_rd_info_node *children[4]; -} TXB_RD_INFO_NODE; - // origin_threshold * 128 / 100 static const uint32_t skip_pred_threshold[3][BLOCK_SIZES_ALL] = { {