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

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

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

revision 1.26.2.16, Sat Feb 7 10:01:27 2004 UTC revision 1.29, Mon Apr 12 15:49:56 2004 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Image management functions -   *  - Image management functions -
5   *   *
6   *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>   *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
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 35  Line 35 
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    #include "../motion/sad.h"
39    
40  #include "font.h"               /* XXX: remove later */  #include "font.h"               /* XXX: remove later */
41    
# Line 127  Line 128 
128          memcpy(image1->v, image2->v, edged_width * height / 4);          memcpy(image1->v, image2->v, edged_width * height / 4);
129  }  }
130    
131    /* setedges bug was fixed in this BS version */
132    #define SETEDGES_BUG_BEFORE             18
133    
134  void  void
135  image_setedges(IMAGE * image,  image_setedges(IMAGE * image,
136                             uint32_t edged_width,                             uint32_t edged_width,
137                             uint32_t edged_height,                             uint32_t edged_height,
138                             uint32_t width,                             uint32_t width,
139                             uint32_t height)                             uint32_t height,
140                               int bs_version)
141  {  {
142          const uint32_t edged_width2 = edged_width / 2;          const uint32_t edged_width2 = edged_width / 2;
143          uint32_t width2;          uint32_t width2;
# Line 141  Line 145 
145          uint8_t *dst;          uint8_t *dst;
146          uint8_t *src;          uint8_t *src;
147    
   
148          dst = image->y - (EDGE_SIZE + EDGE_SIZE * edged_width);          dst = image->y - (EDGE_SIZE + EDGE_SIZE * edged_width);
149          src = image->y;          src = image->y;
150    
151          /* According to the Standard Clause 7.6.4, padding is done starting at 16          /* According to the Standard Clause 7.6.4, padding is done starting at 16
152           * pixel width and height multiples */           * pixel width and height multiples. This was not respected in old xvids */
153            if (bs_version == 0 || bs_version >= SETEDGES_BUG_BEFORE) {
154          width  = (width+15)&~15;          width  = (width+15)&~15;
155          height = (height+15)&~15;          height = (height+15)&~15;
156            }
157    
158          width2 = width/2;          width2 = width/2;
159    
160          for (i = 0; i < EDGE_SIZE; i++) {          for (i = 0; i < EDGE_SIZE; i++) {
# Line 894  Line 900 
900                     uint16_t width,                     uint16_t width,
901                     uint16_t height)                     uint16_t height)
902  {  {
903          int diff, x, y;          int y, bwidth, bheight;
904          long sse=0;          long sse=0;
905    
906          for (y = 0; y < height; y++) {          bwidth  = width  & (~0x07);
907            bheight = height & (~0x07);
908    
909            /* Compute the 8x8 integer part */
910            for (y = 0; y<bheight; y += 8) {
911                    int x;
912    
913                    /* Compute sse for the band */
914                    for (x = 0; x<bwidth; x += 8)
915                            sse += sse8_8bit(orig  + x, recon + x, stride);
916    
917                    /* remaining pixels of the 8 pixels high band */
918                    for (x = bwidth; x < width; x++) {
919                            int diff;
920                            diff = *(orig + 0*stride + x) - *(recon + 0*stride + x);
921                            sse += diff * diff;
922                            diff = *(orig + 1*stride + x) - *(recon + 1*stride + x);
923                            sse += diff * diff;
924                            diff = *(orig + 2*stride + x) - *(recon + 2*stride + x);
925                            sse += diff * diff;
926                            diff = *(orig + 3*stride + x) - *(recon + 3*stride + x);
927                            sse += diff * diff;
928                            diff = *(orig + 4*stride + x) - *(recon + 4*stride + x);
929                            sse += diff * diff;
930                            diff = *(orig + 5*stride + x) - *(recon + 5*stride + x);
931                            sse += diff * diff;
932                            diff = *(orig + 6*stride + x) - *(recon + 6*stride + x);
933                            sse += diff * diff;
934                            diff = *(orig + 7*stride + x) - *(recon + 7*stride + x);
935                            sse += diff * diff;
936                    }
937    
938                    orig  += 8*stride;
939                    recon += 8*stride;
940            }
941    
942            /* Compute the down rectangle sse */
943            for (y = bheight; y < height; y++) {
944                    int x;
945                  for (x = 0; x < width; x++) {                  for (x = 0; x < width; x++) {
946                            int diff;
947                          diff = *(orig + x) - *(recon + x);                          diff = *(orig + x) - *(recon + x);
948                          sse += diff * diff;                          sse += diff * diff;
949                  }                  }
950                  orig += stride;                  orig += stride;
951                  recon += stride;                  recon += stride;
952          }          }
953          return sse;  
954            return (sse);
955  }  }
956    
957  #if 0  #if 0
Legend:
Removed from v.1.26.2.16  
changed lines
  Added in v.1.29
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4