--- branches/dev-api-4/xvidcore/src/bitstream/bitstream.c 2003/03/26 10:47:59 947 +++ branches/dev-api-4/xvidcore/src/bitstream/bitstream.c 2003/05/12 12:33:16 1014 @@ -513,24 +513,9 @@ DPRINTF(DPRINTF_HEADER, "vol id %i", start_code & VIDOBJLAY_START_CODE_MASK); BitstreamSkip(bs, 32); // video_object_layer_start_code - BitstreamSkip(bs, 1); // random_accessible_vol - // video_object_type_indication - if (BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_SIMPLE && - BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_CORE && - BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_MAIN && - BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_ACE && - BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_ART_SIMPLE && - BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_ASP && - BitstreamShowBits(bs, 8) != 0) // BUGGY DIVX - { - DPRINTF(DPRINTF_ERROR,"video_object_type_indication %i not supported ", - BitstreamShowBits(bs, 8)); - return -1; - } - BitstreamSkip(bs, 8); - + BitstreamSkip(bs, 8); // video_object_type_indication if (BitstreamGetBit(bs)) // is_object_layer_identifier { @@ -1129,22 +1114,19 @@ static const unsigned int vo_id = 0; static const unsigned int vol_id = 0; int vol_ver_id=1; - int profile = 0x03; /* simple profile/level 3 */ int vol_type_ind=VIDOBJLAY_TYPE_SIMPLE; - if ( (pParam->vol_flags & XVID_QUARTERPEL) || - (pParam->vol_flags & XVID_GMC) || - (pParam->vol_flags & XVID_REDUCED_ENABLE)) + if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) || + (pParam->vol_flags & XVID_VOL_GMC) || + (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)) vol_ver_id = 2; - if ((pParam->vol_flags & XVID_REDUCED_ENABLE)) { - profile = 0x93; /* advanced realtime simple profile/level 3 */ + if ((pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)) { vol_type_ind = VIDOBJLAY_TYPE_ART_SIMPLE; } - if ((pParam->vol_flags & XVID_QUARTERPEL) || - (pParam->vol_flags & XVID_GMC)) { - profile = 0xf3; /* advanced simple profile/level 2 */ + if ((pParam->vol_flags & XVID_VOL_QUARTERPEL) || + (pParam->vol_flags & XVID_VOL_GMC)) { vol_type_ind = VIDOBJLAY_TYPE_ASP; } @@ -1153,8 +1135,10 @@ /* no padding here, anymore. You have to make sure that you are byte aligned, and that always 1-8 padding bits have been written */ - BitstreamPutBits(bs, VISOBJSEQ_START_CODE, 32); - BitstreamPutBits(bs, profile, 8); + if (pParam->profile) { + BitstreamPutBits(bs, VISOBJSEQ_START_CODE, 32); + BitstreamPutBits(bs, pParam->profile, 8); + } // visual_object_start_code BitstreamPad(bs); @@ -1171,7 +1155,7 @@ BitstreamPutBits(bs, VIDOBJLAY_START_CODE|(vol_id&0x4), 32); BitstreamPutBit(bs, 0); // random_accessible_vol - BitstreamPutBits(bs, 0, 8); // video_object_type_indication + BitstreamPutBits(bs, vol_type_ind, 8); // video_object_type_indication if (vol_ver_id == 1) { @@ -1223,11 +1207,11 @@ BitstreamPutBits(bs, pParam->height, 13); // height WRITE_MARKER(); - BitstreamPutBit(bs, pParam->vol_flags & XVID_INTERLACING); // interlace + BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_INTERLACING); // interlace BitstreamPutBit(bs, 1); // obmc_disable (overlapped block motion compensation) if (vol_ver_id != 1) - { if ((pParam->vol_flags & XVID_GMC)) + { if ((pParam->vol_flags & XVID_VOL_GMC)) { BitstreamPutBits(bs, 2, 2); // sprite_enable=='GMC' BitstreamPutBits(bs, 2, 6); // no_of_sprite_warping_points BitstreamPutBits(bs, 3, 2); // sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16 @@ -1245,9 +1229,9 @@ BitstreamPutBit(bs, 0); // not_8_bit // quant_type 0=h.263 1=mpeg4(quantizer tables) - BitstreamPutBit(bs, pParam->vol_flags & XVID_MPEGQUANT); + BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_MPEGQUANT); - if ((pParam->vol_flags & XVID_MPEGQUANT)) { + if ((pParam->vol_flags & XVID_VOL_MPEGQUANT)) { BitstreamPutBit(bs, get_intra_matrix_status()); // load_intra_quant_mat if (get_intra_matrix_status()) { bs_put_matrix(bs, get_intra_matrix()); @@ -1261,7 +1245,7 @@ } if (vol_ver_id != 1) { - if ((pParam->vol_flags & XVID_QUARTERPEL)) + if ((pParam->vol_flags & XVID_VOL_QUARTERPEL)) BitstreamPutBit(bs, 1); // quarterpel else BitstreamPutBit(bs, 0); // no quarterpel @@ -1275,7 +1259,7 @@ { BitstreamPutBit(bs, 0); // newpred_enable - BitstreamPutBit(bs, (pParam->vol_flags & XVID_REDUCED_ENABLE)?1:0); + BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0); /* reduced_resolution_vop_enabled */ } @@ -1283,7 +1267,7 @@ /* fake divx5 id, to ensure compatibility with divx5 decoder */ #define DIVX5_ID "DivX000b000p" - if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_PACKED)) { + if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) { BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID)); } @@ -1340,14 +1324,14 @@ if ( (frame->coding_type == P_VOP) || (frame->coding_type == S_VOP) ) BitstreamPutBits(bs, frame->rounding_type, 1); - if ((frame->vol_flags & XVID_REDUCED_ENABLE)) - BitstreamPutBit(bs, (frame->vop_flags & XVID_REDUCED)?1:0); + if ((frame->vol_flags & XVID_VOL_REDUCED_ENABLE)) + BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_REDUCED)?1:0); BitstreamPutBits(bs, 0, 3); // intra_dc_vlc_threshold - if ((frame->vol_flags & XVID_INTERLACING)) { - BitstreamPutBit(bs, (frame->vop_flags & XVID_TOPFIELDFIRST)); - BitstreamPutBit(bs, (frame->vop_flags & XVID_ALTERNATESCAN)); + if ((frame->vol_flags & XVID_VOL_INTERLACING)) { + BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_TOPFIELDFIRST)); + BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_ALTERNATESCAN)); } if (frame->coding_type == S_VOP) { @@ -1361,7 +1345,7 @@ bs_put_spritetrajectory(bs, frame->warp.duv[k].y ); // dv[k] WRITE_MARKER(); - if ((frame->vol_flags & XVID_QUARTERPEL)) + if ((frame->vol_flags & XVID_VOL_QUARTERPEL)) { DPRINTF(DPRINTF_HEADER,"sprite_warping_point[%i] xy=(%i,%i) *QPEL*", k, frame->warp.duv[k].x/2, frame->warp.duv[k].y/2); }