summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpegvideo.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegvideo.h')
-rw-r--r--src/libffmpeg/libavcodec/mpegvideo.h224
1 files changed, 146 insertions, 78 deletions
diff --git a/src/libffmpeg/libavcodec/mpegvideo.h b/src/libffmpeg/libavcodec/mpegvideo.h
index 962672005..d50d1ad0e 100644
--- a/src/libffmpeg/libavcodec/mpegvideo.h
+++ b/src/libffmpeg/libavcodec/mpegvideo.h
@@ -20,12 +20,12 @@
#ifndef AVCODEC_MPEGVIDEO_H
#define AVCODEC_MPEGVIDEO_H
-#define FRAME_SKIPED 100 /* return value for header parsers if frame is not coded */
+#define FRAME_SKIPED 100 // return value for header parsers if frame is not coded
enum OutputFormat {
FMT_MPEG1,
FMT_H263,
- FMT_MJPEG,
+ FMT_MJPEG,
};
#define MPEG_BUF_SIZE (16 * 1024)
@@ -53,7 +53,7 @@ typedef struct Predictor{
typedef struct RateControlEntry{
int pict_type;
- int qscale;
+ float qscale;
int mv_bits;
int i_tex_bits;
int p_tex_bits;
@@ -76,12 +76,10 @@ typedef struct RateControlContext{
Predictor pred[5];
double short_term_qsum; /* sum of recent qscales */
double short_term_qcount; /* count of recent qscales */
- double pass1_bits; /* bits outputted by the pass1 code (including complexity init) */
+ double pass1_rc_eq_output_sum;/* sum of the output of the rc equation, this is used for normalization */
double pass1_wanted_bits; /* bits which should have been outputed by the pass1 code (including complexity init) */
double last_qscale;
- double last_qscale_for[5]; /* last qscale for a specific pict type */
- double next_non_b_qscale;
- double next_p_qscale;
+ double last_qscale_for[5]; /* last qscale for a specific pict type, used for max_diff & ipb factor stuff */
int last_mc_mb_var_sum;
int last_mb_var_sum;
UINT64 i_cplx_sum[5];
@@ -89,6 +87,7 @@ typedef struct RateControlContext{
UINT64 mv_bits_sum[5];
UINT64 qscale_sum[5];
int frame_count[5];
+ int last_non_b_pict_type;
}RateControlContext;
typedef struct ReorderBuffer{
@@ -100,6 +99,12 @@ typedef struct ReorderBuffer{
int picture_in_gop_number;
} ReorderBuffer;
+typedef struct ScanTable{
+ const UINT8 *scantable;
+ UINT8 permutated[64];
+ UINT8 raster_end[64];
+} ScanTable;
+
typedef struct MpegEncContext {
struct AVCodecContext *avctx;
/* the following parameters must be initialized before encoding */
@@ -117,7 +122,7 @@ typedef struct MpegEncContext {
int h263_rv10; /* use RV10 variation for H263 */
int h263_msmpeg4; /* generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)*/
int h263_intel; /* use I263 intel h263 header */
-
+
int codec_id; /* see CODEC_ID_xxx */
int fixed_qscale; /* fixed qscale if non zero */
float qcompress; /* amount of qscale change between easy & hard scenes (0.0-1.0) */
@@ -177,7 +182,7 @@ typedef struct MpegEncContext {
INT16 (*ac_val[3])[16]; /* used for for mpeg4 AC prediction, all 3 arrays must be continuous */
int ac_pred;
int mb_skiped; /* MUST BE SET only during DECODING */
- UINT8 *mbskip_table; /* used to avoid copy if macroblock skipped (for black regions for example)
+ UINT8 *mbskip_table; /* used to avoid copy if macroblock skipped (for black regions for example)
and used for b-frame encoding & decoding (contains skip table of next P Frame) */
UINT8 *mbintra_table; /* used to avoid setting {ac, dc, cbp}-pred stuff to zero on inter MB decoding */
UINT8 *cbp_table; /* used to store cbp, ac_pred for partitioned decoding */
@@ -189,6 +194,9 @@ typedef struct MpegEncContext {
int input_pict_type; /* pict_type prior to reordering of frames */
int force_type; /* 0= no force, otherwise I_TYPE, P_TYPE, ... */
int qscale; /* QP */
+ float frame_qscale; /* qscale from the frame level rc */
+ int adaptive_quant; /* use adaptive quantization */
+ int dquant; /* qscale difference to prev qscale */
int pict_type; /* I_TYPE, P_TYPE, B_TYPE, ... */
int last_pict_type;
int last_non_b_pict_type; /* used for mpeg4 gmc b-frames & ratecontrol */
@@ -218,14 +226,14 @@ typedef struct MpegEncContext {
int mv_dir;
#define MV_DIR_BACKWARD 1
#define MV_DIR_FORWARD 2
-#define MV_DIRECT 4 /* bidirectional mode where the difference equals the MV of the last P/S/I-Frame (mpeg4) */
+#define MV_DIRECT 4 // bidirectional mode where the difference equals the MV of the last P/S/I-Frame (mpeg4)
int mv_type;
#define MV_TYPE_16X16 0 /* 1 vector for the whole mb */
#define MV_TYPE_8X8 1 /* 4 vectors (h263, mpeg4 4MV) */
-#define MV_TYPE_16X8 2 /* 2 vectors, one per 16x8 block */
-#define MV_TYPE_FIELD 3 /* 2 vectors, one per field */
+#define MV_TYPE_16X8 2 /* 2 vectors, one per 16x8 block */
+#define MV_TYPE_FIELD 3 /* 2 vectors, one per field */
#define MV_TYPE_DMV 4 /* 2 vectors, special mpeg2 Dual Prime Vectors */
- /* motion vectors for a macroblock
+ /* motion vectors for a macroblock
first coordinate : 0 = forward 1 = backward
second " : depend on type
third " : 0 = x, 1 = y
@@ -237,18 +245,19 @@ typedef struct MpegEncContext {
UINT8 *fcode_tab; /* smallest fcode needed for each MV */
int has_b_frames;
- int no_rounding; /* apply no rounding to motion compensation (MPEG4, msmpeg4, ...)
+ int no_rounding; /* apply no rounding to motion compensation (MPEG4, msmpeg4, ...)
for b-frames rounding mode is allways 0 */
int hurry_up; /* when set to 1 during decoding, b frames will be skiped
when set to 2 idct/dequant will be skipped too */
-
+
/* macroblock layer */
int mb_x, mb_y;
int mb_incr;
int mb_intra;
UINT16 *mb_var; /* Table for MB variances */
UINT16 *mc_mb_var; /* Table for motion compensated MB variances */
+ UINT8 *mb_mean; /* Table for MB luminance */
UINT8 *mb_type; /* Table for MB type */
#define MB_TYPE_INTRA 0x01
#define MB_TYPE_INTER 0x02
@@ -283,17 +292,28 @@ typedef struct MpegEncContext {
UINT16 __align8 q_intra_matrix16_bias[32][64];
UINT16 __align8 q_inter_matrix16_bias[32][64];
int block_last_index[6]; /* last non zero coefficient in block */
+ /* scantables */
+ ScanTable intra_scantable;
+ ScanTable intra_h_scantable;
+ ScanTable intra_v_scantable;
+ ScanTable inter_scantable; // if inter == intra then intra should be used to reduce tha cache usage
+ UINT8 idct_permutation[64];
+ int idct_permutation_type;
+#define FF_NO_IDCT_PERM 1
+#define FF_LIBMPEG2_IDCT_PERM 2
+#define FF_SIMPLE_IDCT_PERM 3
+#define FF_TRANSPOSE_IDCT_PERM 4
void *opaque; /* private data for the user */
/* bit rate control */
- int I_frame_bits; /* FIXME used in mpeg12 ... */
+ int I_frame_bits; //FIXME used in mpeg12 ...
int mb_var_sum; /* sum of MB variance for current frame */
int mc_mb_var_sum; /* motion compensated MB variance for current frame */
INT64 wanted_bits;
INT64 total_bits;
int frame_bits; /* bits used for the current frame */
- RateControlContext rc_context; /* contains stuff only accessed in ratecontrol.c */
+ RateControlContext rc_context; // contains stuff only accessed in ratecontrol.c
/* statistics, used for 2-pass encoding */
int mv_bits;
@@ -304,39 +324,43 @@ typedef struct MpegEncContext {
int f_count;
int b_count;
int skip_count;
- int misc_bits; /* cbp, mb_type */
- int last_bits; /* temp var used for calculating the above vars */
-
+ int misc_bits; // cbp, mb_type
+ int last_bits; //temp var used for calculating the above vars
+
/* error concealment / resync */
+ UINT8 *error_status_table; /* table of the error status of each MB */
+#define VP_START 1 /* current MB is the first after a resync marker */
+#define AC_ERROR 2
+#define DC_ERROR 4
+#define MV_ERROR 8
+#define AC_END 16
+#define DC_END 32
+#define MV_END 64
+//FIXME some prefix?
+
int resync_mb_x; /* x position of last resync marker */
int resync_mb_y; /* y position of last resync marker */
- int mb_num_left; /* number of MBs left in this video packet */
- GetBitContext next_resync_gb; /* starts at the next resync marker */
- int next_resync_qscale; /* qscale of next resync marker */
- int next_resync_pos; /* bitstream position of next resync marker */
-#define DECODING_AC_LOST -1
-#define DECODING_ACDC_LOST -2
-#define DECODING_DESYNC -3
- int decoding_error;
+ GetBitContext last_resync_gb; /* used to serach for the next resync marker */
+ int mb_num_left; /* number of MBs left in this video packet (for partitioned Slices only)*/
int next_p_frame_damaged; /* set if the next p frame is damaged, to avoid showing trashed b frames */
int error_resilience;
/* H.263 specific */
int gob_number;
int gob_index;
-
+
/* H.263+ specific */
int umvplus;
int umvplus_dec;
int h263_aic; /* Advanded INTRA Coding (AIC) */
int h263_aic_dir; /* AIC direction: 0 = left, 1 = top */
-
+
/* mpeg4 specific */
int time_increment_resolution;
int time_increment_bits; /* number of bits to represent the fractional part of time */
int last_time_base;
int time_base; /* time in seconds of last I,P,S Frame */
- INT64 time; /* time of current frame */
+ INT64 time; /* time of current frame */
INT64 last_non_b_time;
UINT16 pp_time; /* time distance between the last 2 p,s,i frames */
UINT16 pb_time; /* time distance between the last b and p,s,i frame */
@@ -351,12 +375,12 @@ typedef struct MpegEncContext {
int sprite_brightness_change;
int num_sprite_warping_points;
int real_sprite_warping_points;
- int sprite_offset[2][2];
- int sprite_delta[2][2][2];
- int sprite_shift[2][2];
+ int sprite_offset[2][2]; /* sprite offset[isChroma][isMVY] */
+ int sprite_delta[2][2]; /* sprite_delta [isY][isMVY] */
+ int sprite_shift[2]; /* sprite shift [isChroma] */
int mcsel;
int quant_precision;
- int quarter_sample; /* 1->qpel, 0->half pel ME/MC */
+ int quarter_sample; /* 1->qpel, 0->half pel ME/MC */
int scalability;
int hierachy_type;
int enhancement_type;
@@ -367,7 +391,8 @@ typedef struct MpegEncContext {
int aspected_height;
int sprite_warping_accuracy;
int low_latency_sprite;
- int data_partitioning;
+ int data_partitioning; /* data partitioning flag from header */
+ int partitioned_frame; /* is current frame partitioned */
int rvlc; /* reversible vlc */
int resync_marker; /* could this stream contain resync markers*/
int low_delay; /* no reordering needed / has no b-frames */
@@ -376,7 +401,7 @@ typedef struct MpegEncContext {
PutBitContext tex_pb; /* used for data partitioned VOPs */
PutBitContext pb2; /* used for data partitioned VOPs */
#define PB_BUFFER_SIZE 1024*256
- uint8_t *tex_pb_buffer;
+ uint8_t *tex_pb_buffer;
uint8_t *pb2_buffer;
int mpeg_quant;
#define CO_LOCATED_TYPE_4MV 1
@@ -385,18 +410,25 @@ typedef struct MpegEncContext {
INT16 (*field_mv_table)[2][2]; /* used for interlaced b frame decoding */
INT8 (*field_select_table)[2]; /* wtf, no really another table for interlaced b frames */
int t_frame; /* time distance of first I -> B, used for interlaced b frames */
+ int padding_bug_score; /* used to detect the VERY common padding bug in MPEG4 */
/* divx specific, used to workaround (many) bugs in divx5 */
int divx_version;
int divx_build;
#define BITSTREAM_BUFFER_SIZE 1024*256
- UINT8 *bitstream_buffer; /* Divx 5.01 puts several frames in a single one, this is used to reorder them */
+ UINT8 *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
int bitstream_buffer_size;
-
+
+ int xvid_build;
+
+ /* lavc specific stuff, used to workaround bugs in libavcodec */
+ int ffmpeg_version;
+ int lavc_build;
+
/* RV10 specific */
int rv10_version; /* RV10 version: 0 or 3 */
int rv10_first_dc_coded[3];
-
+
/* MJPEG specific */
struct MJpegContext *mjpeg_ctx;
int mjpeg_vsample[3]; /* vertical sampling factors, default = {2, 1, 1} */
@@ -418,10 +450,6 @@ typedef struct MpegEncContext {
int per_mb_rl_table;
int esc3_level_length;
int esc3_run_length;
- UINT8 *inter_scantable;
- UINT8 *intra_scantable;
- UINT8 *intra_v_scantable;
- UINT8 *intra_h_scantable;
/* [mb_intra][isChroma][level][run][last] */
int (*ac_stats)[2][MAX_LEVEL+1][MAX_RUN+1][2];
int inter_intra_pred;
@@ -453,7 +481,7 @@ typedef struct MpegEncContext {
int interlaced_dct;
int last_qscale;
int first_slice;
-
+
/* RTP specific */
/* These are explained on avcodec.h */
int rtp_mode;
@@ -462,25 +490,35 @@ typedef struct MpegEncContext {
UINT8 *ptr_lastgob;
UINT8 *ptr_last_mb_line;
UINT32 mb_line_avgsize;
-
+
DCTELEM (*block)[64]; /* points to one of the following blocks */
- DCTELEM blocks[2][6][64] __align8; /* for HQ mode we need to keep the best block */
- void (*dct_unquantize_mpeg1)(struct MpegEncContext *s,
+ DCTELEM blocks[2][6][64] __align8; // for HQ mode we need to keep the best block
+ int (*decode_mb)(struct MpegEncContext *s, DCTELEM block[6][64]); // used by some codecs to avoid a switch()
+#define SLICE_OK 0
+#define SLICE_ERROR -1
+#define SLICE_END -2 //end marker found
+#define SLICE_NOEND -3 //no end marker or error found but mb count exceeded
+
+ void (*dct_unquantize_mpeg1)(struct MpegEncContext *s,
DCTELEM *block, int n, int qscale);
- void (*dct_unquantize_mpeg2)(struct MpegEncContext *s,
+ void (*dct_unquantize_mpeg2)(struct MpegEncContext *s,
DCTELEM *block, int n, int qscale);
- void (*dct_unquantize_h263)(struct MpegEncContext *s,
+ void (*dct_unquantize_h263)(struct MpegEncContext *s,
DCTELEM *block, int n, int qscale);
- void (*dct_unquantize)(struct MpegEncContext *s, /* unquantizer to use (mpeg4 can use both) */
+ void (*dct_unquantize)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both)
DCTELEM *block, int n, int qscale);
int (*dct_quantize)(struct MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
- void (*fdct)(DCTELEM *block);
+ void (*fdct)(DCTELEM *block/* align 16*/);
+ void (*idct_put)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
+ void (*idct_add)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
} MpegEncContext;
+
+int DCT_common_init(MpegEncContext *s);
int MPV_common_init(MpegEncContext *s);
void MPV_common_end(MpegEncContext *s);
void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
-void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx);
+int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx);
void MPV_frame_end(MpegEncContext *s);
#ifdef HAVE_MMX
void MPV_common_init_mmx(MpegEncContext *s);
@@ -491,13 +529,38 @@ void MPV_common_init_axp(MpegEncContext *s);
#ifdef HAVE_MLIB
void MPV_common_init_mlib(MpegEncContext *s);
#endif
+#ifdef HAVE_MMI
+void MPV_common_init_mmi(MpegEncContext *s);
+#endif
extern void (*draw_edges)(UINT8 *buf, int wrap, int width, int height, int w);
void ff_conceal_past_errors(MpegEncContext *s, int conceal_all);
void ff_copy_bits(PutBitContext *pb, UINT8 *src, int length);
void ff_clean_intra_table_entries(MpegEncContext *s);
+void ff_init_scantable(MpegEncContext *s, ScanTable *st, const UINT8 *src_scantable);
+void ff_error_resilience(MpegEncContext *s);
+void ff_draw_horiz_band(MpegEncContext *s);
extern int ff_bit_exact;
+static inline void ff_init_block_index(MpegEncContext *s){
+ s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1 + s->mb_x*2;
+ s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1) + s->mb_x*2;
+ s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1 + s->mb_x*2;
+ s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2) + s->mb_x*2;
+ s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x;
+ s->block_index[5]= s->block_wrap[4]*(s->mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x;
+}
+
+static inline void ff_update_block_index(MpegEncContext *s){
+ s->block_index[0]+=2;
+ s->block_index[1]+=2;
+ s->block_index[2]+=2;
+ s->block_index[3]+=2;
+ s->block_index[4]++;
+ s->block_index[5]++;
+}
+
+
/* motion_est.c */
void ff_estimate_p_frame_motion(MpegEncContext * s,
int mb_x, int mb_y);
@@ -507,9 +570,10 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type);
void ff_fix_long_p_mvs(MpegEncContext * s);
void ff_fix_long_b_mvs(MpegEncContext * s, int16_t (*mv_table)[2], int f_code, int type);
+
/* mpeg12.c */
-extern INT16 ff_mpeg1_default_intra_matrix[64];
-extern INT16 ff_mpeg1_default_non_intra_matrix[64];
+extern const INT16 ff_mpeg1_default_intra_matrix[64];
+extern const INT16 ff_mpeg1_default_non_intra_matrix[64];
extern UINT8 ff_mpeg1_dc_scale_table[128];
void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
@@ -518,6 +582,7 @@ void mpeg1_encode_mb(MpegEncContext *s,
int motion_x, int motion_y);
void ff_mpeg1_encode_init(MpegEncContext *s);
+
/* h263enc.c */
typedef struct RLTable {
int n; /* number of entries of table_vlc minus 1 */
@@ -548,76 +613,79 @@ static inline int get_rl_index(const RLTable *rl, int last, int run, int level)
extern UINT8 ff_mpeg4_y_dc_scale_table[32];
extern UINT8 ff_mpeg4_c_dc_scale_table[32];
-extern INT16 ff_mpeg4_default_intra_matrix[64];
-extern INT16 ff_mpeg4_default_non_intra_matrix[64];
-
-void h263_encode_mb(MpegEncContext *s,
+extern const INT16 ff_mpeg4_default_intra_matrix[64];
+extern const INT16 ff_mpeg4_default_non_intra_matrix[64];
+void h263_encode_mb(MpegEncContext *s,
DCTELEM block[6][64],
int motion_x, int motion_y);
-void mpeg4_encode_mb(MpegEncContext *s,
+void mpeg4_encode_mb(MpegEncContext *s,
DCTELEM block[6][64],
int motion_x, int motion_y);
void h263_encode_picture_header(MpegEncContext *s, int picture_number);
int h263_encode_gob_header(MpegEncContext * s, int mb_line);
-INT16 *h263_pred_motion(MpegEncContext * s, int block,
+INT16 *h263_pred_motion(MpegEncContext * s, int block,
int *px, int *py);
-void mpeg4_pred_ac(MpegEncContext * s, INT16 *block, int n,
+void mpeg4_pred_ac(MpegEncContext * s, INT16 *block, int n,
int dir);
void ff_set_mpeg4_time(MpegEncContext * s, int picture_number);
void mpeg4_encode_picture_header(MpegEncContext *s, int picture_number);
void h263_encode_init(MpegEncContext *s);
-
void h263_decode_init_vlc(MpegEncContext *s);
int h263_decode_picture_header(MpegEncContext *s);
-int h263_decode_gob_header(MpegEncContext *s);
-int mpeg4_decode_picture_header(MpegEncContext * s);
+int ff_h263_decode_gob_header(MpegEncContext *s);
+int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb);
+
+
int intel_h263_decode_picture_header(MpegEncContext *s);
-int h263_decode_mb(MpegEncContext *s,
- DCTELEM block[6][64]);
+int ff_h263_decode_mb(MpegEncContext *s,
+ DCTELEM block[6][64]);
int h263_get_picture_format(int width, int height);
-int ff_mpeg4_decode_video_packet_header(MpegEncContext *s);
-int ff_mpeg4_resync(MpegEncContext *s);
void ff_mpeg4_encode_video_packet_header(MpegEncContext *s);
void ff_mpeg4_clean_buffers(MpegEncContext *s);
void ff_mpeg4_stuffing(PutBitContext * pbc);
void ff_mpeg4_init_partitions(MpegEncContext *s);
void ff_mpeg4_merge_partitions(MpegEncContext *s);
-extern inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *dir_ptr);
+void ff_clean_mpeg4_qscales(MpegEncContext *s);
+void ff_clean_h263_qscales(MpegEncContext *s);
+int ff_mpeg4_decode_partitions(MpegEncContext *s);
+int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s);
+int ff_h263_resync(MpegEncContext *s);
+int ff_h263_get_gob_height(MpegEncContext *s);
+
/* rv10.c */
void rv10_encode_picture_header(MpegEncContext *s, int picture_number);
int rv_decode_dc(MpegEncContext *s, int n);
+
/* msmpeg4.c */
void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number);
void msmpeg4_encode_ext_header(MpegEncContext * s);
-void msmpeg4_encode_mb(MpegEncContext * s,
+void msmpeg4_encode_mb(MpegEncContext * s,
DCTELEM block[6][64],
int motion_x, int motion_y);
int msmpeg4_decode_picture_header(MpegEncContext * s);
int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size);
-int msmpeg4_decode_mb(MpegEncContext *s,
- DCTELEM block[6][64]);
int ff_msmpeg4_decode_init(MpegEncContext *s);
void ff_msmpeg4_encode_init(MpegEncContext *s);
-/* mjpegenc.c */
+/* mjpegenc.c */
int mjpeg_init(MpegEncContext *s);
void mjpeg_close(MpegEncContext *s);
-void mjpeg_encode_mb(MpegEncContext *s,
+void mjpeg_encode_mb(MpegEncContext *s,
DCTELEM block[6][64]);
void mjpeg_picture_header(MpegEncContext *s);
void mjpeg_picture_trailer(MpegEncContext *s);
+
/* rate control */
int ff_rate_control_init(MpegEncContext *s);
-int ff_rate_estimate_qscale(MpegEncContext *s);
-int ff_rate_estimate_qscale_pass2(MpegEncContext *s);
+float ff_rate_estimate_qscale(MpegEncContext *s);
void ff_write_pass1_stats(MpegEncContext *s);
void ff_rate_control_uninit(MpegEncContext *s);
double ff_eval(char *s, double *const_value, char **const_name,
- double (**func1)(void *, double), char **func1_name,
+ double (**func1)(void *, double), char **func1_name,
double (**func2)(void *, double, double), char **func2_name,
void *opaque);