--- branches/dev-api-4/xvidcore/vfw/src/codec.c 2003/05/17 13:37:49 1032 +++ branches/dev-api-4/xvidcore/vfw/src/codec.c 2003/06/09 01:25:19 1053 @@ -243,7 +243,9 @@ LRESULT compress_frames_info(CODEC * codec, ICCOMPRESSFRAMES * icf) { - //DPRINTF("%i %i", icf->lStartFrame, icf->lFrameCount); +#if 0 + DPRINTF("%i %i", icf->lStartFrame, icf->lFrameCount); +#endif codec->fincr = icf->dwScale; codec->fbase = icf->dwRate; return ICERR_OK; @@ -316,7 +318,7 @@ memset(&create, 0, sizeof(create)); create.version = XVID_VERSION; - // zones + /* zones */ create.zones = malloc(sizeof(xvid_enc_zone_t) * codec->config.num_zones); create.num_zones = codec->config.num_zones; for (i=0; i < create.num_zones; i++) { @@ -331,7 +333,7 @@ create.zones[i].base = 100; } - // plugins + /* plugins */ create.plugins = plugins; switch (codec->config.mode) { @@ -363,6 +365,18 @@ pass2.bitrate = codec->config.bitrate * CONFIG_KBPS; pass2.filename = codec->config.stats; + pass2.keyframe_boost = codec->config.keyframe_boost; /* keyframe boost percentage: [0..100...]; */ + pass2.payback_method = codec->config.bitrate_payback_method; + pass2.bitrate_payback_delay = codec->config.bitrate_payback_delay; + pass2.curve_compression_high = codec->config.curve_compression_high; + pass2.curve_compression_low = codec->config.curve_compression_low; + pass2.max_overflow_improvement = codec->config.twopass_max_overflow_improvement; + pass2.max_overflow_degradation = codec->config.twopass_max_overflow_degradation; + pass2.kftreshold = codec->config.kftreshold; + pass2.kfreduction = codec->config.kfreduction; + pass2.min_key_interval = codec->config.min_key_interval; + pass2.container_frame_overhead = 24; /* AVI */ + plugins[create.num_plugins].func = xvid_plugin_2pass2; plugins[create.num_plugins].param = &pass2; create.num_plugins++; @@ -713,7 +727,7 @@ if (get_colorspace(inhdr) != XVID_CSP_NULL) { memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER)); - // XXX: should we set outhdr->biSize ?? + /* XXX: should we set outhdr->biSize ?? */ return ICERR_OK; } /* --- yv12 --- */