[svn] / trunk / xvidcore / src / image / image.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/image/image.c

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

revision 541, Wed Sep 25 23:37:09 2002 UTC revision 677, Tue Nov 26 23:44:11 2002 UTC
# Line 5  Line 5 
5   *   *
6   *  Copyright(C) 2002 Peter Ross <pross@xvid.org>   *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
7   *   *
8   *  This program is an implementation of a part of one or more MPEG-4   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
  *  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.  
9   *   *
10   *  This program is free software; you can redistribute it and/or modify   *  XviD is free software; you can redistribute it and/or modify it
11   *  it under the terms of the GNU General Public License as published by   *  under the terms of the GNU General Public License as published by
12   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
13   *  (at your option) any later version.   *  (at your option) any later version.
14   *   *
# Line 28  Line 21 
21   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24     *  Under section 8 of the GNU General Public License, the copyright
25     *  holders of XVID explicitly forbid distribution in the following
26     *  countries:
27     *
28     *    - Japan
29     *    - United States of America
30     *
31     *  Linking XviD statically or dynamically with other modules is making a
32     *  combined work based on XviD.  Thus, the terms and conditions of the
33     *  GNU General Public License cover the whole combination.
34     *
35     *  As a special exception, the copyright holders of XviD give you
36     *  permission to link XviD with independent modules that communicate with
37     *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
38     *  license terms of these independent modules, and to copy and distribute
39     *  the resulting combined work under terms of your choice, provided that
40     *  every copy of the combined work is accompanied by a complete copy of
41     *  the source code of XviD (the version of XviD used to produce the
42     *  combined work), being distributed under the terms of the GNU General
43     *  Public License plus this exception.  An independent module is a module
44     *  which is not derived from or based on XviD.
45     *
46     *  Note that people who make modified versions of XviD are not obligated
47     *  to grant this special exception for their modified versions; it is
48     *  their choice whether to do so.  The GNU General Public License gives
49     *  permission to release a modified version without this exception; this
50     *  exception also makes it possible to release a modified version which
51     *  carries forward this exception.
52     *
53     * $Id: image.c,v 1.25 2002-11-26 23:44:10 edgomez Exp $
54     *
55   ****************************************************************************/   ****************************************************************************/
56    
57  #include <stdlib.h>  #include <stdlib.h>
58  #include <string.h>                             // memcpy, memset  #include <string.h>                             /* memcpy, memset */
59  #include <math.h>  #include <math.h>
60    
61  #include "../portab.h"  #include "../portab.h"
62  #include "../xvid.h"                    // XVID_CSP_XXX's  #include "../xvid.h"                    /* XVID_CSP_XXX's */
63  #include "image.h"  #include "image.h"
64  #include "colorspace.h"  #include "colorspace.h"
65  #include "interpolate8x8.h"  #include "interpolate8x8.h"
# Line 179  Line 203 
203          }          }
204    
205    
206  //U  /*U */
207          dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);          dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
208          src = image->u;          src = image->u;
209    
# Line 207  Line 231 
231          }          }
232    
233    
234  // V  /* V */
235          dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);          dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
236          src = image->v;          src = image->v;
237    
# Line 235  Line 259 
259          }          }
260  }  }
261    
262  // bframe encoding requires image-based u,v interpolation  /* bframe encoding requires image-based u,v interpolation */
263  void  void
264  image_interpolate(const IMAGE * refn,  image_interpolate(const IMAGE * refn,
265                                    IMAGE * refh,                                    IMAGE * refh,
# Line 458  Line 482 
482                                          edged_width / 2, width, height);                                          edged_width / 2, width, height);
483                  return 0;                  return 0;
484    
485          case XVID_CSP_YV12:             // u,v swapped          case XVID_CSP_YV12:             /* u,v swapped */
486                  yv12_to_yuv(dst, dst_stride, image->y, image->v, image->u, edged_width,                  yv12_to_yuv(dst, dst_stride, image->y, image->v, image->u, edged_width,
487                                          edged_width / 2, width, height);                                          edged_width / 2, width, height);
488                  return 0;                  return 0;
# Line 468  Line 492 
492                                           edged_width, edged_width / 2, width, height);                                           edged_width, edged_width / 2, width, height);
493                  return 0;                  return 0;
494    
495          case XVID_CSP_YVYU:             // u,v swapped          case XVID_CSP_YVYU:             /* u,v swapped */
496                  yv12_to_yuyv(dst, dst_stride, image->y, image->v, image->u,                  yv12_to_yuyv(dst, dst_stride, image->y, image->v, image->u,
497                                           edged_width, edged_width / 2, width, height);                                           edged_width, edged_width / 2, width, height);
498                  return 0;                  return 0;
# Line 527  Line 551 
551          return psnr_y;          return psnr_y;
552  }  }
553    
554  /*  #if     0
555    
556  #include <stdio.h>  #include <stdio.h>
557  #include <string.h>  #include <string.h>
# Line 551  Line 575 
575  }  }
576    
577    
578  // dump image+edges to yuv pgm files  /* dump image+edges to yuv pgm files  */
579    
580  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)
581  {  {
# Line 574  Line 598 
598    
599          return 0;          return 0;
600  }  }
601  */  #endif
602    
603    
604    
Legend:
Removed from v.541  
changed lines
  Added in v.677
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4