--- trunk/vfw/src/codec.h 2002/03/16 11:40:48 30 +++ trunk/vfw/src/codec.h 2002/09/24 14:25:42 532 @@ -6,7 +6,8 @@ #include "config.h" #include "xvid.h" -#define DEBUG(X) OutputDebugString(X) +#define DEBUG(X) +// OutputDebugString(X) #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); } @@ -18,6 +19,7 @@ // { char tmp[120]; wsprintf(tmp, "%s %i %i %i %i %i", (X), (A), (B), (C), (D), (E)); OutputDebugString(tmp); } #define DEBUGFOURCC(X,Y) // { char tmp[120]; wsprintf(tmp, "%s %c %c %c %c", (X), (Y)&0xff, ((Y)>>8)&0xff, ((Y)>>16)&0xff, ((Y)>>24)&0xff); OutputDebugString(tmp); } +#define DEBUGERR(X) OutputDebugString(X) #define DEBUG2P(X) OutputDebugString(X) #define DEBUG1ST(A,B,C,D,E,F,G) { char tmp[120]; wsprintf(tmp, "1st-pass: size:%d total-kbytes:%d %s quant:%d %s kblocks:%d mblocks:%d", (A), (B), (C) ? "intra" : "inter", (D), (E), (F), (G)); OutputDebugString(tmp); } #define DEBUG2ND(A,B,C,D,E,F,G,H) { char tmp[120]; wsprintf(tmp, "2nd-pass: quant:%d %s %s stats1:%d scaled:%d actual:%d overflow:%d %s", (A), (B), (C) ? "intra" : "inter", (D), (E), (F), (G), (H) ? "credits" : "movie"); OutputDebugString(tmp); } @@ -89,20 +91,34 @@ 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 keyframe_locations[20480]; + int max_framesize; + int minpsize, minisize; + double movie_curve; + double credits_start_curve; + double credits_end_curve; double average_frame; double curve_comp_scale; - int overflow; + double curve_bias_bonus; + double alt_curve_low; + double alt_curve_high; + double alt_curve_low_diff; + double alt_curve_high_diff; + double alt_curve_mid_qual; + double alt_curve_qual_dev; + int overflow, KF_idx, KFoverflow, KFoverflow_partial; + int quant_count[32]; NNSTATS nns1; NNSTATS nns2; @@ -146,12 +162,12 @@ 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); +// added by Koepi for greyscale credits +int check_greyscale_mode(CONFIG *, XVID_ENC_FRAME* , int); +// end of koepi's additions -#endif /* _CODEC_H_ */ \ No newline at end of file +#endif /* _CODEC_H_ */