--- xvid.c 2004/06/05 23:08:01 1.48.2.4 +++ xvid.c 2004/04/01 11:11:28 1.49 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - Native API implementation - * - * Copyright(C) 2001-2003 Peter Ross + * Copyright(C) 2001-2004 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 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: xvid.c,v 1.48.2.4 2004/06/05 23:08:01 edgomez Exp $ + * $Id: xvid.c,v 1.49 2004/04/01 11:11:28 suxen_drol Exp $ * ****************************************************************************/ @@ -229,6 +229,9 @@ interpolate8x8_avg2 = interpolate8x8_avg2_c; interpolate8x8_avg4 = interpolate8x8_avg4_c; + /* postprocessing */ + image_brightness = image_brightness_c; + /* reduced resolution */ copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C; add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C; @@ -352,6 +355,9 @@ interpolate8x8_avg2 = interpolate8x8_avg2_mmx; interpolate8x8_avg4 = interpolate8x8_avg4_mmx; + /* postprocessing */ + image_brightness = image_brightness_mmx; + /* reduced resolution */ copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_mmx; add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_mmx; @@ -449,43 +455,38 @@ if ((cpu_flags & XVID_CPU_3DNOWEXT)) { + /* Inverse DCT */ + idct = idct_3dne; + /* Buffer transfer */ transfer_8to16copy = transfer_8to16copy_3dne; transfer_16to8copy = transfer_16to8copy_3dne; transfer_8to16sub = transfer_8to16sub_3dne; transfer_8to16subro = transfer_8to16subro_3dne; + transfer_8to16sub2 = transfer_8to16sub2_3dne; transfer_16to8add = transfer_16to8add_3dne; transfer8x8_copy = transfer8x8_copy_3dne; - if ((cpu_flags & XVID_CPU_MMXEXT)) { - /* Inverse DCT */ - idct = idct_3dne; - - /* Buffer transfer */ - transfer_8to16sub2 = transfer_8to16sub2_3dne; - - /* Interpolation */ - interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dne; - interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne; - interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne; - - /* Quantization */ - quant_h263_intra = quant_h263_intra_3dne; /* cmov only */ - quant_h263_inter = quant_h263_inter_3dne; - dequant_mpeg_intra = dequant_mpeg_intra_3dne; /* cmov only */ - dequant_mpeg_inter = dequant_mpeg_inter_3dne; - dequant_h263_intra = dequant_h263_intra_3dne; - dequant_h263_inter = dequant_h263_inter_3dne; - - /* ME functions */ - calc_cbp = calc_cbp_3dne; - - sad16 = sad16_3dne; - sad8 = sad8_3dne; - sad16bi = sad16bi_3dne; - sad8bi = sad8bi_3dne; - dev16 = dev16_3dne; - } + /* Quantization */ + quant_h263_intra = quant_h263_intra_3dne; + quant_h263_inter = quant_h263_inter_3dne; + dequant_mpeg_intra = dequant_mpeg_intra_3dne; + dequant_mpeg_inter = dequant_mpeg_inter_3dne; + dequant_h263_intra = dequant_h263_intra_3dne; + dequant_h263_inter = dequant_h263_inter_3dne; + + /* ME functions */ + calc_cbp = calc_cbp_3dne; + sad16 = sad16_3dne; + sad8 = sad8_3dne; + sad16bi = sad16bi_3dne; + sad8bi = sad8bi_3dne; + dev16 = dev16_3dne; + + /* Interpolation */ + interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dne; + interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne; + interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne; } if ((cpu_flags & XVID_CPU_SSE2)) { @@ -567,7 +568,7 @@ return XVID_ERR_VERSION; info->actual_version = XVID_VERSION; - info->build = "xvid-1.0.1"; + info->build = "xvid-1.0.0"; info->cpu_flags = detect_cpu_flags(); #if defined(_SMP) && defined(WIN32)