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

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

Browse Source
This commit is contained in:
Dmitry Kovalev 2014-02-04 16:53:55 -08:00 committed by Gerrit Code Review
commit 96cabf8de1
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vp9/encoder/vp9_mbgraph.h
View File

@ -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"

15
vp9/encoder/vp9_onyx_int.h
View File

@ -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 {
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 {