Commit 96cabf8d authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Moving MBGRAPH_{MB, FRAME}_STATS structs to vp9_mbgraph.h."

parents 041104a9 a2baab8b
...@@ -15,7 +15,23 @@ ...@@ -15,7 +15,23 @@
extern "C" { extern "C" {
#endif #endif
void vp9_update_mbgraph_stats(VP9_COMP *cpi); typedef struct {
struct {
int err;
union {
int_mv mv;
MB_PREDICTION_MODE mode;
} m;
} ref[MAX_REF_FRAMES];
} MBGRAPH_MB_STATS;
typedef struct {
MBGRAPH_MB_STATS *mb_stats;
} MBGRAPH_FRAME_STATS;
struct VP9_COMP;
void vp9_update_mbgraph_stats(struct VP9_COMP *cpi);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_encodemb.h"
#include "vp9/encoder/vp9_lookahead.h" #include "vp9/encoder/vp9_lookahead.h"
#include "vp9/encoder/vp9_mbgraph.h"
#include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_mcomp.h"
#include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_quantize.h"
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
...@@ -100,20 +101,6 @@ typedef struct { ...@@ -100,20 +101,6 @@ typedef struct {
double count; double count;
} FIRSTPASS_STATS; } FIRSTPASS_STATS;
typedef struct {
struct {
int err;
union {
int_mv mv;
MB_PREDICTION_MODE mode;
} m;
} ref[MAX_REF_FRAMES];
} MBGRAPH_MB_STATS;
typedef struct {
MBGRAPH_MB_STATS *mb_stats;
} MBGRAPH_FRAME_STATS;
// This enumerator type needs to be kept aligned with the mode order in // This enumerator type needs to be kept aligned with the mode order in
// const MODE_DEFINITION vp9_mode_order[MAX_MODES] used in the rd code. // const MODE_DEFINITION vp9_mode_order[MAX_MODES] used in the rd code.
typedef enum { typedef enum {
......
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