--- trunk/xvidcore/vfw/src/codec.c 2005/01/30 14:04:11 1597 +++ trunk/xvidcore/vfw/src/codec.c 2010/12/21 16:56:42 1914 @@ -3,6 +3,8 @@ * XVID VFW FRONTEND * codec * + * Copyright(C) Peter Ross + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,33 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - *************************************************************************/ - -/************************************************************************** - * - * History: - * - * 12.07.2002 num_threads - * 23.06.2002 XVID_CPU_CHKONLY; loading speed up - * 25.04.2002 ICDECOMPRESS_PREROLL - * 17.04.2002 re-enabled lumi masking for 1st pass - * 15.04.2002 updated cbr support - * 04.04.2002 separated 2-pass code to 2pass.c - * interlacing support - * hinted ME support - * 23.03.2002 daniel smith - * changed inter4v to only be in modes 5 or 6 - * fixed null mode crash ? - * merged foxer's alternative 2-pass code - * added DEBUGERR output on errors instead of returning - * 16.03.2002 daniel smith - * changed BITMAPV4HEADER to BITMAPINFOHEADER - * - prevents memcpy crash in compress_get_format() - * credits are processed in external 2pass mode - * motion search precision = 0 now effective in 2-pass - * modulated quantization - * added DX50 fourcc - * 01.12.2001 inital version; (c)2001 peter ross + * $Id: codec.c,v 1.28 2010-12-21 16:56:42 Isibaar Exp $ * *************************************************************************/ @@ -221,7 +197,7 @@ outhdr->biClrUsed = 0; outhdr->biClrImportant = 0; - if (codec->config.fourcc_used == 0) + if ((codec->config.fourcc_used == 0) || (profiles[codec->config.profile].flags & PROFILE_XVID)) { outhdr->biCompression = FOURCC_XVID; } @@ -421,8 +397,12 @@ xvid_plugin_single_t single; xvid_plugin_2pass1_t pass1; xvid_plugin_2pass2_t pass2; + xvid_plugin_lumimasking_t masking; + xvid_gbl_info_t info; int i; HANDLE hFile; + const quality_t* quality_preset = (codec->config.quality==quality_table_num) ? + &codec->config.quality_user : &quality_table[codec->config.quality]; CONFIG tmpCfg; /* if we want to alter config to suit our needs, it shouldn't be visible to user later */ memcpy(&tmpCfg, &codec->config, sizeof(CONFIG)); @@ -440,9 +420,19 @@ init.debug = codec->config.debug; codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL); + memset(&info, 0, sizeof(info)); + info.version = XVID_VERSION; + codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL); + memset(&create, 0, sizeof(create)); create.version = XVID_VERSION; + /* Encoder threads */ + if (codec->config.cpu & XVID_CPU_FORCE) + create.num_threads = codec->config.num_threads; + else + create.num_threads = info.num_threads; /* Autodetect */ + /* plugins */ create.plugins = plugins; switch (codec->config.mode) @@ -504,9 +494,9 @@ /* VBV */ pass2.vbv_size = profiles[codec->config.profile].max_vbv_size; - pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; - pass2.vbv_maxrate = 1000*profiles[codec->config.profile].max_bitrate; - pass2.vbv_peakrate = 10000000; /* 10mbps -- fixme */ + pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */ + pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate; + pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate; plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func; plugins[create.num_plugins].param = &pass2; @@ -536,9 +526,11 @@ } /* lumimasking plugin */ - if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && codec->config.lum_masking) { + if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && (codec->config.lum_masking>0)) { + memset(&masking, 0, sizeof(masking)); + masking.method = (codec->config.lum_masking==2); plugins[create.num_plugins].func = codec->xvid_plugin_lumimasking_func; - plugins[create.num_plugins].param = NULL; + plugins[create.num_plugins].param = &masking; create.num_plugins++; } @@ -553,30 +545,44 @@ create.fincr = codec->fincr; create.fbase = codec->fbase; - create.max_key_interval = codec->config.max_key_interval; + create.max_key_interval = quality_preset->max_key_interval; - create.min_quant[0] = codec->config.min_iquant; - create.max_quant[0] = codec->config.max_iquant; - create.min_quant[1] = codec->config.min_pquant; - create.max_quant[1] = codec->config.max_pquant; - create.min_quant[2] = codec->config.min_bquant; - create.max_quant[2] = codec->config.max_bquant; + create.min_quant[0] = quality_preset->min_iquant; + create.max_quant[0] = quality_preset->max_iquant; + create.min_quant[1] = quality_preset->min_pquant; + create.max_quant[1] = quality_preset->max_pquant; + create.min_quant[2] = quality_preset->min_bquant; + create.max_quant[2] = quality_preset->max_bquant; if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) { - create.max_bframes = codec->config.max_bframes; - create.bquant_ratio = codec->config.bquant_ratio; - create.bquant_offset = codec->config.bquant_offset; - if (codec->config.packed) - create.global |= XVID_GLOBAL_PACKED; + /* dxn: prevent bframes usage if interlacing is selected */ + if (!((profiles[codec->config.profile].flags & PROFILE_EXTRA) && codec->config.interlacing)) { + create.max_bframes = codec->config.max_bframes; + create.bquant_ratio = codec->config.bquant_ratio; + create.bquant_offset = codec->config.bquant_offset; + + if (codec->config.packed) + create.global |= XVID_GLOBAL_PACKED; - create.global |= XVID_GLOBAL_CLOSED_GOP; + create.global |= XVID_GLOBAL_CLOSED_GOP; + /* restrict max bframes */ + if ((create.max_bframes > profiles[codec->config.profile].xvid_max_bframes) && (profiles[codec->config.profile].xvid_max_bframes >= 0)) + create.max_bframes = profiles[codec->config.profile].xvid_max_bframes; + + /* DXN: enable packed bframes */ + if ((profiles[codec->config.profile].flags & PROFILE_PACKED)) { + create.global |= XVID_GLOBAL_PACKED; + } + } } - create.frame_drop_ratio = codec->config.frame_drop_ratio; + /* dxn: always write divx5 userdata */ + if ((profiles[codec->config.profile].flags & PROFILE_EXTRA)) + create.global |= XVID_GLOBAL_DIVX5_USERDATA; - create.num_threads = codec->config.num_threads; + create.frame_drop_ratio = quality_preset->frame_drop_ratio; switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL)) { @@ -609,6 +615,9 @@ LRESULT compress_end(CODEC * codec) { + if (codec==NULL) + return ICERR_OK; + if (codec->m_hdll != NULL) { if (codec->ehandle != NULL) { codec->xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL); @@ -662,6 +671,8 @@ xvid_enc_frame_t frame; xvid_enc_stats_t stats; int length; + const quality_t* quality_preset = (codec->config.quality==quality_table_num) ? + &codec->config.quality_user : &quality_table[codec->config.quality]; memset(&frame, 0, sizeof(frame)); frame.version = XVID_VERSION; @@ -697,7 +708,10 @@ if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing) frame.vol_flags |= XVID_VOL_INTERLACING; - if (codec->config.ar_mode == 0) { /* PAR */ + /* dxn: force 1:1 picture aspect ration */ + if ((profiles[codec->config.profile].flags & PROFILE_EXTRA)) { + frame.par = XVID_PAR_11_VGA; + } else if (codec->config.ar_mode == 0) { /* PAR */ if (codec->config.display_aspect_ratio != 5) { frame.par = codec->config.display_aspect_ratio + 1; } else { @@ -724,27 +738,29 @@ if (codec->config.vop_debug) frame.vop_flags |= XVID_VOP_DEBUG; - if (codec->config.trellis_quant) { + if (quality_preset->trellis_quant) { frame.vop_flags |= XVID_VOP_TRELLISQUANT; } - if (codec->config.motion_search > 4) - frame.vop_flags |= XVID_VOP_INTER4V; + if ((profiles[codec->config.profile].flags & PROFILE_4MV)) { + if (quality_preset->motion_search > 4) + frame.vop_flags |= XVID_VOP_INTER4V; + } - if (codec->config.chromame) + if (quality_preset->chromame) frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP; - if (codec->config.turbo) + if (quality_preset->turbo) frame.motion |= XVID_ME_FASTREFINE16 | XVID_ME_FASTREFINE8 | XVID_ME_SKIP_DELTASEARCH | XVID_ME_FAST_MODEINTERPOLATE | XVID_ME_BFRAME_EARLYSTOP; - frame.motion |= pmvfast_presets[codec->config.motion_search]; + frame.motion |= pmvfast_presets[quality_preset->motion_search]; - if (codec->config.vhq_bframe) frame.vop_flags |= XVID_VOP_RD_BVOP; + if (quality_preset->vhq_bframe) frame.vop_flags |= XVID_VOP_RD_BVOP; - switch (codec->config.vhq_mode) + switch (quality_preset->vhq_mode) { case VHQ_MODE_DECISION : frame.vop_flags |= XVID_VOP_MODEDECISION_RD; @@ -779,6 +795,9 @@ break; } + if (quality_preset->vhq_metric == 1) + frame.vop_flags |= XVID_VOP_RD_PSNRHVSM; + frame.input.plane[0] = icc->lpInput; frame.input.stride[0] = CALC_BI_STRIDE(icc->lpbiInput->biWidth, icc->lpbiInput->biBitCount); @@ -802,7 +821,7 @@ } // force keyframe spacing in 2-pass 1st pass - if (codec->config.motion_search == 0) + if (quality_preset->motion_search == 0) frame.type = XVID_TYPE_IVOP; /* frame-based stuff */ @@ -953,7 +972,9 @@ LRESULT decompress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput) { + BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader; xvid_gbl_init_t init; + xvid_gbl_info_t info; xvid_dec_create_t create; HKEY hKey; @@ -962,13 +983,24 @@ memset(&init, 0, sizeof(init)); init.version = XVID_VERSION; init.cpu_flags = codec->config.cpu; - init.debug = codec->config.debug; + init.debug = codec->config.debug; codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL); + memset(&info, 0, sizeof(info)); + info.version = XVID_VERSION; + codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL); + memset(&create, 0, sizeof(create)); create.version = XVID_VERSION; create.width = lpbiInput->bmiHeader.biWidth; create.height = lpbiInput->bmiHeader.biHeight; + create.fourcc = inhdr->biCompression; + + /* Decoder threads */ + if (codec->config.cpu & XVID_CPU_FORCE) + create.num_threads = codec->config.num_threads; + else + create.num_threads = info.num_threads; /* Autodetect */ switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL)) { @@ -990,11 +1022,11 @@ RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey); REG_GET_N("Brightness", pp_brightness, 0); - REG_GET_N("Deblock_Y", pp_dy, 0) - REG_GET_N("Deblock_UV", pp_duv, 0) - REG_GET_N("Dering_Y", pp_dry, 0) - REG_GET_N("Dering_UV", pp_druv, 0) - REG_GET_N("FilmEffect", pp_fe, 0) + REG_GET_N("Deblock_Y", pp_dy, 0); + REG_GET_N("Deblock_UV", pp_duv, 0); + REG_GET_N("Dering_Y", pp_dry, 0); + REG_GET_N("Dering_UV", pp_druv, 0); + REG_GET_N("FilmEffect", pp_fe, 0); RegCloseKey(hKey);