--- trunk/xvidcore/src/bitstream/bitstream.c 2005/05/17 21:03:32 1616 +++ trunk/xvidcore/src/bitstream/bitstream.c 2011/05/18 09:10:05 1988 @@ -20,7 +20,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: bitstream.c,v 1.51 2005-05-17 21:03:32 Skal Exp $ + * $Id$ * ****************************************************************************/ @@ -33,7 +33,7 @@ #include "mbcoding.h" -static const uint8_t log2_tab_16[256] = { 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 }; +static const uint8_t log2_tab_16[16] = { 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 }; static uint32_t __inline log2bin(uint32_t value) { @@ -65,7 +65,7 @@ }; -void +static void bs_get_matrix(Bitstream * bs, uint8_t * matrix) { @@ -194,7 +194,6 @@ DPRINTF(XVID_DEBUG_HEADER,"fcode_backward %i\n", *fcode_backward); } } - } if (dec->newpred_enable) @@ -424,18 +423,17 @@ DPRINTF(XVID_DEBUG_STARTCODE, "\n"); } else if (start_code == VISOBJ_START_CODE) { - int visobj_ver_id; DPRINTF(XVID_DEBUG_STARTCODE, "\n"); BitstreamSkip(bs, 32); /* visual_object_start_code */ if (BitstreamGetBit(bs)) /* is_visual_object_identified */ { - visobj_ver_id = BitstreamGetBits(bs, 4); /* visual_object_ver_id */ - DPRINTF(XVID_DEBUG_HEADER,"visobj_ver_id %i\n", visobj_ver_id); + dec->ver_id = BitstreamGetBits(bs, 4); /* visual_object_ver_id */ + DPRINTF(XVID_DEBUG_HEADER,"visobj_ver_id %i\n", dec->ver_id); BitstreamSkip(bs, 3); /* visual_object_priority */ } else { - visobj_ver_id = 1; + dec->ver_id = 1; } if (BitstreamShowBits(bs, 4) != VISOBJ_TYPE_VIDEO) /* visual_object_type */ @@ -484,7 +482,7 @@ DPRINTF(XVID_DEBUG_HEADER,"ver_id %i\n", vol_ver_id); BitstreamSkip(bs, 3); /* video_object_layer_priority */ } else { - vol_ver_id = 1; + vol_ver_id = dec->ver_id; } dec->aspect_ratio = BitstreamGetBits(bs, 4); @@ -550,16 +548,9 @@ dec->time_inc_resolution = BitstreamGetBits(bs, 16); /* vop_time_increment_resolution */ DPRINTF(XVID_DEBUG_HEADER,"vop_time_increment_resolution %i\n", dec->time_inc_resolution); -#if 0 - dec->time_inc_resolution--; -#endif - if (dec->time_inc_resolution > 0) { dec->time_inc_bits = MAX(log2bin(dec->time_inc_resolution-1), 1); } else { -#if 0 - dec->time_inc_bits = 0; -#endif /* for "old" xvid compatibility, set time_inc_bits = 1 */ dec->time_inc_bits = 1; } @@ -824,11 +815,12 @@ dec->time_base += time_incr; dec->time = dec->time_base*dec->time_inc_resolution + time_increment; dec->time_pp = (int32_t)(dec->time - dec->last_non_b_time); - dec->last_non_b_time = dec->time; + dec->last_non_b_time = dec->time; } else { - dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment; + dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment; dec->time_bp = dec->time_pp - (int32_t)(dec->last_non_b_time - dec->time); } + if (dec->time_pp <= 0) dec->time_pp = 1; DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp); DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp); @@ -1032,6 +1024,11 @@ version, build, dec->packed_mode); } + if ((dec->bs_version == 0) && (build > 0) && + (build != 1393)) { /* non-xvid stream with xvid fourcc */ + dec->bs_version = 0xffff; + } + } else /* start_code == ? */ { if (BitstreamShowBits(bs, 24) == 0x000001) { @@ -1075,7 +1072,8 @@ void BitstreamWriteVolHeader(Bitstream * const bs, const MBParam * pParam, - const FRAMEINFO * const frame) + const FRAMEINFO * const frame, + const int num_slices) { static const unsigned int vo_id = 0; static const unsigned int vol_id = 0; @@ -1084,14 +1082,9 @@ int vol_profile = pParam->profile; if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) || - (pParam->vol_flags & XVID_VOL_GMC) || - (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)) + (pParam->vol_flags & XVID_VOL_GMC)) vol_ver_id = 2; - if ((pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)) { - vol_type_ind = VIDOBJLAY_TYPE_ART_SIMPLE; - } - if ((pParam->vol_flags & (XVID_VOL_MPEGQUANT|XVID_VOL_QUARTERPEL|XVID_VOL_GMC|XVID_VOL_INTERLACING)) || pParam->max_bframes>0) { vol_type_ind = VIDOBJLAY_TYPE_ASP; @@ -1245,13 +1238,17 @@ } BitstreamPutBit(bs, 1); /* complexity_estimation_disable */ - BitstreamPutBit(bs, 1); /* resync_marker_disable */ + + if (num_slices > 1) + BitstreamPutBit(bs, 0); /* resync_marker_enabled */ + else + BitstreamPutBit(bs, 1); /* resync_marker_disabled */ + BitstreamPutBit(bs, 0); /* data_partitioned */ if (vol_ver_id != 1) { BitstreamPutBit(bs, 0); /* newpred_enable */ - BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0); - /* reduced_resolution_vop_enabled */ + BitstreamPutBit(bs, 0); /* reduced_resolution_vop_enabled */ } BitstreamPutBit(bs, 0); /* scalability */ @@ -1259,9 +1256,9 @@ BitstreamPadAlways(bs); /* next_start_code(); */ /* divx5 userdata string */ -#define DIVX5_ID "DivX503b1393" +#define DIVX5_ID ((char *)"DivX503b1393") if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) { - BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID)); + BitstreamWriteUserData(bs, DIVX5_ID, (uint32_t)strlen(DIVX5_ID)); if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) BitstreamPutBits(bs, 'p', 8); } @@ -1274,7 +1271,7 @@ xvid_user_format, XVID_BS_VERSION, (frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0'); - BitstreamWriteUserData(bs, xvid_user_data, strlen(xvid_user_data)); + BitstreamWriteUserData(bs, xvid_user_data, (uint32_t)strlen(xvid_user_data)); } } @@ -1345,9 +1342,6 @@ if ( (frame->coding_type == P_VOP) || (frame->coding_type == S_VOP) ) BitstreamPutBits(bs, frame->rounding_type, 1); - if ((frame->vol_flags & XVID_VOL_REDUCED_ENABLE)) - BitstreamPutBit(bs, 0); - BitstreamPutBits(bs, 0, 3); /* intra_dc_vlc_threshold */ if ((frame->vol_flags & XVID_VOL_INTERLACING)) { @@ -1395,10 +1389,10 @@ void BitstreamWriteUserData(Bitstream * const bs, - uint8_t * data, - const int length) + const char *data, + const unsigned int length) { - int i; + unsigned int i; BitstreamPad(bs); BitstreamPutBits(bs, USERDATA_START_CODE, 32); @@ -1455,13 +1449,14 @@ { const int mbnum_bits = log2bin(pParam->mb_width * pParam->mb_height - 1); uint32_t nbitsresyncmarker; - int addbits=0; - if (frame->coding_type != I_VOP) - addbits = frame->fcode -1; - if (frame->coding_type == B_VOP) - addbits = MAX(frame->fcode, frame->bcode)-1; - BitstreamPadAlways(bs); - nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + addbits; + + if (frame->coding_type == I_VOP) + nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER; /* 16 zeros followed by a 1. */ + else if (frame->coding_type == B_VOP) /* B_VOP */ + nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER+1, NUMBITS_VP_RESYNC_MARKER + MAX(frame->fcode, frame->bcode) - 1); + else /*(frame->coding_type == P_VOP)*/ + nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + frame->fcode - 1; + BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker); BitstreamPutBits(bs, mbnum, mbnum_bits); BitstreamPutBits(bs, frame->quant, 5);