diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-05-11 01:38:46 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-05-11 01:38:46 +0000 |
| commit | 1f202b0d46067375fbb7a7a6a164bb7f960dce96 (patch) | |
| tree | 94231b1fdc70c130feb2c6ed9dfca2648d1d3c91 /libavcodec/mpegvideo.h | |
| parent | af4091f194013c30f089e1f4b0f7067f1cd4ff65 (diff) | |
| download | ffmpeg-1f202b0d46067375fbb7a7a6a164bb7f960dce96.tar.gz | |
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
Originally committed as revision 3124 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index d09fd4e0a2..b36330d91e 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -196,6 +196,7 @@ struct MpegEncContext; * Motion estimation context. */ typedef struct MotionEstContext{ + AVCodecContext *avctx; int skip; ///< set if ME is skiped for the current MB int co_located_mv[4][2]; ///< mv from last p frame for direct mode ME int direct_basis_mv[4][2]; @@ -226,6 +227,10 @@ typedef struct MotionEstContext{ uint8_t *ref[4][4]; int stride; int uvstride; + /* temp variables for picture complexity calculation */ + int mc_mb_var_sum_temp; + int mb_var_sum_temp; + int scene_change_score; /* cmp, chroma_cmp;*/ op_pixels_func (*hpel_put)[4]; op_pixels_func (*hpel_avg)[4]; @@ -393,7 +398,6 @@ typedef struct MpegEncContext { uint8_t (*p_field_select_table[2]); uint8_t (*b_field_select_table[2][2]); int me_method; ///< ME algorithm - int scene_change_score; int mv_dir; #define MV_DIR_BACKWARD 1 #define MV_DIR_FORWARD 2 @@ -508,10 +512,6 @@ typedef struct MpegEncContext { int misc_bits; ///< cbp, mb_type int last_bits; ///< temp var used for calculating the above vars - /* temp variables for picture complexity calculation */ - int mc_mb_var_sum_temp; - int mb_var_sum_temp; - /* error concealment / resync */ int error_count; uint8_t *error_status_table; ///< table of the error status of each MB |