[svn] / branches / dev-api-4 / xvidcore / src / image / image.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/image/image.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1032, Sat May 17 13:37:49 2003 UTC revision 1054, Mon Jun 9 13:55:56 2003 UTC
# Line 1  Line 1 
1  /**************************************************************************  /**************************************************************************
2   *   *
3   *      XVID MPEG-4 VIDEO CODEC   *      XVID MPEG-4 VIDEO CODEC
4   *      image stuff   *  - Image management functions -
5   *   *
6   *      This program is an implementation of a part of one or more MPEG-4   *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
  *      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.  
7   *   *
8   *      This program is free software; you can redistribute it and/or modify   *      This program is free software; you can redistribute it and/or modify
9   *      it under the terms of the GNU General Public License as published by   *      it under the terms of the GNU General Public License as published by
# Line 24  Line 17 
17   *   *
18   *      You should have received a copy of the GNU General Public License   *      You should have received a copy of the GNU General Public License
19   *      along with this program; if not, write to the Free Software   *      along with this program; if not, write to the Free Software
20   *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   *************************************************************************/   * $Id: image.c,v 1.26.2.7 2003-06-09 13:53:50 edgomez Exp $
   
 /**************************************************************************  
  *  
  *      History:  
23   *   *
24   *  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 <pross@cs.rmit.edu.au>  
  *  
  *************************************************************************/  
25    
26  #include <stdlib.h>  #include <stdlib.h>
27  #include <string.h>                             // memcpy, memset  #include <string.h>                             /* memcpy, memset */
28  #include <math.h>  #include <math.h>
29    
30  #include "../portab.h"  #include "../portab.h"
31  #include "../global.h"                  // XVID_CSP_XXX's  #include "../global.h"                  /* XVID_CSP_XXX's */
32  #include "../xvid.h"                    // XVID_CSP_XXX's  #include "../xvid.h"                    /* XVID_CSP_XXX's */
33  #include "image.h"  #include "image.h"
34  #include "colorspace.h"  #include "colorspace.h"
35  #include "interpolate8x8.h"  #include "interpolate8x8.h"
36  #include "reduced.h"  #include "reduced.h"
37  #include "../utils/mem_align.h"  #include "../utils/mem_align.h"
38    
39  #include "font.h"               // XXX: remove later  #include "font.h"               /* XXX: remove later */
40    
41  #define SAFETY  64  #define SAFETY  64
42  #define EDGE_SIZE2  (EDGE_SIZE/2)  #define EDGE_SIZE2  (EDGE_SIZE/2)
# Line 191  Line 165 
165          }          }
166    
167    
168  //U          /* U */
169          dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);          dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
170          src = image->u;          src = image->u;
171    
# Line 219  Line 193 
193          }          }
194    
195    
196  // V          /* V */
197          dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);          dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
198          src = image->v;          src = image->v;
199    
# Line 247  Line 221 
221          }          }
222  }  }
223    
224  // bframe encoding requires image-based u,v interpolation  /* bframe encoding requires image-based u,v interpolation */
225  void  void
226  image_interpolate(const IMAGE * refn,  image_interpolate(const IMAGE * refn,
227                                    IMAGE * refh,                                    IMAGE * refh,
# Line 258  Line 232 
232                                    uint32_t quarterpel,                                    uint32_t quarterpel,
233                                    uint32_t rounding)                                    uint32_t rounding)
234  {  {
235          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 */
236          const uint32_t stride_add = 7 * edged_width;          const uint32_t stride_add = 7 * edged_width;
237  /*  #if 0
 #ifdef BFRAMES  
238          const uint32_t edged_width2 = edged_width / 2;          const uint32_t edged_width2 = edged_width / 2;
239          const uint32_t edged_height2 = edged_height / 2;          const uint32_t edged_height2 = edged_height / 2;
240          const uint32_t offset2 = EDGE_SIZE2 * (edged_width2 + 1);          const uint32_t offset2 = EDGE_SIZE2 * (edged_width2 + 1);
241          const uint32_t stride_add2 = 7 * edged_width2;          const uint32_t stride_add2 = 7 * edged_width2;
242  #endif  #endif
 */  
243          uint8_t *n_ptr, *h_ptr, *v_ptr, *hv_ptr;          uint8_t *n_ptr, *h_ptr, *v_ptr, *hv_ptr;
244          uint32_t x, y;          uint32_t x, y;
245    
# Line 501  Line 473 
473  #undef IMG_V  #undef IMG_V
474          }          }
475    
476          DPRINTF(XVID_DEBUG_DEBUG,"chroma_optimized_pixels = %i/%i", pixels, width*height/4);          DPRINTF(XVID_DEBUG_DEBUG,"chroma_optimized_pixels = %i/%i\n", pixels, width*height/4);
477  }  }
478    
479    
# Line 561  Line 533 
533          const int edged_width2 = edged_width/2;          const int edged_width2 = edged_width/2;
534          const int width2 = width/2;          const int width2 = width/2;
535          const int height2 = height/2;          const int height2 = height/2;
536          //const int height_signed = (csp & XVID_CSP_VFLIP) ? -height : height;  #if 0
537            const int height_signed = (csp & XVID_CSP_VFLIP) ? -height : height;
538    #endif
539    
540          switch (csp & ~XVID_CSP_VFLIP) {          switch (csp & ~XVID_CSP_VFLIP) {
541          case XVID_CSP_RGB555:          case XVID_CSP_RGB555:
# Line 790  Line 764 
764                          interlacing?yv12_to_yuyvi_c:yv12_to_yuyv_c, 2);                          interlacing?yv12_to_yuyvi_c:yv12_to_yuyv_c, 2);
765                  return 0;                  return 0;
766    
767          case XVID_CSP_YVYU:             // u,v swapped          case XVID_CSP_YVYU:             /* u,v swapped */
768                  safe_packed_conv(                  safe_packed_conv(
769                          dst[0], dst_stride[0], image->y, image->v, image->u,                          dst[0], dst_stride[0], image->y, image->v, image->u,
770                          edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP),                          edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP),
# Line 813  Line 787 
787                          width, height, (csp & XVID_CSP_VFLIP));                          width, height, (csp & XVID_CSP_VFLIP));
788                  return 0;                  return 0;
789    
790          case XVID_CSP_YV12:             // u,v swapped          case XVID_CSP_YV12:             /* u,v swapped */
791                  yv12_to_yv12(dst[0], dst[0] + dst_stride[0]*height, dst[0] + dst_stride[0]*height + (dst_stride[0]/2)*height2,                  yv12_to_yv12(dst[0], dst[0] + dst_stride[0]*height, dst[0] + dst_stride[0]*height + (dst_stride[0]/2)*height2,
792                          dst_stride[0], dst_stride[0]/2,                          dst_stride[0], dst_stride[0]/2,
793                          image->y, image->v, image->u, edged_width, edged_width2,                          image->y, image->v, image->u, edged_width, edged_width2,
794                          width, height, (csp & XVID_CSP_VFLIP));                          width, height, (csp & XVID_CSP_VFLIP));
795                  return 0;                  return 0;
796    
797          case XVID_CSP_USER :            // u,v swapped          case XVID_CSP_USER :            /* u,v swapped */
798                  yv12_to_yv12(dst[0], dst[1], dst[2],                  yv12_to_yv12(dst[0], dst[1], dst[2],
799                          dst_stride[0], dst_stride[1],   /* v: dst_stride[2] */                          dst_stride[0], dst_stride[1],   /* v: dst_stride[2] */
800                          image->y, image->v, image->u, edged_width, edged_width2,                          image->y, image->v, image->u, edged_width, edged_width2,
# Line 883  Line 857 
857          if (sse==0)          if (sse==0)
858                  return 99.99F;                  return 99.99F;
859    
860          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 */
861    
862  }  }
863    
# Line 907  Line 881 
881          return sse;          return sse;
882  }  }
883    
884  /*  #if 0
885    
886  #include <stdio.h>  #include <stdio.h>
887  #include <string.h>  #include <string.h>
# Line 931  Line 905 
905  }  }
906    
907    
908  // dump image+edges to yuv pgm files  /* dump image+edges to yuv pgm files */
909    
910  int image_dump(IMAGE * image, uint32_t edged_width, uint32_t edged_height, char * path, int number)  int image_dump(IMAGE * image, uint32_t edged_width, uint32_t edged_height, char * path, int number)
911  {  {
# Line 954  Line 928 
928    
929          return 0;          return 0;
930  }  }
931  */  #endif
932    
933    
934    
Legend:
Removed from v.1032  
changed lines
  Added in v.1054
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4