--- trunk/vfw/src/codec.h 2002/03/23 06:58:56 61 +++ trunk/vfw/src/codec.h 2002/04/08 12:51:41 109 @@ -8,8 +8,7 @@ #define DEBUG(X) // OutputDebugString(X) -#define DEBUG1(X,A) -// { char tmp[120]; wsprintf(tmp, "%s %i", (X), (A)); OutputDebugString(tmp); } +#define DEBUG1(X,A) { char tmp[120]; wsprintf(tmp, "%s %i", (X), (A)); OutputDebugString(tmp); } #define DEBUG2(X,A,B) // { char tmp[120]; wsprintf(tmp, "%s %i %i", (X), (A), (B)); OutputDebugString(tmp); } #define DEBUG3(X,A,B,C) @@ -92,16 +91,20 @@ typedef struct { + HANDLE hints; HANDLE stats1; HANDLE stats2; + void * hintstream; + int bytes1; int bytes2; int desired_bytes2; - float movie_curve; - float credits_start_curve; - float credits_end_curve; + int max_framesize; + double movie_curve; + double credits_start_curve; + double credits_end_curve; double average_frame; double curve_comp_scale; @@ -113,6 +116,7 @@ double alt_curve_mid_qual; double alt_curve_qual_dev; int overflow; + int quant_count[32]; NNSTATS nns1; NNSTATS nns2; @@ -156,10 +160,7 @@ LRESULT decompress_end(CODEC *); LRESULT decompress(CODEC *, ICDECOMPRESS *); -int codec_2pass_init(CODEC *); int codec_get_quant(CODEC *, XVID_ENC_FRAME *); -int codec_2pass_get_quant(CODEC *, XVID_ENC_FRAME *); -int codec_2pass_update(CODEC *, XVID_ENC_FRAME *, XVID_ENC_STATS *); int codec_is_in_credits(CONFIG *, int); int codec_get_vbr_quant(CONFIG *, int);