--- mbtransquant.c 2002/09/25 16:51:05 1.11.2.2 +++ mbtransquant.c 2002/10/16 20:58:22 1.17 @@ -1,55 +1,37 @@ - /****************************************************************************** - * * - * This file is part of XviD, a free MPEG-4 video encoder/decoder * - * * - * XviD is an implementation of a part of one or more MPEG-4 Video tools * - * as specified in ISO/IEC 14496-2 standard. Those intending to use this * - * software module in hardware or software products are advised that its * - * use may infringe existing patents or copyrights, and any such use * - * would be at such party's own risk. The original developer of this * - * software module and his/her company, and subsequent editors and their * - * companies, will have no liability for use of this software or * - * modifications or derivatives thereof. * - * * - * XviD 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 * - * (at your option) any later version. * - * * - * XviD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * mbtransquant.c * - * * - * Copyright (C) 2001 - Peter Ross * - * Copyright (C) 2001 - Michael Militzer * - * * - * For more information visit the XviD homepage: http://www.xvid.org * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * Revision history: * - * * - * 29.03.2002 interlacing speedup - used transfer strides instead of * - * manual field-to-frame conversion * - * 26.03.2002 interlacing support - moved transfers outside loops * - * 22.12.2001 get_dc_scaler() moved to common.h * - * 19.11.2001 introduced coefficient thresholding (Isibaar) * - * 17.11.2001 initial version * - * * - ******************************************************************************/ +/***************************************************************************** + * + * XVID MPEG-4 VIDEO CODEC + * - MacroBlock transfer and quantization - + * + * Copyright(C) 2002-2001 Michael Militzer + * 2002-2001 Peter Ross + * + * This program is an implementation of a part of one or more MPEG-4 + * Video tools as specified in ISO/IEC 14496-2 standard. Those intending + * to use this software module in hardware or software products are + * advised that its use may infringe existing patents or copyrights, and + * any such use would be at such party's own risk. The original + * developer of this software module and his/her company, and subsequent + * editors and their companies, will have no liability for use of this + * software or modifications or derivatives thereof. + * + * 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 + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: mbtransquant.c,v 1.17 2002/10/16 20:58:22 h Exp $ + * + ****************************************************************************/ #include @@ -65,12 +47,10 @@ #include "../quant/quant_h263.h" #include "../encoder.h" -MBFIELDTEST_PTR MBFieldTest; - #define MIN(X, Y) ((X)<(Y)?(X):(Y)) #define MAX(X, Y) ((X)>(Y)?(X):(Y)) -#define TOOSMALL_LIMIT 2 /* skip blocks having a coefficient sum below this value */ +#define TOOSMALL_LIMIT 3 /* skip blocks having a coefficient sum below this value */ /* this isnt pretty, but its better than 20 ifdefs */ @@ -384,8 +364,8 @@ MBQuantIntra(const MBParam * pParam, FRAMEINFO * frame, MACROBLOCK *pMB, - int16_t qcoeff[6 * 64], - int16_t data[6*64]) + int16_t data[6 * 64], + int16_t qcoeff[6 * 64]) { int i; int iQuant = frame->quant; @@ -578,27 +558,13 @@ -/* permute block and return field dct choice */ +/* if sum(diff between field lines) < sum(diff between frame lines), use field dct */ uint32_t MBDecideFieldDCT(int16_t data[6 * 64]) { - uint32_t field = MBFieldTest(data); - - if (field) { - MBFrameToField(data); - } - - return field; -} - -/* if sum(diff between field lines) < sum(diff between frame lines), use field dct */ - -uint32_t -MBFieldTest_c(int16_t data[6 * 64]) -{ const uint8_t blocks[] = { 0 * 64, 0 * 64, 0 * 64, 0 * 64, 2 * 64, 2 * 64, 2 * 64, 2 * 64 }; const uint8_t lines[] = { 0, 16, 32, 48, 0, 16, 32, 48 }; @@ -632,7 +598,11 @@ } } - return (frame >= field); + if (frame > (field + 350)) { + MBFrameToField(data); + } + + return (frame > (field + 350)); }