[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 1038, Thu May 22 16:36:07 2003 UTC revision 1128, Mon Aug 25 15:01:51 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.8 2003-08-25 15:01:51 edgomez Exp $
   
 /**************************************************************************  
  *  
  *      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 <pross@cs.rmit.edu.au>  
23   *   *
24   *************************************************************************/   ****************************************************************************/
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 157  Line 131 
131                             uint32_t height)                             uint32_t height)
132  {  {
133          const uint32_t edged_width2 = edged_width / 2;          const uint32_t edged_width2 = edged_width / 2;
134          const uint32_t width2 = width / 2;          uint32_t width2;
135          uint32_t i;          uint32_t i;
136          uint8_t *dst;          uint8_t *dst;
137          uint8_t *src;          uint8_t *src;
# Line 166  Line 140 
140          dst = image->y - (EDGE_SIZE + EDGE_SIZE * edged_width);          dst = image->y - (EDGE_SIZE + EDGE_SIZE * edged_width);
141          src = image->y;          src = image->y;
142    
143            /* According to the Standard Clause 7.6.4, padding is done starting at 16
144             * pixel width and height multiples */
145            width  = (width+15)&~15;
146            height = (height+15)&~15;
147            width2 = width/2;
148    
149          for (i = 0; i < EDGE_SIZE; i++) {          for (i = 0; i < EDGE_SIZE; i++) {
150                  memset(dst, *src, EDGE_SIZE);                  memset(dst, *src, EDGE_SIZE);
151                  memcpy(dst + EDGE_SIZE, src, width);                  memcpy(dst + EDGE_SIZE, src, width);
# Line 191  Line 171 
171          }          }
172    
173    
174  //U          /* U */
175          dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);          dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
176          src = image->u;          src = image->u;
177    
# Line 219  Line 199 
199          }          }
200    
201    
202  // V          /* V */
203          dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);          dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
204          src = image->v;          src = image->v;
205    
# Line 247  Line 227 
227          }          }
228  }  }
229    
230  // bframe encoding requires image-based u,v interpolation  /* bframe encoding requires image-based u,v interpolation */
231  void  void
232  image_interpolate(const IMAGE * refn,  image_interpolate(const IMAGE * refn,
233                                    IMAGE * refh,                                    IMAGE * refh,
# Line 258  Line 238 
238                                    uint32_t quarterpel,                                    uint32_t quarterpel,
239                                    uint32_t rounding)                                    uint32_t rounding)
240  {  {
241          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 */
242          const uint32_t stride_add = 7 * edged_width;          const uint32_t stride_add = 7 * edged_width;
243  /*  #if 0
 #ifdef BFRAMES  
244          const uint32_t edged_width2 = edged_width / 2;          const uint32_t edged_width2 = edged_width / 2;
245          const uint32_t edged_height2 = edged_height / 2;          const uint32_t edged_height2 = edged_height / 2;
246          const uint32_t offset2 = EDGE_SIZE2 * (edged_width2 + 1);          const uint32_t offset2 = EDGE_SIZE2 * (edged_width2 + 1);
247          const uint32_t stride_add2 = 7 * edged_width2;          const uint32_t stride_add2 = 7 * edged_width2;
248  #endif  #endif
 */  
249          uint8_t *n_ptr, *h_ptr, *v_ptr, *hv_ptr;          uint8_t *n_ptr, *h_ptr, *v_ptr, *hv_ptr;
250          uint32_t x, y;          uint32_t x, y;
251    
# Line 561  Line 539 
539          const int edged_width2 = edged_width/2;          const int edged_width2 = edged_width/2;
540          const int width2 = width/2;          const int width2 = width/2;
541          const int height2 = height/2;          const int height2 = height/2;
542          //const int height_signed = (csp & XVID_CSP_VFLIP) ? -height : height;  #if 0
543            const int height_signed = (csp & XVID_CSP_VFLIP) ? -height : height;
544    #endif
545    
546          switch (csp & ~XVID_CSP_VFLIP) {          switch (csp & ~XVID_CSP_VFLIP) {
547          case XVID_CSP_RGB555:          case XVID_CSP_RGB555:
# Line 790  Line 770 
770                          interlacing?yv12_to_yuyvi_c:yv12_to_yuyv_c, 2);                          interlacing?yv12_to_yuyvi_c:yv12_to_yuyv_c, 2);
771                  return 0;                  return 0;
772    
773          case XVID_CSP_YVYU:             // u,v swapped          case XVID_CSP_YVYU:             /* u,v swapped */
774                  safe_packed_conv(                  safe_packed_conv(
775                          dst[0], dst_stride[0], image->y, image->v, image->u,                          dst[0], dst_stride[0], image->y, image->v, image->u,
776                          edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP),                          edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP),
# Line 813  Line 793 
793                          width, height, (csp & XVID_CSP_VFLIP));                          width, height, (csp & XVID_CSP_VFLIP));
794                  return 0;                  return 0;
795    
796          case XVID_CSP_YV12:             // u,v swapped          case XVID_CSP_YV12:             /* u,v swapped */
797                  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,
798                          dst_stride[0], dst_stride[0]/2,                          dst_stride[0], dst_stride[0]/2,
799                          image->y, image->v, image->u, edged_width, edged_width2,                          image->y, image->v, image->u, edged_width, edged_width2,
800                          width, height, (csp & XVID_CSP_VFLIP));                          width, height, (csp & XVID_CSP_VFLIP));
801                  return 0;                  return 0;
802    
803          case XVID_CSP_USER :            // u,v swapped          case XVID_CSP_USER :            /* u,v swapped */
804                  yv12_to_yv12(dst[0], dst[1], dst[2],                  yv12_to_yv12(dst[0], dst[1], dst[2],
805                          dst_stride[0], dst_stride[1],   /* v: dst_stride[2] */                          dst_stride[0], dst_stride[1],   /* v: dst_stride[2] */
806                          image->y, image->v, image->u, edged_width, edged_width2,                          image->y, image->v, image->u, edged_width, edged_width2,
# Line 883  Line 863 
863          if (sse==0)          if (sse==0)
864                  return 99.99F;                  return 99.99F;
865    
866          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 */
867    
868  }  }
869    
# Line 907  Line 887 
887          return sse;          return sse;
888  }  }
889    
890  /*  #if 0
891    
892  #include <stdio.h>  #include <stdio.h>
893  #include <string.h>  #include <string.h>
# Line 931  Line 911 
911  }  }
912    
913    
914  // dump image+edges to yuv pgm files  /* dump image+edges to yuv pgm files */
915    
916  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)
917  {  {
# Line 954  Line 934 
934    
935          return 0;          return 0;
936  }  }
937  */  #endif
938    
939    
940    
Legend:
Removed from v.1038  
changed lines
  Added in v.1128
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4