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: bitstream.c,v 1.61 2010-12-28 19:19:43 Isibaar Exp $ |
* $Id$ |
24 |
* |
* |
25 |
****************************************************************************/ |
****************************************************************************/ |
26 |
|
|
129 |
} |
} |
130 |
} |
} |
131 |
|
|
132 |
mbnum = BitstreamGetBits(bs, mbnum_bits); /* macroblock_number */ |
mbnum = (mbnum_bits == 0) ? 0 : BitstreamGetBits(bs, mbnum_bits); /* macroblock_number */ |
133 |
DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum); |
DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum); |
134 |
|
|
135 |
if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) |
if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) |
153 |
READ_MARKER(); |
READ_MARKER(); |
154 |
if (dec->time_inc_bits) |
if (dec->time_inc_bits) |
155 |
time_increment = (BitstreamGetBits(bs, dec->time_inc_bits)); /* vop_time_increment */ |
time_increment = (BitstreamGetBits(bs, dec->time_inc_bits)); /* vop_time_increment */ |
156 |
|
else |
157 |
|
time_increment = 0; |
158 |
READ_MARKER(); |
READ_MARKER(); |
159 |
DPRINTF(XVID_DEBUG_HEADER,"time %i:%i\n", time_base, time_increment); |
DPRINTF(XVID_DEBUG_HEADER,"time %i:%i\n", time_base, time_increment); |
160 |
|
|
862 |
dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR && |
dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR && |
863 |
(coding_type == P_VOP || coding_type == I_VOP)) { |
(coding_type == P_VOP || coding_type == I_VOP)) { |
864 |
|
|
865 |
if (BitstreamGetBit(bs)); |
if (BitstreamGetBit(bs)) { |
866 |
DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n"); |
DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n"); |
867 |
} |
} |
868 |
|
} |
869 |
|
|
870 |
if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) { |
if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) { |
871 |
if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) { |
if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) { |