This commit aligns the rate-distortion metric for the recursive transform block partitioning and the super transform. It resolves the conflicts between these two experiments. The coding performance gains of the combined experiments (var-tx + super-tx) has been improved: derf 0.89% -> 1.9% hevcmr 1.06% -> 1.8% stdhd 0.29% -> 1.4% hevchr 0.80% -> 2.3% Change-Id: I7e33994ad70c1b2751435620815f867d82172f41
		
			
				
	
	
		
			100 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			100 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
 | 
						|
 *
 | 
						|
 *  Use of this source code is governed by a BSD-style license
 | 
						|
 *  that can be found in the LICENSE file in the root of the source
 | 
						|
 *  tree. An additional intellectual property rights grant can be found
 | 
						|
 *  in the file PATENTS.  All contributing project authors may
 | 
						|
 *  be found in the AUTHORS file in the root of the source tree.
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef VP10_ENCODER_RDOPT_H_
 | 
						|
#define VP10_ENCODER_RDOPT_H_
 | 
						|
 | 
						|
#include "vp10/common/blockd.h"
 | 
						|
 | 
						|
#include "vp10/encoder/block.h"
 | 
						|
#include "vp10/encoder/context_tree.h"
 | 
						|
 | 
						|
#ifdef __cplusplus
 | 
						|
extern "C" {
 | 
						|
#endif
 | 
						|
 | 
						|
struct TileInfo;
 | 
						|
struct VP10_COMP;
 | 
						|
struct macroblock;
 | 
						|
struct RD_COST;
 | 
						|
 | 
						|
void vp10_rd_pick_intra_mode_sb(struct VP10_COMP *cpi, struct macroblock *x,
 | 
						|
                               struct RD_COST *rd_cost, BLOCK_SIZE bsize,
 | 
						|
                               PICK_MODE_CONTEXT *ctx, int64_t best_rd);
 | 
						|
 | 
						|
unsigned int vp10_get_sby_perpixel_variance(VP10_COMP *cpi,
 | 
						|
                                           const struct buf_2d *ref,
 | 
						|
                                           BLOCK_SIZE bs);
 | 
						|
#if CONFIG_VP9_HIGHBITDEPTH
 | 
						|
unsigned int vp10_high_get_sby_perpixel_variance(VP10_COMP *cpi,
 | 
						|
                                                const struct buf_2d *ref,
 | 
						|
                                                BLOCK_SIZE bs, int bd);
 | 
						|
#endif
 | 
						|
 | 
						|
void vp10_rd_pick_inter_mode_sb(struct VP10_COMP *cpi,
 | 
						|
                               struct TileDataEnc *tile_data,
 | 
						|
                               struct macroblock *x,
 | 
						|
                               int mi_row, int mi_col,
 | 
						|
                               struct RD_COST *rd_cost,
 | 
						|
#if CONFIG_SUPERTX
 | 
						|
                               int *returnrate_nocoef,
 | 
						|
#endif  // CONFIG_SUPERTX
 | 
						|
                               BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
 | 
						|
                               int64_t best_rd_so_far);
 | 
						|
 | 
						|
void vp10_rd_pick_inter_mode_sb_seg_skip(struct VP10_COMP *cpi,
 | 
						|
                                        struct TileDataEnc *tile_data,
 | 
						|
                                        struct macroblock *x,
 | 
						|
                                        struct RD_COST *rd_cost,
 | 
						|
                                        BLOCK_SIZE bsize,
 | 
						|
                                        PICK_MODE_CONTEXT *ctx,
 | 
						|
                                        int64_t best_rd_so_far);
 | 
						|
 | 
						|
int vp10_internal_image_edge(struct VP10_COMP *cpi);
 | 
						|
int vp10_active_h_edge(struct VP10_COMP *cpi, int mi_row, int mi_step);
 | 
						|
int vp10_active_v_edge(struct VP10_COMP *cpi, int mi_col, int mi_step);
 | 
						|
int vp10_active_edge_sb(struct VP10_COMP *cpi, int mi_row, int mi_col);
 | 
						|
 | 
						|
void vp10_rd_pick_inter_mode_sub8x8(struct VP10_COMP *cpi,
 | 
						|
                                    struct TileDataEnc *tile_data,
 | 
						|
                                    struct macroblock *x,
 | 
						|
                                    int mi_row, int mi_col,
 | 
						|
                                    struct RD_COST *rd_cost,
 | 
						|
#if CONFIG_SUPERTX
 | 
						|
                                    int *returnrate_nocoef,
 | 
						|
#endif  // CONFIG_SUPERTX
 | 
						|
                                    BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
 | 
						|
                                    int64_t best_rd_so_far);
 | 
						|
 | 
						|
#if CONFIG_SUPERTX
 | 
						|
#if CONFIG_VAR_TX
 | 
						|
void vp10_tx_block_rd_b(const VP10_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
 | 
						|
                        int blk_row, int blk_col, int plane, int block,
 | 
						|
                        int plane_bsize, int coeff_ctx,
 | 
						|
                        int *rate, int64_t *dist, int64_t *bsse, int *skip);
 | 
						|
#endif
 | 
						|
 | 
						|
void vp10_txfm_rd_in_plane_supertx(MACROBLOCK *x,
 | 
						|
#if CONFIG_VAR_TX
 | 
						|
                                   const VP10_COMP *cpi,
 | 
						|
#endif  // CONFIG_VAR_TX
 | 
						|
                                   int *rate, int64_t *distortion,
 | 
						|
                                   int *skippable, int64_t *sse,
 | 
						|
                                   int64_t ref_best_rd, int plane,
 | 
						|
                                   BLOCK_SIZE bsize, TX_SIZE tx_size,
 | 
						|
                                   int use_fast_coef_casting);
 | 
						|
#endif  // CONFIG_SUPERTX
 | 
						|
 | 
						|
#ifdef __cplusplus
 | 
						|
}  // extern "C"
 | 
						|
#endif
 | 
						|
 | 
						|
#endif  // VP10_ENCODER_RDOPT_H_
 |