--- trunk/xvidcore/src/image/image.c 2002/07/19 11:15:21 315 +++ trunk/xvidcore/src/image/image.c 2002/11/26 23:44:11 677 @@ -1,50 +1,65 @@ -/************************************************************************** +/***************************************************************************** * - * XVID MPEG-4 VIDEO CODEC - * image stuff + * XVID MPEG-4 VIDEO CODEC + * - image module - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - *************************************************************************/ - -/************************************************************************** - * - * History: - * - * 01.05.2002 BFRAME image-based u,v interpolation - * 22.04.2002 added some B-frame support - * 14.04.2002 added image_dump_yuvpgm(), added image_mad() - * XVID_CSP_USER input support - * 09.04.2002 PSNR calculations - * 06.04.2002 removed interlaced edging from U,V blocks (as per spec) - * 26.03.2002 interlacing support (field-based edging in set_edges) - * 26.01.2002 rgb555, rgb565 - * 07.01.2001 commented u,v interpolation (not required for uv-block-based) - * 23.12.2001 removed #ifdefs, added function pointers + init_common() - * 22.12.2001 cpu #ifdefs - * 19.12.2001 image_dump(); useful for debugging - * 6.12.2001 inital version; (c)2001 peter ross + * Copyright(C) 2002 Peter Ross * - *************************************************************************/ + * This file is part of XviD, a free MPEG-4 video encoder/decoder + * + * 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. + * + * 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 + * + * Under section 8 of the GNU General Public License, the copyright + * holders of XVID explicitly forbid distribution in the following + * countries: + * + * - Japan + * - United States of America + * + * Linking XviD statically or dynamically with other modules is making a + * combined work based on XviD. Thus, the terms and conditions of the + * GNU General Public License cover the whole combination. + * + * As a special exception, the copyright holders of XviD give you + * permission to link XviD with independent modules that communicate with + * XviD solely through the VFW1.1 and DShow interfaces, regardless of the + * license terms of these independent modules, and to copy and distribute + * the resulting combined work under terms of your choice, provided that + * every copy of the combined work is accompanied by a complete copy of + * the source code of XviD (the version of XviD used to produce the + * combined work), being distributed under the terms of the GNU General + * Public License plus this exception. An independent module is a module + * which is not derived from or based on XviD. + * + * Note that people who make modified versions of XviD are not obligated + * to grant this special exception for their modified versions; it is + * their choice whether to do so. The GNU General Public License gives + * permission to release a modified version without this exception; this + * exception also makes it possible to release a modified version which + * carries forward this exception. + * + * $Id: image.c,v 1.25 2002-11-26 23:44:10 edgomez Exp $ + * + ****************************************************************************/ #include -#include // memcpy, memset +#include /* memcpy, memset */ #include #include "../portab.h" -#include "../xvid.h" // XVID_CSP_XXX's +#include "../xvid.h" /* XVID_CSP_XXX's */ #include "image.h" #include "colorspace.h" #include "interpolate8x8.h" @@ -151,8 +166,7 @@ uint32_t edged_width, uint32_t edged_height, uint32_t width, - uint32_t height, - uint32_t interlacing) + uint32_t height) { const uint32_t edged_width2 = edged_width / 2; const uint32_t width2 = width / 2; @@ -165,18 +179,10 @@ src = image->y; for (i = 0; i < EDGE_SIZE; i++) { - // if interlacing, edges contain top-most data from each field - if (interlacing && (i & 1)) { - memset(dst, *(src + edged_width), EDGE_SIZE); - memcpy(dst + EDGE_SIZE, src + edged_width, width); - memset(dst + edged_width - EDGE_SIZE, - *(src + edged_width + width - 1), EDGE_SIZE); - } else { memset(dst, *src, EDGE_SIZE); memcpy(dst + EDGE_SIZE, src, width); memset(dst + edged_width - EDGE_SIZE, *(src + width - 1), EDGE_SIZE); - } dst += edged_width; } @@ -189,23 +195,15 @@ src -= edged_width; for (i = 0; i < EDGE_SIZE; i++) { - // if interlacing, edges contain bottom-most data from each field - if (interlacing && !(i & 1)) { - memset(dst, *(src - edged_width), EDGE_SIZE); - memcpy(dst + EDGE_SIZE, src - edged_width, width); - memset(dst + edged_width - EDGE_SIZE, - *(src - edged_width + width - 1), EDGE_SIZE); - } else { memset(dst, *src, EDGE_SIZE); memcpy(dst + EDGE_SIZE, src, width); memset(dst + edged_width - EDGE_SIZE, *(src + width - 1), EDGE_SIZE); - } dst += edged_width; } -//U +/*U */ dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2); src = image->u; @@ -233,7 +231,7 @@ } -// V +/* V */ dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2); src = image->v; @@ -261,7 +259,7 @@ } } -// bframe encoding requires image-based u,v interpolation +/* bframe encoding requires image-based u,v interpolation */ void image_interpolate(const IMAGE * refn, IMAGE * refh, @@ -274,13 +272,6 @@ const uint32_t offset = EDGE_SIZE * (edged_width + 1); const uint32_t stride_add = 7 * edged_width; -#ifdef BFRAMES - const uint32_t edged_width2 = edged_width / 2; - const uint32_t edged_height2 = edged_height / 2; - const uint32_t offset2 = EDGE_SIZE2 * (edged_width2 + 1); - const uint32_t stride_add2 = 7 * edged_width2; -#endif - uint8_t *n_ptr, *h_ptr, *v_ptr, *hv_ptr; uint32_t x, y; @@ -312,62 +303,6 @@ n_ptr += stride_add; } -#ifdef BFRAMES - n_ptr = refn->u; - h_ptr = refh->u; - v_ptr = refv->u; - hv_ptr = refhv->u; - - n_ptr -= offset2; - h_ptr -= offset2; - v_ptr -= offset2; - hv_ptr -= offset2; - - for (y = 0; y < edged_height2; y = y + 8) { - for (x = 0; x < edged_width2; x = x + 8) { - interpolate8x8_halfpel_h(h_ptr, n_ptr, edged_width2, rounding); - interpolate8x8_halfpel_v(v_ptr, n_ptr, edged_width2, rounding); - interpolate8x8_halfpel_hv(hv_ptr, n_ptr, edged_width2, rounding); - - n_ptr += 8; - h_ptr += 8; - v_ptr += 8; - hv_ptr += 8; - } - h_ptr += stride_add2; - v_ptr += stride_add2; - hv_ptr += stride_add2; - n_ptr += stride_add2; - } - - n_ptr = refn->v; - h_ptr = refh->v; - v_ptr = refv->v; - hv_ptr = refhv->v; - - n_ptr -= offset2; - h_ptr -= offset2; - v_ptr -= offset2; - hv_ptr -= offset2; - - for (y = 0; y < edged_height2; y = y + 8) { - for (x = 0; x < edged_width2; x = x + 8) { - interpolate8x8_halfpel_h(h_ptr, n_ptr, edged_width2, rounding); - interpolate8x8_halfpel_v(v_ptr, n_ptr, edged_width2, rounding); - interpolate8x8_halfpel_hv(hv_ptr, n_ptr, edged_width2, rounding); - - n_ptr += 8; - h_ptr += 8; - v_ptr += 8; - hv_ptr += 8; - } - h_ptr += stride_add2; - v_ptr += stride_add2; - hv_ptr += stride_add2; - n_ptr += stride_add2; - } -#endif - /* interpolate_halfpel_h( refh->y - offset, @@ -547,7 +482,7 @@ edged_width / 2, width, height); return 0; - case XVID_CSP_YV12: // u,v swapped + case XVID_CSP_YV12: /* u,v swapped */ yv12_to_yuv(dst, dst_stride, image->y, image->v, image->u, edged_width, edged_width / 2, width, height); return 0; @@ -557,7 +492,7 @@ edged_width, edged_width / 2, width, height); return 0; - case XVID_CSP_YVYU: // u,v swapped + case XVID_CSP_YVYU: /* u,v swapped */ yv12_to_yuyv(dst, dst_stride, image->y, image->v, image->u, edged_width, edged_width / 2, width, height); return 0; @@ -616,7 +551,7 @@ return psnr_y; } -/* +#if 0 #include #include @@ -640,7 +575,7 @@ } -// dump image+edges to yuv pgm files +/* dump image+edges to yuv pgm files */ int image_dump(IMAGE * image, uint32_t edged_width, uint32_t edged_height, char * path, int number) { @@ -663,7 +598,7 @@ return 0; } -*/ +#endif @@ -751,7 +686,7 @@ if(w > width) w = width; w2 = w >> 1; -void __inline + dY = (uint8_t*)out_frm->y + (mby << 4) * out_frm->stride_y + (mbx << 4); dU = (uint8_t*)out_frm->u + (mby << 3) * out_frm->stride_u + (mbx << 3); dV = (uint8_t*)out_frm->v + (mby << 3) * out_frm->stride_v + (mbx << 3); @@ -761,9 +696,9 @@ for(i = 0 ; i < 16 ; i++) { memcpy(dY,sY,w); - dY = out_frm->y + (mby << 4) * out_frm->stride_y + (mbx << 4); - dU = out_frm->u + (mby << 3) * out_frm->stride_u + (mbx << 3); - dV = out_frm->v + (mby << 3) * out_frm->stride_v + (mbx << 3); + dY += out_frm->stride_y; + sY += std; + } for(i = 0 ; i < 8 ; i++) { memcpy(dU,sU,w2); dU += out_frm->stride_u;