Commit 5f35e587 authored by Debargha Mukherjee's avatar Debargha Mukherjee
Browse files

Support upto affine model for global motion

Change-Id: Ie82efea1e815562ef3100dcd09181b18611269ad
parent 3be7aa64
......@@ -84,7 +84,7 @@ typedef enum {
// GLOBAL_TRANS_TYPES 4 - up to affine
// GLOBAL_TRANS_TYPES 6 - up to hor/ver trapezoids
// GLOBAL_TRANS_TYPES 7 - up to full homography
#define GLOBAL_TRANS_TYPES 3
#define GLOBAL_TRANS_TYPES 4
typedef struct {
#if CONFIG_GLOBAL_MOTION
......
......@@ -5092,6 +5092,7 @@ static int input_fpmb_stats(FIRSTPASS_MB_STATS *firstpass_mb_stats,
#endif
#if CONFIG_GLOBAL_MOTION
#define GLOBAL_TRANS_TYPES_ENC 3 // highest motion model to search
static int gm_get_params_cost(WarpedMotionParams *gm,
WarpedMotionParams *ref_gm, int allow_hp) {
assert(gm->wmtype < GLOBAL_TRANS_TYPES);
......@@ -5207,7 +5208,7 @@ static void encode_frame_internal(AV1_COMP *cpi) {
if (ref_buf) {
TransformationType model;
aom_clear_system_state();
for (model = ROTZOOM; model < GLOBAL_TRANS_TYPES; ++model) {
for (model = ROTZOOM; model < GLOBAL_TRANS_TYPES_ENC; ++model) {
double best_erroradvantage = kInfiniteErrAdv;
// Initially set all params to identity.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment