generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Constrain encoder motion search range"

Browse Source
This commit is contained in:
Jingning Han
2013-11-18 12:35:34 -08:00
committed by Gerrit Code Review
parent e3168b0c54 bbe68fbd2a
commit 46ce6ddec4
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_firstpass.c
View File

@@ -406,8 +406,6 @@ static void first_pass_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
// for first pass test // for first pass test
while ((quart_frm << sr) < MAX_FULL_PEL_VAL) while ((quart_frm << sr) < MAX_FULL_PEL_VAL)
sr++; sr++;
if (sr)
sr--;
step_param += sr; step_param += sr;
further_steps -= sr; further_steps -= sr;

3
vp9/encoder/vp9_mcomp.c
View File

@@ -51,9 +51,6 @@ int vp9_init_search_range(VP9_COMP *cpi, int size) {
while ((size << sr) < MAX_FULL_PEL_VAL) while ((size << sr) < MAX_FULL_PEL_VAL)
sr++; sr++;
if (sr)
sr--;
sr += cpi->sf.reduce_first_step_size; sr += cpi->sf.reduce_first_step_size;
sr = MIN(sr, (cpi->sf.max_step_search_steps - 2)); sr = MIN(sr, (cpi->sf.max_step_search_steps - 2));
return sr; return sr;

5
vp9/encoder/vp9_mcomp.h
View File

@@ -18,8 +18,9 @@
// The maximum number of steps in a step search given the largest // The maximum number of steps in a step search given the largest
// allowed initial step // allowed initial step
#define MAX_MVSEARCH_STEPS 11 #define MAX_MVSEARCH_STEPS 11
// Max full pel mv specified in 1 pel units // Max full pel mv specified in the unit of full pixel
#define MAX_FULL_PEL_VAL ((1 << (MAX_MVSEARCH_STEPS)) - 1) // Enable the use of motion vector in range [-1023, 1023].
#define MAX_FULL_PEL_VAL ((1 << (MAX_MVSEARCH_STEPS - 1)) - 1)
// Maximum size of the first step in full pel units // Maximum size of the first step in full pel units
#define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1)) #define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1))
// Allowed motion vector pixel distance outside image border // Allowed motion vector pixel distance outside image border