--- image.c 2003/02/15 15:22:18 1.26 +++ image.c 2003/06/09 13:53:50 1.26.2.7 @@ -1,69 +1,42 @@ /************************************************************************** * - * XVID MPEG-4 VIDEO CODEC - * image stuff + * XVID MPEG-4 VIDEO CODEC + * - Image management functions - * - * 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. + * Copyright(C) 2001-2003 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 - * (at your option) any later version. + * 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. + * 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. + * 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 * - *************************************************************************/ - -/************************************************************************** - * - * History: - * - * 05.10.2002 support for interpolated images in qpel mode - Isibaar - * 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 - Isibaar - * 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 + * $Id: image.c,v 1.26.2.7 2003/06/09 13:53:50 edgomez Exp $ * - *************************************************************************/ + ****************************************************************************/ #include -#include // memcpy, memset +#include /* memcpy, memset */ #include #include "../portab.h" -#include "../global.h" // XVID_CSP_XXX's -#include "../xvid.h" // XVID_CSP_XXX's +#include "../global.h" /* XVID_CSP_XXX's */ +#include "../xvid.h" /* XVID_CSP_XXX's */ #include "image.h" #include "colorspace.h" #include "interpolate8x8.h" #include "reduced.h" -#include "../divx4.h" #include "../utils/mem_align.h" -#include "font.h" // XXX: remove later +#include "font.h" /* XXX: remove later */ #define SAFETY 64 #define EDGE_SIZE2 (EDGE_SIZE/2) @@ -132,19 +105,9 @@ image_swap(IMAGE * image1, IMAGE * image2) { - uint8_t *tmp; - - tmp = image1->y; - image1->y = image2->y; - image2->y = tmp; - - tmp = image1->u; - image1->u = image2->u; - image2->u = tmp; - - tmp = image1->v; - image1->v = image2->v; - image2->v = tmp; + SWAP(uint8_t*, image1->y, image2->y); + SWAP(uint8_t*, image1->u, image2->u); + SWAP(uint8_t*, image1->v, image2->v); } @@ -202,7 +165,7 @@ } -//U + /* U */ dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2); src = image->u; @@ -230,7 +193,7 @@ } -// V + /* V */ dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2); src = image->v; @@ -258,7 +221,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, @@ -269,16 +232,14 @@ uint32_t quarterpel, uint32_t rounding) { - const uint32_t offset = EDGE_SIZE2 * (edged_width + 1); // we only interpolate half of the edge area + const uint32_t offset = EDGE_SIZE2 * (edged_width + 1); /* we only interpolate half of the edge area */ const uint32_t stride_add = 7 * edged_width; -/* -#ifdef BFRAMES +#if 0 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; @@ -512,7 +473,7 @@ #undef IMG_V } - DPRINTF(DPRINTF_DEBUG,"chroma_optimized_pixels = %i/%i", pixels, width*height/4); + DPRINTF(XVID_DEBUG_DEBUG,"chroma_optimized_pixels = %i/%i\n", pixels, width*height/4); } @@ -564,47 +525,22 @@ uint32_t width, int height, uint32_t edged_width, - uint8_t * src, - int src_stride, + uint8_t * src[4], + int src_stride[4], int csp, int interlacing) { const int edged_width2 = edged_width/2; const int width2 = width/2; const int height2 = height/2; - //const int height_signed = (csp & XVID_CSP_VFLIP) ? -height : height; - - - // int src_stride = width; - - // --- xvid 2.1 compatiblity patch --- - // --- remove when xvid_dec_frame->stride equals real stride - /* - if ((csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB555 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB565 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_YUY2 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_YVYU || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_UYVY) - { - src_stride *= 2; - } - else if ((csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB24) - { - src_stride *= 3; - } - else if ((csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB32 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_ABGR || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGBA) - { - src_stride *= 4; - } - */ - // ^--- xvid 2.1 compatiblity fix ---^ +#if 0 + const int height_signed = (csp & XVID_CSP_VFLIP) ? -height : height; +#endif switch (csp & ~XVID_CSP_VFLIP) { case XVID_CSP_RGB555: safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?rgb555i_to_yv12 :rgb555_to_yv12, interlacing?rgb555i_to_yv12_c:rgb555_to_yv12_c, 2); @@ -612,24 +548,24 @@ case XVID_CSP_RGB565: safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?rgb565i_to_yv12 :rgb565_to_yv12, interlacing?rgb565i_to_yv12_c:rgb565_to_yv12_c, 2); break; - case XVID_CSP_RGB24: + case XVID_CSP_BGR: safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?bgri_to_yv12 :bgr_to_yv12, interlacing?bgri_to_yv12_c:bgr_to_yv12_c, 3); break; - case XVID_CSP_RGB32: + case XVID_CSP_BGRA: safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?bgrai_to_yv12 :bgra_to_yv12, interlacing?bgrai_to_yv12_c:bgra_to_yv12_c, 4); @@ -637,7 +573,7 @@ case XVID_CSP_ABGR : safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?abgri_to_yv12 :abgr_to_yv12, interlacing?abgri_to_yv12_c:abgr_to_yv12_c, 4); @@ -645,7 +581,7 @@ case XVID_CSP_RGBA : safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?rgbai_to_yv12 :rgba_to_yv12, interlacing?rgbai_to_yv12_c:rgba_to_yv12_c, 4); @@ -653,7 +589,7 @@ case XVID_CSP_YUY2: safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yuyvi_to_yv12 :yuyv_to_yv12, interlacing?yuyvi_to_yv12_c:yuyv_to_yv12_c, 2); @@ -661,7 +597,7 @@ case XVID_CSP_YVYU: /* u/v swapped */ safe_packed_conv( - src, src_stride, image->y, image->v, image->y, + src[0], src_stride[0], image->y, image->v, image->y, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yuyvi_to_yv12 :yuyv_to_yv12, interlacing?yuyvi_to_yv12_c:yuyv_to_yv12_c, 2); @@ -669,7 +605,7 @@ case XVID_CSP_UYVY: safe_packed_conv( - src, src_stride, image->y, image->u, image->v, + src[0], src_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?uyvyi_to_yv12 :uyvy_to_yv12, interlacing?uyvyi_to_yv12_c:uyvy_to_yv12_c, 2); @@ -677,23 +613,21 @@ case XVID_CSP_I420: yv12_to_yv12(image->y, image->u, image->v, edged_width, edged_width2, - src, src + src_stride*height, src + src_stride*height + (src_stride/2)*height2, - src_stride, src_stride/2, width, height, (csp & XVID_CSP_VFLIP)); + src[0], src[0] + src_stride[0]*height, src[0] + src_stride[0]*height + (src_stride[0]/2)*height2, + src_stride[0], src_stride[0]/2, width, height, (csp & XVID_CSP_VFLIP)); break ; case XVID_CSP_YV12: /* u/v swapped */ yv12_to_yv12(image->y, image->v, image->u, edged_width, edged_width2, - src, src + src_stride*height, src + src_stride*height + (src_stride/2)*height2, - src_stride, src_stride/2, width, height, (csp & XVID_CSP_VFLIP)); + src[0], src[0] + src_stride[0]*height, src[0] + src_stride[0]*height + (src_stride[0]/2)*height2, + src_stride[0], src_stride[0]/2, width, height, (csp & XVID_CSP_VFLIP)); break; case XVID_CSP_USER: - { - DEC_PICTURE * pic = (DEC_PICTURE*)src; - yv12_to_yv12(image->y, image->u, image->v, edged_width, edged_width2, - pic->y, pic->u, pic->v, pic->stride_y, pic->stride_y, - width, height, (csp & XVID_CSP_VFLIP)); - } + /*XXX: support for different u & v strides */ + yv12_to_yv12(image->y, image->u, image->v, edged_width, edged_width2, + src[0], src[1], src[2], src_stride[0], src_stride[1], + width, height, (csp & XVID_CSP_VFLIP)); break; case XVID_CSP_NULL: @@ -759,8 +693,8 @@ uint32_t width, int height, uint32_t edged_width, - uint8_t * dst, - uint32_t dst_stride, + uint8_t * dst[4], + uint32_t dst_stride[4], int csp, int interlacing) { @@ -773,36 +707,10 @@ image_dump_yuvpgm(image, edged_width, width, height, "\\decode.pgm"); */ - - // --- xvid 2.1 compatiblity patch --- - // --- remove when xvid_dec_frame->stride equals real stride - /* - if ((csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB555 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB565 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_YUY2 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_YVYU || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_UYVY) - { - dst_stride *= 2; - } - else if ((csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB24) - { - dst_stride *= 3; - } - else if ((csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGB32 || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_ABGR || - (csp & ~XVID_CSP_VFLIP) == XVID_CSP_RGBA) - { - dst_stride *= 4; - } - */ - // ^--- xvid 2.1 compatiblity fix ---^ - - switch (csp & ~XVID_CSP_VFLIP) { case XVID_CSP_RGB555: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_rgb555i :yv12_to_rgb555, interlacing?yv12_to_rgb555i_c:yv12_to_rgb555_c, 2); @@ -810,23 +718,23 @@ case XVID_CSP_RGB565: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_rgb565i :yv12_to_rgb565, interlacing?yv12_to_rgb565i_c:yv12_to_rgb565_c, 2); return 0; - case XVID_CSP_RGB24: + case XVID_CSP_BGR: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_bgri :yv12_to_bgr, interlacing?yv12_to_bgri_c:yv12_to_bgr_c, 3); return 0; - case XVID_CSP_RGB32: + case XVID_CSP_BGRA: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_bgrai :yv12_to_bgra, interlacing?yv12_to_bgrai_c:yv12_to_bgra_c, 4); @@ -834,7 +742,7 @@ case XVID_CSP_ABGR: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_abgri :yv12_to_abgr, interlacing?yv12_to_abgri_c:yv12_to_abgr_c, 4); @@ -842,7 +750,7 @@ case XVID_CSP_RGBA: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_rgbai :yv12_to_rgba, interlacing?yv12_to_rgbai_c:yv12_to_rgba_c, 4); @@ -850,15 +758,15 @@ case XVID_CSP_YUY2: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_yuyvi :yv12_to_yuyv, interlacing?yv12_to_yuyvi_c:yv12_to_yuyv_c, 2); return 0; - case XVID_CSP_YVYU: // u,v swapped + case XVID_CSP_YVYU: /* u,v swapped */ safe_packed_conv( - dst, dst_stride, image->y, image->v, image->u, + dst[0], dst_stride[0], image->y, image->v, image->u, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_yuyvi :yv12_to_yuyv, interlacing?yv12_to_yuyvi_c:yv12_to_yuyv_c, 2); @@ -866,39 +774,44 @@ case XVID_CSP_UYVY: safe_packed_conv( - dst, dst_stride, image->y, image->u, image->v, + dst[0], dst_stride[0], image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP), interlacing?yv12_to_uyvyi :yv12_to_uyvy, interlacing?yv12_to_uyvyi_c:yv12_to_uyvy_c, 2); return 0; case XVID_CSP_I420: - yv12_to_yv12(dst, dst + dst_stride*height, dst + dst_stride*height + (dst_stride/2)*height2, - dst_stride, dst_stride/2, + yv12_to_yv12(dst[0], dst[0] + dst_stride[0]*height, dst[0] + dst_stride[0]*height + (dst_stride[0]/2)*height2, + dst_stride[0], dst_stride[0]/2, image->y, image->u, image->v, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP)); return 0; - case XVID_CSP_YV12: // u,v swapped - yv12_to_yv12(dst, dst + dst_stride*height, dst + dst_stride*height + (dst_stride/2)*height2, - dst_stride, dst_stride/2, + case XVID_CSP_YV12: /* u,v swapped */ + yv12_to_yv12(dst[0], dst[0] + dst_stride[0]*height, dst[0] + dst_stride[0]*height + (dst_stride[0]/2)*height2, + dst_stride[0], dst_stride[0]/2, image->y, image->v, image->u, edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP)); return 0; - case XVID_CSP_USER: - { - DEC_PICTURE * pic = (DEC_PICTURE*)dst; - pic->y = image->y; - pic->u = image->u; - pic->v = image->v; - pic->stride_y = edged_width; - pic->stride_uv = edged_width / 2; - } + case XVID_CSP_USER : /* u,v swapped */ + yv12_to_yv12(dst[0], dst[1], dst[2], + dst_stride[0], dst_stride[1], /* v: dst_stride[2] */ + image->y, image->v, image->u, edged_width, edged_width2, + width, height, (csp & XVID_CSP_VFLIP)); + return 0; + + case XVID_CSP_INTERNAL : + dst[0] = image->y; + dst[1] = image->u; + dst[2] = image->v; + dst_stride[0] = edged_width; + dst_stride[1] = edged_width/2; + dst_stride[2] = edged_width/2; return 0; case XVID_CSP_NULL: - case XVID_CSP_EXTERN: + case XVID_CSP_SLICE: return 0; } @@ -944,7 +857,7 @@ if (sse==0) return 99.99F; - return 48.131F - 10*(float)log10((float)sse/(float)(pixels)); // log10(255*255)=4.8131 + return 48.131F - 10*(float)log10((float)sse/(float)(pixels)); /* log10(255*255)=4.8131 */ } @@ -968,7 +881,7 @@ return sse; } -/* +#if 0 #include #include @@ -992,7 +905,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) { @@ -1015,7 +928,7 @@ return 0; } -*/ +#endif @@ -1080,21 +993,21 @@ for (y = 0; y < height; y++) for (x = 0; x < width; x++) - sum += ABS(img1->y[x + y * stride] - img2->y[x + y * stride]); + sum += abs(img1->y[x + y * stride] - img2->y[x + y * stride]); for (y = 0; y < height2; y++) for (x = 0; x < width2; x++) - sum += ABS(img1->u[x + y * stride2] - img2->u[x + y * stride2]); + sum += abs(img1->u[x + y * stride2] - img2->u[x + y * stride2]); for (y = 0; y < height2; y++) for (x = 0; x < width2; x++) - sum += ABS(img1->v[x + y * stride2] - img2->v[x + y * stride2]); + sum += abs(img1->v[x + y * stride2] - img2->v[x + y * stride2]); return (float) sum / (width * height * 3 / 2); } void -output_slice(IMAGE * cur, int std, int width, XVID_DEC_PICTURE* out_frm, int mbx, int mby,int mbl) { +output_slice(IMAGE * cur, int std, int width, xvid_image_t* out_frm, int mbx, int mby,int mbl) { uint8_t *dY,*dU,*dV,*sY,*sU,*sV; int std2 = std >> 1; int w = mbl << 4, w2,i; @@ -1103,26 +1016,26 @@ w = width; w2 = w >> 1; - 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); + dY = (uint8_t*)out_frm->plane[0] + (mby << 4) * out_frm->stride[0] + (mbx << 4); + dU = (uint8_t*)out_frm->plane[1] + (mby << 3) * out_frm->stride[1] + (mbx << 3); + dV = (uint8_t*)out_frm->plane[2] + (mby << 3) * out_frm->stride[2] + (mbx << 3); sY = cur->y + (mby << 4) * std + (mbx << 4); sU = cur->u + (mby << 3) * std2 + (mbx << 3); sV = cur->v + (mby << 3) * std2 + (mbx << 3); for(i = 0 ; i < 16 ; i++) { memcpy(dY,sY,w); - dY += out_frm->stride_y; + dY += out_frm->stride[0]; sY += std; } for(i = 0 ; i < 8 ; i++) { memcpy(dU,sU,w2); - dU += out_frm->stride_u; + dU += out_frm->stride[1]; sU += std2; } for(i = 0 ; i < 8 ; i++) { memcpy(dV,sV,w2); - dV += out_frm->stride_v; + dV += out_frm->stride[2]; sV += std2; } } @@ -1169,8 +1082,7 @@ int i,j; /* luma: j,i in block units */ - if ((flags & XVID_DEC_DEBLOCKY)) - { + for (j = 1; j < mb_height*2; j++) /* horizontal deblocking */ for (i = 0; i < mb_width*2; i++) { @@ -1193,12 +1105,11 @@ edged_width, nblocks); } } - } + /* chroma */ - if ((flags & XVID_DEC_DEBLOCKUV)) - { + for (j = 1; j < mb_height; j++) /* horizontal deblocking */ for (i = 0; i < mb_width; i++) { @@ -1226,7 +1137,7 @@ edged_width2, nblocks); } } - } + }