6ff3eb1647
This patch creates a new inter mode contest that avoids a dependence on the reconstructed motion vectors from neighboring blocks. This was a change requested by a hardware vendor to improve decode performance. As part of this change I have also made some modifications to stats output code (under a flag) to allow accumulation of inter mode context flags over multiple clips Some further changes will be required to accommodate the deprecation of the split mv mode over the next few days. Performance as stands is around -0.25% on derf and std-hd but up on the YT and YT-HD sets. With further tuning or some adjustment to the context criteria it should be possible to make this change broadly neutral. Change-Id: Ia15cb4470969b9e87332a59c546ae0bd40676f6c
96 lines
4.4 KiB
C
96 lines
4.4 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 VP9_ENCODER_VP9_MCOMP_H_
|
|
#define VP9_ENCODER_VP9_MCOMP_H_
|
|
|
|
#include "vp9/encoder/vp9_block.h"
|
|
#include "vp9/encoder/vp9_variance.h"
|
|
|
|
// The maximum number of steps in a step search given the largest
|
|
// allowed initial step
|
|
#define MAX_MVSEARCH_STEPS 11
|
|
// Max full pel mv specified in 1 pel units
|
|
#define MAX_FULL_PEL_VAL ((1 << (MAX_MVSEARCH_STEPS)) - 1)
|
|
// Maximum size of the first step in full pel units
|
|
#define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1))
|
|
|
|
void vp9_clamp_mv_min_max(MACROBLOCK *x, int_mv *ref_mv);
|
|
int vp9_init_search_range(int width, int height);
|
|
|
|
int vp9_mv_bit_cost(int_mv *mv, int_mv *ref, int *mvjcost,
|
|
int *mvcost[2], int weight, int ishp);
|
|
void vp9_init_dsmotion_compensation(MACROBLOCK *x, int stride);
|
|
void vp9_init3smotion_compensation(MACROBLOCK *x, int stride);
|
|
|
|
// Runs sequence of diamond searches in smaller steps for RD
|
|
struct VP9_COMP;
|
|
int vp9_full_pixel_diamond(struct VP9_COMP *cpi, MACROBLOCK *x,
|
|
int_mv *mvp_full, int step_param,
|
|
int sadpb, int further_steps, int do_refine,
|
|
vp9_variance_fn_ptr_t *fn_ptr,
|
|
int_mv *ref_mv, int_mv *dst_mv);
|
|
|
|
int vp9_hex_search(MACROBLOCK *x,
|
|
int_mv *ref_mv, int_mv *best_mv,
|
|
int search_param, int error_per_bit,
|
|
const vp9_variance_fn_ptr_t *vf,
|
|
int *mvjsadcost, int *mvsadcost[2],
|
|
int *mvjcost, int *mvcost[2],
|
|
int_mv *center_mv);
|
|
|
|
typedef int (fractional_mv_step_fp) (MACROBLOCK *x, int_mv
|
|
*bestmv, int_mv *ref_mv, int error_per_bit, const vp9_variance_fn_ptr_t *vfp,
|
|
int *mvjcost, int *mvcost[2], int *distortion, unsigned int *sse);
|
|
extern fractional_mv_step_fp vp9_find_best_sub_pixel_step_iteratively;
|
|
extern fractional_mv_step_fp vp9_find_best_sub_pixel_step;
|
|
extern fractional_mv_step_fp vp9_find_best_half_pixel_step;
|
|
|
|
typedef int (*vp9_full_search_fn_t)(MACROBLOCK *x,
|
|
int_mv *ref_mv, int sad_per_bit,
|
|
int distance, vp9_variance_fn_ptr_t *fn_ptr,
|
|
int *mvjcost, int *mvcost[2],
|
|
int_mv *center_mv, int n);
|
|
|
|
typedef int (*vp9_refining_search_fn_t)(MACROBLOCK *x,
|
|
int_mv *ref_mv, int sad_per_bit,
|
|
int distance,
|
|
vp9_variance_fn_ptr_t *fn_ptr,
|
|
int *mvjcost, int *mvcost[2],
|
|
int_mv *center_mv);
|
|
|
|
typedef int (*vp9_diamond_search_fn_t)(MACROBLOCK *x,
|
|
int_mv *ref_mv, int_mv *best_mv,
|
|
int search_param, int sad_per_bit,
|
|
int *num00,
|
|
vp9_variance_fn_ptr_t *fn_ptr,
|
|
int *mvjcost, int *mvcost[2],
|
|
int_mv *center_mv);
|
|
|
|
#if CONFIG_COMP_INTER_JOINT_SEARCH
|
|
int vp9_find_best_sub_pixel_comp(MACROBLOCK *x,
|
|
int_mv *bestmv, int_mv *ref_mv,
|
|
int error_per_bit,
|
|
const vp9_variance_fn_ptr_t *vfp,
|
|
int *mvjcost, int *mvcost[2],
|
|
int *distortion, unsigned int *sse1,
|
|
const uint8_t *second_pred,
|
|
int w, int h);
|
|
|
|
int vp9_refining_search_8p_c(MACROBLOCK *x,
|
|
int_mv *ref_mv, int error_per_bit,
|
|
int search_range, vp9_variance_fn_ptr_t *fn_ptr,
|
|
int *mvjcost, int *mvcost[2],
|
|
int_mv *center_mv, const uint8_t *second_pred,
|
|
int w, int h);
|
|
#endif // CONFIG_COMP_INTER_JOINT_SEARCH
|
|
#endif // VP9_ENCODER_VP9_MCOMP_H_
|