[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.82, Tue Aug 10 14:17:23 2010 UTC revision 1.85, Sat Dec 18 10:13:30 2010 UTC
# Line 4  Line 4 
4   *  - Decoder Module -   *  - Decoder Module -
5   *   *
6   *  Copyright(C) 2002      MinChen <chenm001@163.com>   *  Copyright(C) 2002      MinChen <chenm001@163.com>
7   *               2002-2004 Peter Ross <pross@xvid.org>   *               2002-2010 Peter Ross <pross@xvid.org>
8   *   *
9   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
10   *  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 172  Line 172 
172    dec->width = create->width;    dec->width = create->width;
173    dec->height = create->height;    dec->height = create->height;
174    
175      dec->num_threads = MAX(0, create->num_threads);
176    
177    image_null(&dec->cur);    image_null(&dec->cur);
178    image_null(&dec->refn[0]);    image_null(&dec->refn[0]);
179    image_null(&dec->refn[1]);    image_null(&dec->refn[1]);
# Line 199  Line 201 
201    
202    if (create->fourcc == ((int)('X')|((int)('V')<<8)|    if (create->fourcc == ((int)('X')|((int)('V')<<8)|
203                           ((int)('I')<<16)|((int)('D')<<24))) { /* XVID */                           ((int)('I')<<16)|((int)('D')<<24))) { /* XVID */
204      dec->bs_version = 1; /* Initially assume oldest xvid version */      dec->bs_version = 0; /* Initially assume oldest xvid version */
205    }    }
206    else {    else {
207          dec->bs_version = 0xffff; /* Initialize to very high value -> assume bugfree stream */          dec->bs_version = 0xffff; /* Initialize to very high value -> assume bugfree stream */
# Line 1531  Line 1533 
1533      image_copy(&dec->tmp, img, dec->edged_width, dec->height);      image_copy(&dec->tmp, img, dec->edged_width, dec->height);
1534      image_postproc(&dec->postproc, &dec->tmp, dec->edged_width,      image_postproc(&dec->postproc, &dec->tmp, dec->edged_width,
1535               mbs, dec->mb_width, dec->mb_height, dec->mb_width,               mbs, dec->mb_width, dec->mb_height, dec->mb_width,
1536               frame->general, brightness, dec->frames, (coding_type == B_VOP));               frame->general, brightness, dec->frames, (coding_type == B_VOP), dec->num_threads);
1537      img = &dec->tmp;      img = &dec->tmp;
1538    }    }
1539    
# Line 1660  Line 1662 
1662      goto repeat;      goto repeat;
1663    }    }
1664    
1665    dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;  /* init pred vector to 0 */    dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.x = dec->p_fmv.y = 0;  /* init pred vector to 0 */
1666    
1667    /* packed_mode: special-N_VOP treament */    /* packed_mode: special-N_VOP treament */
1668    if (dec->packed_mode && coding_type == N_VOP) {    if (dec->packed_mode && coding_type == N_VOP) {

Legend:
Removed from v.1.82  
changed lines
  Added in v.1.85

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