--- trunk/xvidcore/vfw/src/codec.c 2010/05/10 13:50:46 1887 +++ trunk/xvidcore/vfw/src/codec.c 2010/12/22 16:52:12 1917 @@ -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.29 2010-12-22 16:52:12 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; } @@ -425,7 +401,7 @@ xvid_gbl_info_t info; int i; HANDLE hFile; - const quality_t* quality_preset = (codec->config.quality==quality_table_num) ? + 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 */ @@ -451,6 +427,30 @@ 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 */ + + /* Encoder slices */ + if ((profiles[codec->config.profile].flags & PROFILE_RESYNCMARKER) && codec->config.num_slices != 1) { + + if (codec->config.num_slices == 0) { /* auto */ + int rows = (lpbiInput->bmiHeader.biHeight + 15) / 16; + int slices = (rows > 36) ? 2 : 1; + + create.num_slices = (rows > 45) ? 4 : slices; + + if (create.num_slices > create.num_threads) + create.num_slices = create.num_threads; + } + else { + create.num_slices = codec->config.num_slices; + } + + } + /* plugins */ create.plugins = plugins; switch (codec->config.mode) @@ -514,10 +514,7 @@ pass2.vbv_size = profiles[codec->config.profile].max_vbv_size; pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */ pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate; - - // XXX: xvidcore current provides a "peak bits over 3secs" constraint. - // according to the latest dxn literature, a 1sec constraint is now used - pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3; + 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; @@ -605,15 +602,6 @@ create.frame_drop_ratio = quality_preset->frame_drop_ratio; - /* Encoder threads */ - if (codec->config.num_threads == 0) - create.num_threads = info.num_threads; /* Autodetect */ - else if (codec->config.num_threads == 1) - create.num_threads = -1; /* Single-threaded, disable SMP */ - else - create.num_threads = codec->config.num_threads; - - switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL)) { case XVID_ERR_FAIL : @@ -825,6 +813,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); @@ -999,7 +990,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; @@ -1008,13 +1001,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)) {