--- trunk/vfw/src/codec.c 2002/08/01 12:56:29 355 +++ branches/dev-api-3/vfw/src/codec.c 2002/10/24 07:28:18 609 @@ -43,7 +43,7 @@ * motion search precision = 0 now effective in 2-pass * modulated quantization * added DX50 fourcc - * 01.12.2001 inital version; (c)2001 peter ross + * 01.12.2001 inital version; (c)2001 peter ross * *************************************************************************/ @@ -54,11 +54,11 @@ #include "2pass.h" int pmvfast_presets[7] = { - 0, PMV_QUICKSTOP16, PMV_EARLYSTOP16, PMV_EARLYSTOP16 | PMV_EARLYSTOP8, - PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 | PMV_HALFPELDIAMOND8, - PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 | PMV_HALFPELDIAMOND8, - PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | - PMV_EARLYSTOP8 | PMV_HALFPELREFINE8 | PMV_HALFPELDIAMOND8 + 0, PMV_QUICKSTOP16, 0, 0, + 0 | PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8, + 0 | PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8 | + PMV_ADVANCEDDIAMOND16, PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | + PMV_HALFPELREFINE8 | PMV_HALFPELDIAMOND8 | PMV_USESQUARES16 }; /* return xvid compatbile colorspace, @@ -67,59 +67,63 @@ int get_colorspace(BITMAPINFOHEADER * hdr) { - if (hdr->biHeight < 0) - { - DEBUGERR("colorspace: inverted input format not supported"); - return XVID_CSP_NULL; - } - + /* rgb only: negative height specifies top down image */ + int rgb_flip = (hdr->biHeight < 0 ? 0 : XVID_CSP_VFLIP); + switch(hdr->biCompression) { case BI_RGB : if (hdr->biBitCount == 16) { DEBUG("RGB16 (RGB555)"); - return XVID_CSP_VFLIP | XVID_CSP_RGB555; + return rgb_flip | XVID_CSP_RGB555; } if (hdr->biBitCount == 24) { DEBUG("RGB24"); - return XVID_CSP_VFLIP | XVID_CSP_RGB24; + return rgb_flip | XVID_CSP_RGB24; } if (hdr->biBitCount == 32) { DEBUG("RGB32"); - return XVID_CSP_VFLIP | XVID_CSP_RGB32; + return rgb_flip | XVID_CSP_RGB32; } - DEBUG1("BI_RGB unsupported", hdr->biBitCount); + DEBUG1("unsupported BI_RGB biBitCount", hdr->biBitCount); return XVID_CSP_NULL; -// how do these work in BITMAPINFOHEADER ??? -/* case BI_BITFIELDS : - if (hdr->biBitCount == 16 - if(hdr->biBitCount == 16 && - hdr->bV4RedMask == 0x7c00 && - hdr->bV4GreenMask == 0x3e0 && - hdr->bV4BlueMask == 0x1f) - { - DEBUG("RGB555"); - return XVID_CSP_VFLIP | XVID_CSP_RGB555; - } - if(hdr->bV4BitCount == 16 && - hdr->bV4RedMask == 0xf800 && - hdr->bV4GreenMask == 0x7e0 && - hdr->bV4BlueMask == 0x1f) + case BI_BITFIELDS : + if (hdr->biSize >= sizeof(BITMAPV4HEADER)) { - DEBUG("RGB565"); - return XVID_CSP_VFLIP | XVID_CSP_RGB565; + BITMAPV4HEADER * hdr4 = (BITMAPV4HEADER *)hdr; + + if (hdr4->bV4BitCount == 16 && + hdr4->bV4RedMask == 0x7c00 && + hdr4->bV4GreenMask == 0x3e0 && + hdr4->bV4BlueMask == 0x1f) + { + DEBUG("RGB555"); + return rgb_flip | XVID_CSP_RGB555; + } + + if(hdr4->bV4BitCount == 16 && + hdr4->bV4RedMask == 0xf800 && + hdr4->bV4GreenMask == 0x7e0 && + hdr4->bV4BlueMask == 0x1f) + { + DEBUG("RGB565"); + return rgb_flip | XVID_CSP_RGB565; + } + + DEBUG("unsupported BI_BITFIELDS mode"); + return XVID_CSP_NULL; } - DEBUG1("BI_FIELDS unsupported", hdr->bV4BitCount); + DEBUG("unsupported BI_BITFIELDS/BITMAPHEADER combination"); return XVID_CSP_NULL; -*/ - case FOURCC_I420: - case FOURCC_IYUV: + + case FOURCC_I420 : + case FOURCC_IYUV : DEBUG("IYUY"); return XVID_CSP_I420; @@ -129,21 +133,21 @@ case FOURCC_YUYV : case FOURCC_YUY2 : - case FOURCC_V422 : DEBUG("YUY2"); return XVID_CSP_YUY2; - case FOURCC_YVYU: + case FOURCC_YVYU : DEBUG("YVYU"); return XVID_CSP_YVYU; - case FOURCC_UYVY: + case FOURCC_UYVY : DEBUG("UYVY"); return XVID_CSP_UYVY; + default : + DEBUGFOURCC("unsupported colorspace", hdr->biCompression); + return XVID_CSP_NULL; } - DEBUGFOURCC("colorspace: unknown", hdr->biCompression); - return XVID_CSP_NULL; } @@ -194,7 +198,6 @@ memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER)); outhdr->biSize = sizeof(BITMAPINFOHEADER); - outhdr->biBitCount = 24; // or 16 outhdr->biSizeImage = compress_get_size(codec, lpbiInput, lpbiOutput); outhdr->biXPelsPerMeter = 0; outhdr->biYPelsPerMeter = 0; @@ -233,6 +236,13 @@ // DEBUG2("frate fscale", codec->frate, codec->fscale); codec->fincr = icf->dwScale; codec->fbase = icf->dwRate; + + if (codec->fbase == 0 || codec->fincr == 0) + { + codec->fbase = 25; + codec->fincr = 1; + } + return ICERR_OK; } @@ -385,6 +395,8 @@ frame.intra = -1; frame.general |= XVID_HALFPEL; +// frame.general |= XVID_ME_EPZS; + if (codec->config.motion_search > 4) frame.general |= XVID_INTER4V; @@ -393,13 +405,16 @@ frame.general |= XVID_LUMIMASKING; if (codec->config.interlacing) - frame.general |= XVID_INTERLACING; - -// added by koepi for gruel's greyscale_mode - if (codec->config.greyscale) - frame.general |= XVID_GREYSCALE; - -// end of koepi's addition + frame.general |= XVID_INTERLACING; + + + +// added by koepi for credits greyscale + + check_greyscale_mode(&codec->config, &frame, codec->framenum); + +// end of koepi's addition + // fix 1pass modes/hinted MV by koepi if (codec->config.hinted_me && (codec->config.mode == DLG_MODE_CBR || codec->config.mode == DLG_MODE_VBR_QUAL || codec->config.mode == DLG_MODE_VBR_QUANT)) @@ -740,6 +755,12 @@ case DLG_MODE_VBR_QUAL : if (codec_is_in_credits(&codec->config, codec->framenum)) { +// added by koepi for credits greyscale + + check_greyscale_mode(&codec->config, frame, codec->framenum); + +// end of koepi's addition + switch (codec->config.credits_mode) { case CREDITS_MODE_RATE : @@ -757,6 +778,12 @@ } else { +// added by koepi for credits greyscale + + check_greyscale_mode(&codec->config, frame, codec->framenum); + +// end of koepi's addition + frame->quant = codec_get_vbr_quant(&codec->config, codec->config.quality); } return ICERR_OK; @@ -764,6 +791,12 @@ case DLG_MODE_VBR_QUANT : if (codec_is_in_credits(&codec->config, codec->framenum)) { +// added by koepi for credits greyscale + + check_greyscale_mode(&codec->config, frame, codec->framenum); + +// end of koepi's addition + switch (codec->config.credits_mode) { case CREDITS_MODE_RATE : @@ -783,11 +816,23 @@ } else { +// added by koepi for credits greyscale + + check_greyscale_mode(&codec->config, frame, codec->framenum); + +// end of koepi's addition + frame->quant = codec->config.quant; } return ICERR_OK; case DLG_MODE_2PASS_1 : +// added by koepi for credits greyscale + + check_greyscale_mode(&codec->config, frame, codec->framenum); + +// end of koepi's addition + if (codec->config.credits_mode == CREDITS_MODE_QUANT) { if (codec_is_in_credits(&codec->config, codec->framenum)) @@ -878,3 +923,55 @@ return quant; } +// added by koepi for credits greyscale + +int check_greyscale_mode(CONFIG* config, XVID_ENC_FRAME* frame, int framenum) + +{ + + if ((codec_is_in_credits(config, framenum)) && (config->mode!=DLG_MODE_CBR)) + + { + + if (config->credits_greyscale) + + { + + if ((frame->general && XVID_GREYSCALE)) // use only if not already in greyscale + + frame->general |= XVID_GREYSCALE; + + } else { + + if (!(frame->general && XVID_GREYSCALE)) // if movie is in greyscale, switch back + + frame->general |= XVID_GREYSCALE; + + } + + } else { + + if (config->greyscale) + + { + + if ((frame->general && XVID_GREYSCALE)) // use only if not already in greyscale + + frame->general |= XVID_GREYSCALE; + + } else { + + if (!(frame->general && XVID_GREYSCALE)) // if credits is in greyscale, switch back + + frame->general |= XVID_GREYSCALE; + + } + + } + + return 0; + +} + +// end of koepi's addition +