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.60 2010-12-18 16:02:00 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) |
860 |
dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR && |
dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR && |
861 |
(coding_type == P_VOP || coding_type == I_VOP)) { |
(coding_type == P_VOP || coding_type == I_VOP)) { |
862 |
|
|
863 |
if (BitstreamGetBit(bs)); |
if (BitstreamGetBit(bs)) { |
864 |
DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n"); |
DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n"); |
865 |
} |
} |
866 |
|
} |
867 |
|
|
868 |
if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) { |
if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) { |
869 |
if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) { |
if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) { |
1259 |
/* divx5 userdata string */ |
/* divx5 userdata string */ |
1260 |
#define DIVX5_ID ((char *)"DivX503b1393") |
#define DIVX5_ID ((char *)"DivX503b1393") |
1261 |
if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) { |
if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) { |
1262 |
BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID)); |
BitstreamWriteUserData(bs, DIVX5_ID, (uint32_t)strlen(DIVX5_ID)); |
1263 |
if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) |
if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) |
1264 |
BitstreamPutBits(bs, 'p', 8); |
BitstreamPutBits(bs, 'p', 8); |
1265 |
} |
} |
1272 |
xvid_user_format, |
xvid_user_format, |
1273 |
XVID_BS_VERSION, |
XVID_BS_VERSION, |
1274 |
(frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0'); |
(frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0'); |
1275 |
BitstreamWriteUserData(bs, xvid_user_data, strlen(xvid_user_data)); |
BitstreamWriteUserData(bs, xvid_user_data, (uint32_t)strlen(xvid_user_data)); |
1276 |
} |
} |
1277 |
} |
} |
1278 |
|
|
1393 |
const char *data, |
const char *data, |
1394 |
const unsigned int length) |
const unsigned int length) |
1395 |
{ |
{ |
1396 |
int i; |
unsigned int i; |
1397 |
|
|
1398 |
BitstreamPad(bs); |
BitstreamPad(bs); |
1399 |
BitstreamPutBits(bs, USERDATA_START_CODE, 32); |
BitstreamPutBits(bs, USERDATA_START_CODE, 32); |