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

Diff of /xvidcore/src/decoder.c

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

revision 1.49.2.21, Tue Dec 9 14:31:40 2003 UTC revision 1.49.2.24, Wed Dec 10 15:07:42 2003 UTC
# Line 58  Line 58 
58    
59  #include "image/image.h"  #include "image/image.h"
60  #include "image/colorspace.h"  #include "image/colorspace.h"
61    #include "image/postprocessing.h"
62  #include "utils/mem_align.h"  #include "utils/mem_align.h"
63    
64  static int  static int
# Line 1316  Line 1317 
1317  void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,  void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,
1318                                          xvid_dec_frame_t * frame, xvid_dec_stats_t * stats, int coding_type)                                          xvid_dec_frame_t * frame, xvid_dec_stats_t * stats, int coding_type)
1319  {  {
1320            if (frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV))    /* post process */
1321            {
1322                    /* note: image is stored to tmp */
1323                    image_copy(&dec->tmp, img, dec->edged_width, dec->height);
1324                    image_deblock(&dec->tmp, dec->edged_width,
1325                                              mbs, dec->mb_width, dec->mb_height, dec->mb_width,
1326                                              frame->general);
1327                    img = &dec->tmp;
1328            }
1329    
1330          image_output(img, dec->width, dec->height,          image_output(img, dec->width, dec->height,
1331                                   dec->edged_width, (uint8_t**)frame->output.plane, frame->output.stride,                                   dec->edged_width, (uint8_t**)frame->output.plane, frame->output.stride,
1332                                   frame->output.csp, dec->interlacing);                                   frame->output.csp, dec->interlacing);
# Line 1450  Line 1461 
1461                          /* XXX: not_coded vops are not used for forward prediction */                          /* XXX: not_coded vops are not used for forward prediction */
1462                          /* we should not swap(last_mbs,mbs) */                          /* we should not swap(last_mbs,mbs) */
1463                          image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);                          image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);
1464                            SWAP(MACROBLOCK *, dec->mbs, dec->last_mbs); /* it will be swapped back */
1465                          break;                          break;
1466                  }                  }
1467    

Legend:
Removed from v.1.49.2.21  
changed lines
  Added in v.1.49.2.24

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4