Commit 30ba4b41 authored by emilkeyder@google.com's avatar emilkeyder@google.com Committed by Emil Keyder

Fix some includes in global_motion.{c,h}.

Change-Id: I288890b964fda354ac58939f3a6b54a33f40666d
parent 043de633
......@@ -15,6 +15,8 @@
#include <math.h>
#include <assert.h>
#include "av1/encoder/global_motion.h"
#include "av1/common/warped_motion.h"
#include "av1/encoder/segmentation.h"
......@@ -30,6 +32,16 @@
// Border over which to compute the global motion
#define ERRORADV_BORDER 0
const double gm_advantage_thresh[TRANS_TYPES] = {
1.00, // Identity (not used)
0.85, // Translation
0.75, // Rot zoom
0.65, // Affine
0.65, // Hor Trapezoid
0.65, // Ver Trapezoid
0.50, // Homography
};
void convert_to_params(const double *params, int32_t *model) {
int i;
int alpha_present = 0;
......
......@@ -13,20 +13,14 @@
#define AV1_ENCODER_GLOBAL_MOTION_H_
#include "aom/aom_integer.h"
#include "aom_scale/yv12config.h"
#include "av1/common/mv.h"
#ifdef __cplusplus
extern "C" {
#endif
const double gm_advantage_thresh[TRANS_TYPES] = {
1.00, // Identity (not used)
0.85, // Translation
0.75, // Rot zoom
0.65, // Affine
0.65, // Hor Trapezoid
0.65, // Ver Trapezoid
0.50, // Homography
};
extern const double gm_advantage_thresh[TRANS_TYPES];
void convert_to_params(const double *params, int32_t *model);
......
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