generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24df77e951
vpx/vp9/encoder/vp9_mcomp.h

127 lines
5.1 KiB
C
Raw Normal View History

Initial WebM release
2010-05-18 17:58:33 +02:00
/*
Use WebM in copyright notice for consistency Changes 'The VP8 project' to 'The WebM project', for consistency with other webmproject.org repositories. Fixes issue #97. Change-Id: I37c13ed5fbdb9d334ceef71c6350e9febed9bbba
2010-09-09 14:16:39 +02:00
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
Initial WebM release
2010-05-18 17:58:33 +02:00
*
cosmetics: trim trailing whitespace When the license headers were updated, they accidentally contained trailing whitespace, so unfortunately we have to touch all the files again. Change-Id: I236c05fade06589e417179c0444cb39b09e4200d
2010-06-18 18:39:21 +02:00
* Use of this source code is governed by a BSD-style license
LICENSE: update with latest text Change-Id: Ieebea089095d9073b3a94932791099f614ce120c
2010-06-04 22:19:40 +02:00
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
cosmetics: trim trailing whitespace When the license headers were updated, they accidentally contained trailing whitespace, so unfortunately we have to touch all the files again. Change-Id: I236c05fade06589e417179c0444cb39b09e4200d
2010-06-18 18:39:21 +02:00
* in the file PATENTS. All contributing project authors may
LICENSE: update with latest text Change-Id: Ieebea089095d9073b3a94932791099f614ce120c
2010-06-04 22:19:40 +02:00
* be found in the AUTHORS file in the root of the source tree.
Initial WebM release
2010-05-18 17:58:33 +02:00
*/
google style guide include guards Change-Id: I2c252f3ddcc99e96c1f5d3dab8bcb25a2a3637ea
2012-11-30 01:36:10 +01:00
#ifndef VP9_ENCODER_VP9_MCOMP_H_
#define VP9_ENCODER_VP9_MCOMP_H_
Initial WebM release
2010-05-18 17:58:33 +02:00
fixed includes to be fully specified Change-Id: Ia1cce221f8511561b9cbd8edb7726fbc286ff243
2012-11-28 19:41:40 +01:00
#include "vp9/encoder/vp9_block.h"
#include "vp9/encoder/vp9_variance.h"
Initial WebM release
2010-05-18 17:58:33 +02:00
Extend diff MV limit from +/-256 to +/-1024 Increase the motion search range by 4x. Change MV_CLASS tree of the entropy coding to allow two additional mv classes to cover the extended motion vector limit. The codec determines the effective motion search range conditioned on the actual frame dimension. It provides coding gains: stdhd 0.39% yt 0.56% hd 0.47% Major coding performance gains are packed in several sequences with intense motion activities, e.g., ped_1080p gains 7% at high bit-rates, and on average 3%. TODO: Need to further tune the rate control and motion search units. Change-Id: Ib842540a6796fbee5a797809433ef6a477c6d78d
2013-03-06 21:02:15 +01:00
// The maximum number of steps in a step search given the largest
// allowed initial step
Support +/-2048 motion vector coding Enable entropy coding of motion vectors up to +/-2048. Also extend the motion search range accordingly. Change-Id: Iac2bb015e8934521cef83a19edbe967d9f097436
2013-03-12 05:51:00 +01:00
#define MAX_MVSEARCH_STEPS 11
Extend diff MV limit from +/-256 to +/-1024 Increase the motion search range by 4x. Change MV_CLASS tree of the entropy coding to allow two additional mv classes to cover the extended motion vector limit. The codec determines the effective motion search range conditioned on the actual frame dimension. It provides coding gains: stdhd 0.39% yt 0.56% hd 0.47% Major coding performance gains are packed in several sequences with intense motion activities, e.g., ped_1080p gains 7% at high bit-rates, and on average 3%. TODO: Need to further tune the rate control and motion search units. Change-Id: Ib842540a6796fbee5a797809433ef6a477c6d78d
2013-03-06 21:02:15 +01:00
// 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))
Initial WebM release
2010-05-18 17:58:33 +02:00
Using MV* instead of int_mv* as argument of vp9_clamp_mv_min_max. Change-Id: I3c45916a9059f11b41e9d798e34ffee052969a44
2013-08-12 20:18:28 +02:00
void vp9_clamp_mv_min_max(MACROBLOCK *x, MV *mv);
Code cleanup. Lower case variable names, converting while loops to for loops. Change-Id: Ic3b973391eef7472a99d18d02fe79cfef5e04e62
2013-02-28 23:40:20 +01:00
int vp9_mv_bit_cost(int_mv *mv, int_mv *ref, int *mvjcost,
Removing unused "ishp" arguments. Using different variable names "allow_hp" and "use_hp" instead of "usehp". Change-Id: I0cd5996ddeb46bd754473b680a993c0aaf8eb879
2013-07-31 20:27:53 +02:00
int *mvcost[2], int weight);
Code cleanup. Lower case variable names, converting while loops to for loops. Change-Id: Ic3b973391eef7472a99d18d02fe79cfef5e04e62
2013-02-28 23:40:20 +01:00
void vp9_init_dsmotion_compensation(MACROBLOCK *x, int stride);
void vp9_init3smotion_compensation(MACROBLOCK *x, int stride);
Change name of common top-level structures from VP8 to VP9. This change encompasses VP8_PTR, VP8_COMP, VP8D_COMP, VP8_COMMON, VP8Decompressor and VP8Common. Change-Id: I514ef4ad4e682370f36d656af1c09ee20da216ad
2012-10-31 01:53:32 +01:00
struct VP9_COMP;
Change meaning of cpi->sf.first_step and rename. Renamed cpi->sf.first_step to cpi->sf.reduce_first_step_size and changed its meaning such that it is a delta applied to reduce the default first step size (>> x) in the motion search rather than an absolute value. The default first step size is already changed according to the image dimensions (smaller for smaller images). cpi->sf.reduce_first_step_size now applies a further correction from the default. Change-Id: Ia94e08bc24c67b604831f980909af7e982fcd16d
2013-06-24 16:19:16 +02:00
int vp9_init_search_range(struct VP9_COMP *cpi, int size);
// Runs sequence of diamond searches in smaller steps for RD
Remove BLOCK structure All members can be referenced from their per-plane counterparts, and removes assumptions about 24 blocks per macroblock. Change-Id: I593fb0715e74cd84b48facd1c9b18c3ae1185d4b
2013-04-24 01:22:47 +02:00
int vp9_full_pixel_diamond(struct VP9_COMP *cpi, MACROBLOCK *x,
Remove BLOCKD structure All members can be referenced from their per-plane counterparts, and removes assumptions about 24 blocks per macroblock. Change-Id: I7ff2fa72d22c29163eb558981c8193765a8113d9
2013-04-24 01:22:47 +02:00
int_mv *mvp_full, int step_param,
More refactoring of diamond search. This should make merging inter code paths easier. Change-Id: I5cb81f25d56fa4790b4e9cfa4bc32b9062c2cfdf
2012-08-08 20:52:22 +02:00
int sadpb, int further_steps, int do_refine,
Remove vp8 in local symbols. For non-static functions, change the prefix to vp9_. For static functions, remove the prefix. Also fix some comments, remove unused code or unused function prototypes. Change-Id: I1f8be05362f66060fe421c3d4c9a906fdf835de5
2012-10-31 22:40:53 +01:00
vp9_variance_fn_ptr_t *fn_ptr,
Some refactoring of mcomp functions. Change-Id: Ic7a7cb1199b085e98ede0e634619b3077c348d57
2012-08-08 01:44:26 +02:00
int_mv *ref_mv, int_mv *dst_mv);
Initial WebM release
2010-05-18 17:58:33 +02:00
Remove BLOCKD structure All members can be referenced from their per-plane counterparts, and removes assumptions about 24 blocks per macroblock. Change-Id: I7ff2fa72d22c29163eb558981c8193765a8113d9
2013-04-24 01:22:47 +02:00
int vp9_hex_search(MACROBLOCK *x,
Flexible support for various pattern searches Adds a few pattern searches to achieve various tradeoffs between motion estimation complexity and performance. The search framework is unified across these searches so that a common pattern search function is used for all. Besides it will be easier to experiment with various patterns or combinations thereof at different scales in the future. The new pattern search is multi-scale and is capable of using different patterns at different scales. The new hex search uses 8 points at the smallest scale and 6 points at other scales. Two other pattern searches - big-diamond and square are also added. Big diamond uses 4 points at the smallest scale and 8 points in diamond shape at the larger scales. Square is very similar conceptually to the default n-step search but is somewhat faster since it keeps only one survivor across all scales. Psnr/speed-up results on derf300: hex: -1.6% psnr%, 6-8% speed-up big-diamond: -0.96% psnr, 4-5% speedup square: -0.93% psnr, 4-5% speedup Change-Id: I02a7ef5193f762601e0994e2c99399a3535a43d2
2013-07-22 23:47:57 +02:00
int_mv *ref_mv,
int search_param,
int error_per_bit,
int do_init_search,
Code cleanup. Lower case variable names, converting while loops to for loops. Change-Id: Ic3b973391eef7472a99d18d02fe79cfef5e04e62
2013-02-28 23:40:20 +01:00
const vp9_variance_fn_ptr_t *vf,
Flexible support for various pattern searches Adds a few pattern searches to achieve various tradeoffs between motion estimation complexity and performance. The search framework is unified across these searches so that a common pattern search function is used for all. Besides it will be easier to experiment with various patterns or combinations thereof at different scales in the future. The new pattern search is multi-scale and is capable of using different patterns at different scales. The new hex search uses 8 points at the smallest scale and 6 points at other scales. Two other pattern searches - big-diamond and square are also added. Big diamond uses 4 points at the smallest scale and 8 points in diamond shape at the larger scales. Square is very similar conceptually to the default n-step search but is somewhat faster since it keeps only one survivor across all scales. Psnr/speed-up results on derf300: hex: -1.6% psnr%, 6-8% speed-up big-diamond: -0.96% psnr, 4-5% speedup square: -0.93% psnr, 4-5% speedup Change-Id: I02a7ef5193f762601e0994e2c99399a3535a43d2
2013-07-22 23:47:57 +02:00
int use_mvcost,
int_mv *center_mv,
int_mv *best_mv);
int vp9_bigdia_search(MACROBLOCK *x,
int_mv *ref_mv,
int search_param,
int error_per_bit,
int do_init_search,
const vp9_variance_fn_ptr_t *vf,
int use_mvcost,
int_mv *center_mv,
int_mv *best_mv);
int vp9_square_search(MACROBLOCK *x,
int_mv *ref_mv,
int search_param,
int error_per_bit,
int do_init_search,
const vp9_variance_fn_ptr_t *vf,
int use_mvcost,
int_mv *center_mv,
int_mv *best_mv);
Initial WebM release
2010-05-18 17:58:33 +02:00
Clean ups of the subpel search functions Removes some unused code and speed features, and organizes the interfaces for fractional mv step functions for use in new speed features to come. In the process a new speed feature - number of iterations per step during the subpel search - is exposed. No change when this parameter is set as the original value of 3. Results: subpel_iters_per_step = 3: baseline subpel_iters_per_step = 2: psnr -0.067%, 1% speedup subpel_iters_per_step = 1: psnr -0.331%, 3-4% speedup Change-Id: I2eba8a21f6461be8caf56af04a5337257a5693a8
2013-08-07 00:53:35 +02:00
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 forced_stop, // 0 - full, 1 - qtr only, 2 - half only
int iters_per_step,
int *mvjcost,
int *mvcost[2],
int *distortion,
unsigned int *sse);
extern fractional_mv_step_fp vp9_find_best_sub_pixel_iterative;
Adds a new subpel motion function Adds a new subpel motion estimation function that uses a 2-level tree-structured decision tree to eliminate redundant computations. It searches fewer points than iterative search (which can search the same point multiple times) but has the same quality roughly. This is made the default setting at speeds 0 and 1, while at speed 2 and above only a 1-level search is used. Also includes various cleanups for consistency and redundancy removal. Results: derf: +0.012% psnr stdhd: +0.09% psnr Speedup of about 2-3% Change-Id: Iedde4866f5475586dea0f0ba4cb7428fba24eee9
2013-08-08 02:01:43 +02:00
extern fractional_mv_step_fp vp9_find_best_sub_pixel_tree;
typedef int (fractional_mv_step_comp_fp) (
MACROBLOCK *x,
int_mv *bestmv, int_mv *ref_mv,
int error_per_bit,
const vp9_variance_fn_ptr_t *vfp,
int forced_stop, // 0 - full, 1 - qtr only, 2 - half only
int iters_per_step,
int *mvjcost, int *mvcost[2],
int *distortion, unsigned int *sse1,
const uint8_t *second_pred,
int w, int h);
extern fractional_mv_step_comp_fp vp9_find_best_sub_pixel_comp_iterative;
extern fractional_mv_step_comp_fp vp9_find_best_sub_pixel_comp_tree;
Initial WebM release
2010-05-18 17:58:33 +02:00
Remove BLOCKD structure All members can be referenced from their per-plane counterparts, and removes assumptions about 24 blocks per macroblock. Change-Id: I7ff2fa72d22c29163eb558981c8193765a8113d9
2013-04-24 01:22:47 +02:00
typedef int (*vp9_full_search_fn_t)(MACROBLOCK *x,
remove invoke_search macro Removed invoke search from encoder Change-Id: I3d809b795abe6df0e71366edfe94026aaede14fb
2012-11-06 01:58:03 +01:00
int_mv *ref_mv, int sad_per_bit,
int distance, vp9_variance_fn_ptr_t *fn_ptr,
remove macros obfuscating mv costing cleanup Change-Id: I565eee40d900e0441ad211b65ac829fc5b93d94a
2012-11-09 00:44:39 +01:00
int *mvjcost, int *mvcost[2],
Removed bmi from blockd This originally was "Removed update_blockd_bmi()". Now, this patch removed bmi from blockd and uses the bmi found in mode_info_context. Eliminates unnecessary bmi copies between blockd and mode_info_context. Change-Id: I287a4972974bb363f49e528daa9b2a2293f4bc76
2013-04-26 16:19:43 +02:00
int_mv *center_mv, int n);
remove invoke_search macro Removed invoke search from encoder Change-Id: I3d809b795abe6df0e71366edfe94026aaede14fb
2012-11-06 01:58:03 +01:00
Remove BLOCKD structure All members can be referenced from their per-plane counterparts, and removes assumptions about 24 blocks per macroblock. Change-Id: I7ff2fa72d22c29163eb558981c8193765a8113d9
2013-04-24 01:22:47 +02:00
typedef int (*vp9_refining_search_fn_t)(MACROBLOCK *x,
remove invoke_search macro Removed invoke search from encoder Change-Id: I3d809b795abe6df0e71366edfe94026aaede14fb
2012-11-06 01:58:03 +01:00
int_mv *ref_mv, int sad_per_bit,
int distance,
vp9_variance_fn_ptr_t *fn_ptr,
remove macros obfuscating mv costing cleanup Change-Id: I565eee40d900e0441ad211b65ac829fc5b93d94a
2012-11-09 00:44:39 +01:00
int *mvjcost, int *mvcost[2],
int_mv *center_mv);
remove invoke_search macro Removed invoke search from encoder Change-Id: I3d809b795abe6df0e71366edfe94026aaede14fb
2012-11-06 01:58:03 +01:00
Remove BLOCKD structure All members can be referenced from their per-plane counterparts, and removes assumptions about 24 blocks per macroblock. Change-Id: I7ff2fa72d22c29163eb558981c8193765a8113d9
2013-04-24 01:22:47 +02:00
typedef int (*vp9_diamond_search_fn_t)(MACROBLOCK *x,
remove invoke_search macro Removed invoke search from encoder Change-Id: I3d809b795abe6df0e71366edfe94026aaede14fb
2012-11-06 01:58:03 +01:00
int_mv *ref_mv, int_mv *best_mv,
int search_param, int sad_per_bit,
int *num00,
vp9_variance_fn_ptr_t *fn_ptr,
remove macros obfuscating mv costing cleanup Change-Id: I565eee40d900e0441ad211b65ac829fc5b93d94a
2012-11-09 00:44:39 +01:00
int *mvjcost, int *mvcost[2],
int_mv *center_mv);
Initial WebM release
2010-05-18 17:58:33 +02:00
Add joint motion search in comp_inter_inter mode(experiment) In current code, motion vectors got from single prediction mode are used in compound prediction mode directly. These motion vectors may not give accurate prediction since they are searched independently. In this patch, we took Pascal's suggestion, and did joint motion search in compound prediction mode to find better motion vectors in this situation. Test results: Overall PSNR: 0.570%(derf), 0.918%(stdhd); SSIM: 0.572%(derf), 1.009%(stdhd); The encoder is a little slower. This can be improved since some c code is used in motion search. Change-Id: Ib30c9240f6c56c9b070867b4ca89412a76d9f3c6
2013-05-07 18:45:28 +02:00
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);
Use standard integer types for pixel values and coefficients. For coefficients, use int16_t (instead of short); for pixel values in 16-bit intermediates, use uint16_t (instead of unsigned short); for all others, use uint8_t (instead of unsigned char). Change-Id: I3619cd9abf106c3742eccc2e2f5e89a62774f7da
2012-12-19 00:31:19 +01:00
#endif // VP9_ENCODER_VP9_MCOMP_H_
Reference in New Issue Copy Permalink