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

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

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

revision 1249, Tue Dec 9 14:31:40 2003 UTC revision 1252, Wed Dec 10 12:09:34 2003 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: decoder.c,v 1.49.2.21 2003-12-09 14:31:40 syskin Exp $   * $Id: decoder.c,v 1.49.2.23 2003-12-10 12:09:34 syskin Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 1316  Line 1316 
1316  void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,  void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,
1317                                          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)
1318  {  {
1319            if (frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV))    /* post process */
1320            {
1321                    /* note: image is stored to tmp */
1322                    image_copy(&dec->tmp, img, dec->edged_width, dec->height);
1323                    image_deblock(&dec->tmp, dec->edged_width,
1324                                              mbs, dec->mb_width, dec->mb_height, dec->mb_width,
1325                                              frame->general);
1326                    img = &dec->tmp;
1327            }
1328    
1329          image_output(img, dec->width, dec->height,          image_output(img, dec->width, dec->height,
1330                                   dec->edged_width, (uint8_t**)frame->output.plane, frame->output.stride,                                   dec->edged_width, (uint8_t**)frame->output.plane, frame->output.stride,
1331                                   frame->output.csp, dec->interlacing);                                   frame->output.csp, dec->interlacing);
# Line 1450  Line 1460 
1460                          /* XXX: not_coded vops are not used for forward prediction */                          /* XXX: not_coded vops are not used for forward prediction */
1461                          /* we should not swap(last_mbs,mbs) */                          /* we should not swap(last_mbs,mbs) */
1462                          image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);                          image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);
1463                            SWAP(MACROBLOCK *, dec->mbs, dec->last_mbs); /* it will be swapped back */
1464                          break;                          break;
1465                  }                  }
1466    

Legend:
Removed from v.1249  
changed lines
  Added in v.1252

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