--- trunk/xvidcore/src/bitstream/bitstream.c 2002/07/19 13:34:32 316 +++ trunk/xvidcore/src/bitstream/bitstream.c 2004/10/03 16:20:51 1553 @@ -1,79 +1,41 @@ - /****************************************************************************** - * * - * This file is part of XviD, a free MPEG-4 video encoder/decoder * - * * - * XviD is an implementation of a part of one or more MPEG-4 Video tools * - * as specified in ISO/IEC 14496-2 standard. Those intending to use this * - * software module in hardware or software products are advised that its * - * use may infringe existing patents or copyrights, and any such use * - * would be at such party's own risk. The original developer of this * - * software module and his/her company, and subsequent editors and their * - * companies, will have no liability for use of this software or * - * modifications or derivatives thereof. * - * * - * XviD is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * XviD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * bitstream.c * - * * - * Copyright (C) 2001 - Peter Ross * - * * - * For more information visit the XviD homepage: http://www.xvid.org * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * Revision history: * - * * - * 11.07.2002 add VOP width & height return to dec when dec->width * - * or dec->height is 0 (for use in examples/ex1.c) * - * MinChen * - * 22.05.2002 bs_put_matrix fix * - * 20.05.2002 added BitstreamWriteUserData * - * 19.06.2002 Fix a little bug in use custom quant matrix * - * MinChen * - * 08.05.2002 add low_delay support for B_VOP decode * - * MinChen * - * 06.05.2002 low_delay * - * 06.05.2002 fixed fincr/fbase error * - * 01.05.2002 added BVOP support to BitstreamWriteVopHeader * - * 15.04.2002 rewrite log2bin use asm386 By MinChen * - * 26.03.2002 interlacing support * - * 03.03.2002 qmatrix writing * - * 03.03.2002 merged BITREADER and BITWRITER * - * 30.02.2002 intra_dc_threshold support * - * 04.12.2001 support for additional headers * - * 16.12.2001 inital version * - * - ******************************************************************************/ +/***************************************************************************** + * + * XVID MPEG-4 VIDEO CODEC + * - Bitstream reader/writer - + * + * Copyright (C) 2001-2003 Peter Ross + * 2003 Cristoph Lampert + * + * This program is free software ; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation ; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY ; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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.47 2004-10-03 16:20:51 syskin Exp $ + * + ****************************************************************************/ +#include +#include #include "bitstream.h" #include "zigzag.h" #include "../quant/quant_matrix.h" +#include "mbcoding.h" static uint32_t __inline log2bin(uint32_t value) { -/* Changed by Chenm001 */ -#ifndef WIN32 int n = 0; while (value) { @@ -81,12 +43,6 @@ n++; } return n; -#else - __asm { - bsr eax, value - inc eax - } -#endif } @@ -115,8 +71,10 @@ matrix[scan_tables[0][i++]] = value; } while (value != 0 && i < 64); - i--; // fix little bug at coeff not full + if (value != 0) return; + + i--; while (i < 64) { matrix[scan_tables[0][i++]] = last; } @@ -124,50 +82,293 @@ -// for PVOP addbits == fcode - 1 -// for BVOP addbits == max(fcode,bcode) - 1 -// returns mbpos +/* + * for PVOP addbits == fcode - 1 + * for BVOP addbits == max(fcode,bcode) - 1 + * returns mbpos + */ int -read_video_packet_header(Bitstream *bs, const int addbits, int * quant) +read_video_packet_header(Bitstream *bs, + DECODER * dec, + const int addbits, + int * quant, + int * fcode_forward, + int * fcode_backward, + int * intra_dc_threshold) { - int nbits; + int startcode_bits = NUMBITS_VP_RESYNC_MARKER + addbits; + int mbnum_bits = log2bin(dec->mb_width * dec->mb_height - 1); int mbnum; - int hec; - - nbits = NUMBITS_VP_RESYNC_MARKER + addbits; + int hec = 0; BitstreamSkip(bs, BitstreamNumBitsToByteAlign(bs)); - BitstreamSkip(bs, nbits); + BitstreamSkip(bs, startcode_bits); + + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); + + if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) + { + hec = BitstreamGetBit(bs); /* header_extension_code */ + if (hec && !(dec->sprite_enable == SPRITE_STATIC /* && current_coding_type = I_VOP */)) + { + BitstreamSkip(bs, 13); /* vop_width */ + READ_MARKER(); + BitstreamSkip(bs, 13); /* vop_height */ + READ_MARKER(); + BitstreamSkip(bs, 13); /* vop_horizontal_mc_spatial_ref */ + READ_MARKER(); + BitstreamSkip(bs, 13); /* vop_vertical_mc_spatial_ref */ + READ_MARKER(); + } + } + + mbnum = BitstreamGetBits(bs, mbnum_bits); /* macroblock_number */ + DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum); + + if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) + { + *quant = BitstreamGetBits(bs, dec->quant_bits); /* quant_scale */ + DPRINTF(XVID_DEBUG_HEADER, "quant %i\n", *quant); + } - DPRINTF(DPRINTF_STARTCODE, ""); + if (dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR) + hec = BitstreamGetBit(bs); /* header_extension_code */ - // if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) { - // hec - // vop_width - // marker_bit - // vop_height - // marker_bit - - //} - - mbnum = BitstreamGetBits(bs, 9); - DPRINTF(DPRINTF_HEADER, "mbnum %i", mbnum); - - // if (dec->shape != VIDOBJLAY_SHAPE_BINARYONLY) - *quant = BitstreamGetBits(bs, 5); - DPRINTF(DPRINTF_HEADER, "quant %i", *quant); - - // if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) - hec = BitstreamGetBit(bs); - DPRINTF(DPRINTF_HEADER, "header_extension_code %i", hec); - // if (hec) - // .. decoder hec-header ... + + DPRINTF(XVID_DEBUG_HEADER, "header_extension_code %i\n", hec); + if (hec) + { + int time_base; + int time_increment; + int coding_type; + + for (time_base=0; BitstreamGetBit(bs)!=0; time_base++); /* modulo_time_base */ + READ_MARKER(); + if (dec->time_inc_bits) + time_increment = (BitstreamGetBits(bs, dec->time_inc_bits)); /* vop_time_increment */ + READ_MARKER(); + DPRINTF(XVID_DEBUG_HEADER,"time %i:%i\n", time_base, time_increment); + + coding_type = BitstreamGetBits(bs, 2); + DPRINTF(XVID_DEBUG_HEADER,"coding_type %i\n", coding_type); + + if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) + { + BitstreamSkip(bs, 1); /* change_conv_ratio_disable */ + if (coding_type != I_VOP) + BitstreamSkip(bs, 1); /* vop_shape_coding_type */ + } + + if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) + { + *intra_dc_threshold = intra_dc_threshold_table[BitstreamGetBits(bs, 3)]; + + if (dec->sprite_enable == SPRITE_GMC && coding_type == S_VOP && + dec->sprite_warping_points > 0) + { + /* TODO: sprite trajectory */ + } + if (dec->reduced_resolution_enable && + dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR && + (coding_type == P_VOP || coding_type == I_VOP)) + { + BitstreamSkip(bs, 1); /* XXX: vop_reduced_resolution */ + } + + if (coding_type != I_VOP && fcode_forward) + { + *fcode_forward = BitstreamGetBits(bs, 3); + DPRINTF(XVID_DEBUG_HEADER,"fcode_forward %i\n", *fcode_forward); + } + + if (coding_type == B_VOP && fcode_backward) + { + *fcode_backward = BitstreamGetBits(bs, 3); + DPRINTF(XVID_DEBUG_HEADER,"fcode_backward %i\n", *fcode_backward); + } + } + + } + + if (dec->newpred_enable) + { + int vop_id; + int vop_id_for_prediction; + + vop_id = BitstreamGetBits(bs, MIN(dec->time_inc_bits + 3, 15)); + DPRINTF(XVID_DEBUG_HEADER, "vop_id %i\n", vop_id); + if (BitstreamGetBit(bs)) /* vop_id_for_prediction_indication */ + { + vop_id_for_prediction = BitstreamGetBits(bs, MIN(dec->time_inc_bits + 3, 15)); + DPRINTF(XVID_DEBUG_HEADER, "vop_id_for_prediction %i\n", vop_id_for_prediction); + } + READ_MARKER(); + } return mbnum; } + +/* vol estimation header */ +static void +read_vol_complexity_estimation_header(Bitstream * bs, DECODER * dec) +{ + ESTIMATION * e = &dec->estimation; + + e->method = BitstreamGetBits(bs, 2); /* estimation_method */ + DPRINTF(XVID_DEBUG_HEADER,"+ complexity_estimation_header; method=%i\n", e->method); + + if (e->method == 0 || e->method == 1) + { + if (!BitstreamGetBit(bs)) /* shape_complexity_estimation_disable */ + { + e->opaque = BitstreamGetBit(bs); /* opaque */ + e->transparent = BitstreamGetBit(bs); /* transparent */ + e->intra_cae = BitstreamGetBit(bs); /* intra_cae */ + e->inter_cae = BitstreamGetBit(bs); /* inter_cae */ + e->no_update = BitstreamGetBit(bs); /* no_update */ + e->upsampling = BitstreamGetBit(bs); /* upsampling */ + } + + if (!BitstreamGetBit(bs)) /* texture_complexity_estimation_set_1_disable */ + { + e->intra_blocks = BitstreamGetBit(bs); /* intra_blocks */ + e->inter_blocks = BitstreamGetBit(bs); /* inter_blocks */ + e->inter4v_blocks = BitstreamGetBit(bs); /* inter4v_blocks */ + e->not_coded_blocks = BitstreamGetBit(bs); /* not_coded_blocks */ + } + } + + READ_MARKER(); + + if (!BitstreamGetBit(bs)) /* texture_complexity_estimation_set_2_disable */ + { + e->dct_coefs = BitstreamGetBit(bs); /* dct_coefs */ + e->dct_lines = BitstreamGetBit(bs); /* dct_lines */ + e->vlc_symbols = BitstreamGetBit(bs); /* vlc_symbols */ + e->vlc_bits = BitstreamGetBit(bs); /* vlc_bits */ + } + + if (!BitstreamGetBit(bs)) /* motion_compensation_complexity_disable */ + { + e->apm = BitstreamGetBit(bs); /* apm */ + e->npm = BitstreamGetBit(bs); /* npm */ + e->interpolate_mc_q = BitstreamGetBit(bs); /* interpolate_mc_q */ + e->forw_back_mc_q = BitstreamGetBit(bs); /* forw_back_mc_q */ + e->halfpel2 = BitstreamGetBit(bs); /* halfpel2 */ + e->halfpel4 = BitstreamGetBit(bs); /* halfpel4 */ + } + + READ_MARKER(); + + if (e->method == 1) + { + if (!BitstreamGetBit(bs)) /* version2_complexity_estimation_disable */ + { + e->sadct = BitstreamGetBit(bs); /* sadct */ + e->quarterpel = BitstreamGetBit(bs); /* quarterpel */ + } + } +} + + +/* vop estimation header */ +static void +read_vop_complexity_estimation_header(Bitstream * bs, DECODER * dec, int coding_type) +{ + ESTIMATION * e = &dec->estimation; + + if (e->method == 0 || e->method == 1) + { + if (coding_type == I_VOP) { + if (e->opaque) BitstreamSkip(bs, 8); /* dcecs_opaque */ + if (e->transparent) BitstreamSkip(bs, 8); /* */ + if (e->intra_cae) BitstreamSkip(bs, 8); /* */ + if (e->inter_cae) BitstreamSkip(bs, 8); /* */ + if (e->no_update) BitstreamSkip(bs, 8); /* */ + if (e->upsampling) BitstreamSkip(bs, 8); /* */ + if (e->intra_blocks) BitstreamSkip(bs, 8); /* */ + if (e->not_coded_blocks) BitstreamSkip(bs, 8); /* */ + if (e->dct_coefs) BitstreamSkip(bs, 8); /* */ + if (e->dct_lines) BitstreamSkip(bs, 8); /* */ + if (e->vlc_symbols) BitstreamSkip(bs, 8); /* */ + if (e->vlc_bits) BitstreamSkip(bs, 8); /* */ + if (e->sadct) BitstreamSkip(bs, 8); /* */ + } + + if (coding_type == P_VOP) { + if (e->opaque) BitstreamSkip(bs, 8); /* */ + if (e->transparent) BitstreamSkip(bs, 8); /* */ + if (e->intra_cae) BitstreamSkip(bs, 8); /* */ + if (e->inter_cae) BitstreamSkip(bs, 8); /* */ + if (e->no_update) BitstreamSkip(bs, 8); /* */ + if (e->upsampling) BitstreamSkip(bs, 8); /* */ + if (e->intra_blocks) BitstreamSkip(bs, 8); /* */ + if (e->not_coded_blocks) BitstreamSkip(bs, 8); /* */ + if (e->dct_coefs) BitstreamSkip(bs, 8); /* */ + if (e->dct_lines) BitstreamSkip(bs, 8); /* */ + if (e->vlc_symbols) BitstreamSkip(bs, 8); /* */ + if (e->vlc_bits) BitstreamSkip(bs, 8); /* */ + if (e->inter_blocks) BitstreamSkip(bs, 8); /* */ + if (e->inter4v_blocks) BitstreamSkip(bs, 8); /* */ + if (e->apm) BitstreamSkip(bs, 8); /* */ + if (e->npm) BitstreamSkip(bs, 8); /* */ + if (e->forw_back_mc_q) BitstreamSkip(bs, 8); /* */ + if (e->halfpel2) BitstreamSkip(bs, 8); /* */ + if (e->halfpel4) BitstreamSkip(bs, 8); /* */ + if (e->sadct) BitstreamSkip(bs, 8); /* */ + if (e->quarterpel) BitstreamSkip(bs, 8); /* */ + } + if (coding_type == B_VOP) { + if (e->opaque) BitstreamSkip(bs, 8); /* */ + if (e->transparent) BitstreamSkip(bs, 8); /* */ + if (e->intra_cae) BitstreamSkip(bs, 8); /* */ + if (e->inter_cae) BitstreamSkip(bs, 8); /* */ + if (e->no_update) BitstreamSkip(bs, 8); /* */ + if (e->upsampling) BitstreamSkip(bs, 8); /* */ + if (e->intra_blocks) BitstreamSkip(bs, 8); /* */ + if (e->not_coded_blocks) BitstreamSkip(bs, 8); /* */ + if (e->dct_coefs) BitstreamSkip(bs, 8); /* */ + if (e->dct_lines) BitstreamSkip(bs, 8); /* */ + if (e->vlc_symbols) BitstreamSkip(bs, 8); /* */ + if (e->vlc_bits) BitstreamSkip(bs, 8); /* */ + if (e->inter_blocks) BitstreamSkip(bs, 8); /* */ + if (e->inter4v_blocks) BitstreamSkip(bs, 8); /* */ + if (e->apm) BitstreamSkip(bs, 8); /* */ + if (e->npm) BitstreamSkip(bs, 8); /* */ + if (e->forw_back_mc_q) BitstreamSkip(bs, 8); /* */ + if (e->halfpel2) BitstreamSkip(bs, 8); /* */ + if (e->halfpel4) BitstreamSkip(bs, 8); /* */ + if (e->interpolate_mc_q) BitstreamSkip(bs, 8); /* */ + if (e->sadct) BitstreamSkip(bs, 8); /* */ + if (e->quarterpel) BitstreamSkip(bs, 8); /* */ + } + + if (coding_type == S_VOP && dec->sprite_enable == SPRITE_STATIC) { + if (e->intra_blocks) BitstreamSkip(bs, 8); /* */ + if (e->not_coded_blocks) BitstreamSkip(bs, 8); /* */ + if (e->dct_coefs) BitstreamSkip(bs, 8); /* */ + if (e->dct_lines) BitstreamSkip(bs, 8); /* */ + if (e->vlc_symbols) BitstreamSkip(bs, 8); /* */ + if (e->vlc_bits) BitstreamSkip(bs, 8); /* */ + if (e->inter_blocks) BitstreamSkip(bs, 8); /* */ + if (e->inter4v_blocks) BitstreamSkip(bs, 8); /* */ + if (e->apm) BitstreamSkip(bs, 8); /* */ + if (e->npm) BitstreamSkip(bs, 8); /* */ + if (e->forw_back_mc_q) BitstreamSkip(bs, 8); /* */ + if (e->halfpel2) BitstreamSkip(bs, 8); /* */ + if (e->halfpel4) BitstreamSkip(bs, 8); /* */ + if (e->interpolate_mc_q) BitstreamSkip(bs, 8); /* */ + } + } +} + + + + + /* decode headers returns coding_type, or -1 if error @@ -180,19 +381,22 @@ BitstreamReadHeaders(Bitstream * bs, DECODER * dec, uint32_t * rounding, + uint32_t * reduced_resolution, uint32_t * quant, uint32_t * fcode_forward, uint32_t * fcode_backward, - uint32_t * intra_dc_threshold) + uint32_t * intra_dc_threshold, + WARPPOINTS *gmc_warp) { uint32_t vol_ver_id; - static uint32_t time_increment_resolution; uint32_t coding_type; uint32_t start_code; uint32_t time_incr = 0; - int32_t time_increment; + int32_t time_increment = 0; + int resize = 0; + + while ((BitstreamPos(bs) >> 3) + 4 <= bs->length) { - do { BitstreamByteAlign(bs); start_code = BitstreamShowBits(bs, 32); @@ -200,152 +404,166 @@ int profile; - DPRINTF(DPRINTF_STARTCODE, ""); + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); - BitstreamSkip(bs, 32); // visual_object_sequence_start_code - profile = BitstreamGetBits(bs, 8); // profile_and_level_indication + BitstreamSkip(bs, 32); /* visual_object_sequence_start_code */ + profile = BitstreamGetBits(bs, 8); /* profile_and_level_indication */ - DPRINTF(DPRINTF_HEADER, "profile_and_level_indication %i", profile); + DPRINTF(XVID_DEBUG_HEADER, "profile_and_level_indication %i\n", profile); } else if (start_code == VISOBJSEQ_STOP_CODE) { - BitstreamSkip(bs, 32); // visual_object_sequence_stop_code + BitstreamSkip(bs, 32); /* visual_object_sequence_stop_code */ - DPRINTF(DPRINTF_STARTCODE, ""); + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); } else if (start_code == VISOBJ_START_CODE) { + int visobj_ver_id; - DPRINTF(DPRINTF_STARTCODE, ""); + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); - BitstreamSkip(bs, 32); // visual_object_start_code - if (BitstreamGetBit(bs)) // is_visual_object_identified + BitstreamSkip(bs, 32); /* visual_object_start_code */ + if (BitstreamGetBit(bs)) /* is_visual_object_identified */ { - vol_ver_id = BitstreamGetBits(bs, 4); // visual_object_ver_id - DPRINTF(DPRINTF_HEADER,"ver_id %i", vol_ver_id); - BitstreamSkip(bs, 3); // visual_object_priority + visobj_ver_id = BitstreamGetBits(bs, 4); /* visual_object_ver_id */ + DPRINTF(XVID_DEBUG_HEADER,"visobj_ver_id %i\n", visobj_ver_id); + BitstreamSkip(bs, 3); /* visual_object_priority */ } else { - vol_ver_id = 1; + visobj_ver_id = 1; } - if (BitstreamShowBits(bs, 4) != VISOBJ_TYPE_VIDEO) // visual_object_type + if (BitstreamShowBits(bs, 4) != VISOBJ_TYPE_VIDEO) /* visual_object_type */ { - DPRINTF(DPRINTF_ERROR, "visual_object_type != video"); + DPRINTF(XVID_DEBUG_ERROR, "visual_object_type != video\n"); return -1; } BitstreamSkip(bs, 4); - // video_signal_type + /* video_signal_type */ - if (BitstreamGetBit(bs)) // video_signal_type + if (BitstreamGetBit(bs)) /* video_signal_type */ { - DPRINTF(DPRINTF_HEADER,"+ video_signal_type"); - BitstreamSkip(bs, 3); // video_format - BitstreamSkip(bs, 1); // video_range - if (BitstreamGetBit(bs)) // color_description - { - DPRINTF(DPRINTF_HEADER,"+ color_description"); - BitstreamSkip(bs, 8); // color_primaries - BitstreamSkip(bs, 8); // transfer_characteristics - BitstreamSkip(bs, 8); // matrix_coefficients + DPRINTF(XVID_DEBUG_HEADER,"+ video_signal_type\n"); + BitstreamSkip(bs, 3); /* video_format */ + BitstreamSkip(bs, 1); /* video_range */ + if (BitstreamGetBit(bs)) /* color_description */ + { + DPRINTF(XVID_DEBUG_HEADER,"+ color_description"); + BitstreamSkip(bs, 8); /* color_primaries */ + BitstreamSkip(bs, 8); /* transfer_characteristics */ + BitstreamSkip(bs, 8); /* matrix_coefficients */ } } } else if ((start_code & ~VIDOBJ_START_CODE_MASK) == VIDOBJ_START_CODE) { - DPRINTF(DPRINTF_STARTCODE, ""); - DPRINTF(DPRINTF_HEADER, "vo id %i", start_code & VIDOBJ_START_CODE_MASK); + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); + DPRINTF(XVID_DEBUG_HEADER, "vo id %i\n", start_code & VIDOBJ_START_CODE_MASK); - BitstreamSkip(bs, 32); // video_object_start_code + BitstreamSkip(bs, 32); /* video_object_start_code */ } else if ((start_code & ~VIDOBJLAY_START_CODE_MASK) == VIDOBJLAY_START_CODE) { - DPRINTF(DPRINTF_STARTCODE, ""); - DPRINTF(DPRINTF_HEADER, "vol id %i", start_code & VIDOBJLAY_START_CODE_MASK); + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); + DPRINTF(XVID_DEBUG_HEADER, "vol id %i\n", start_code & VIDOBJLAY_START_CODE_MASK); - BitstreamSkip(bs, 32); // video_object_layer_start_code + BitstreamSkip(bs, 32); /* video_object_layer_start_code */ + BitstreamSkip(bs, 1); /* random_accessible_vol */ - BitstreamSkip(bs, 1); // random_accessible_vol + BitstreamSkip(bs, 8); /* video_object_type_indication */ - // 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) != 0) // BUGGY DIVX + if (BitstreamGetBit(bs)) /* is_object_layer_identifier */ { - DPRINTF(DPRINTF_ERROR,"video_object_type_indication %i not supported ", - BitstreamShowBits(bs, 8)); - return -1; - } - BitstreamSkip(bs, 8); - - - if (BitstreamGetBit(bs)) // is_object_layer_identifier - { - DPRINTF(DPRINTF_HEADER, "+ is_object_layer_identifier"); - vol_ver_id = BitstreamGetBits(bs, 4); // video_object_layer_verid - DPRINTF(DPRINTF_HEADER,"ver_id %i", vol_ver_id); - BitstreamSkip(bs, 3); // video_object_layer_priority + DPRINTF(XVID_DEBUG_HEADER, "+ is_object_layer_identifier\n"); + vol_ver_id = BitstreamGetBits(bs, 4); /* video_object_layer_verid */ + DPRINTF(XVID_DEBUG_HEADER,"ver_id %i\n", vol_ver_id); + BitstreamSkip(bs, 3); /* video_object_layer_priority */ } else { vol_ver_id = 1; } - if (BitstreamGetBits(bs, 4) == VIDOBJLAY_AR_EXTPAR) // aspect_ratio_info + dec->aspect_ratio = BitstreamGetBits(bs, 4); + + if (dec->aspect_ratio == VIDOBJLAY_AR_EXTPAR) /* aspect_ratio_info */ { - DPRINTF(DPRINTF_HEADER, "+ aspect_ratio_info"); - BitstreamSkip(bs, 8); // par_width - BitstreamSkip(bs, 8); // par_height + DPRINTF(XVID_DEBUG_HEADER, "+ aspect_ratio_info\n"); + dec->par_width = BitstreamGetBits(bs, 8); /* par_width */ + dec->par_height = BitstreamGetBits(bs, 8); /* par_height */ } - if (BitstreamGetBit(bs)) // vol_control_parameters + if (BitstreamGetBit(bs)) /* vol_control_parameters */ { - DPRINTF(DPRINTF_HEADER, "+ vol_control_parameters"); - BitstreamSkip(bs, 2); // chroma_format - dec->low_delay = BitstreamGetBit(bs); // low_delay - DPRINTF(DPRINTF_HEADER, "low_delay %i", dec->low_delay); - if (BitstreamGetBit(bs)) // vbv_parameters + DPRINTF(XVID_DEBUG_HEADER, "+ vol_control_parameters\n"); + BitstreamSkip(bs, 2); /* chroma_format */ + dec->low_delay = BitstreamGetBit(bs); /* low_delay */ + DPRINTF(XVID_DEBUG_HEADER, "low_delay %i\n", dec->low_delay); + if (BitstreamGetBit(bs)) /* vbv_parameters */ { - DPRINTF(DPRINTF_HEADER,"+ vbv_parameters"); - BitstreamSkip(bs, 15); // first_half_bitrate + unsigned int bitrate; + unsigned int buffer_size; + unsigned int occupancy; + + DPRINTF(XVID_DEBUG_HEADER,"+ vbv_parameters\n"); + + bitrate = BitstreamGetBits(bs,15) << 15; /* first_half_bit_rate */ READ_MARKER(); - BitstreamSkip(bs, 15); // latter_half_bitrate + bitrate |= BitstreamGetBits(bs,15); /* latter_half_bit_rate */ READ_MARKER(); - BitstreamSkip(bs, 15); // first_half_vbv_buffer_size + + buffer_size = BitstreamGetBits(bs, 15) << 3; /* first_half_vbv_buffer_size */ READ_MARKER(); - BitstreamSkip(bs, 3); // latter_half_vbv_buffer_size - BitstreamSkip(bs, 11); // first_half_vbv_occupancy + buffer_size |= BitstreamGetBits(bs, 3); /* latter_half_vbv_buffer_size */ + + occupancy = BitstreamGetBits(bs, 11) << 15; /* first_half_vbv_occupancy */ READ_MARKER(); - BitstreamSkip(bs, 15); // latter_half_vbv_occupancy + occupancy |= BitstreamGetBits(bs, 15); /* latter_half_vbv_occupancy */ READ_MARKER(); + DPRINTF(XVID_DEBUG_HEADER,"bitrate %d (unit=400 bps)\n", bitrate); + DPRINTF(XVID_DEBUG_HEADER,"buffer_size %d (unit=16384 bits)\n", buffer_size); + DPRINTF(XVID_DEBUG_HEADER,"occupancy %d (unit=64 bits)\n", occupancy); } + }else{ + dec->low_delay = dec->low_delay_default; } - dec->shape = BitstreamGetBits(bs, 2); // video_object_layer_shape - DPRINTF(DPRINTF_HEADER, "shape %i", dec->shape); + dec->shape = BitstreamGetBits(bs, 2); /* video_object_layer_shape */ + + DPRINTF(XVID_DEBUG_HEADER, "shape %i\n", dec->shape); + if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) + { + DPRINTF(XVID_DEBUG_ERROR,"non-rectangular shapes are not supported\n"); + } if (dec->shape == VIDOBJLAY_SHAPE_GRAYSCALE && vol_ver_id != 1) { - BitstreamSkip(bs, 4); // video_object_layer_shape_extension + BitstreamSkip(bs, 4); /* video_object_layer_shape_extension */ } READ_MARKER(); -// *************************** for decode B-frame time *********************** - time_increment_resolution = BitstreamGetBits(bs, 16); // vop_time_increment_resolution - - DPRINTF(DPRINTF_HEADER,"vop_time_increment_resolution %i", time_increment_resolution); + /********************** for decode B-frame time ***********************/ + 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); -// time_increment_resolution--; +#if 0 + dec->time_inc_resolution--; +#endif - if (time_increment_resolution > 0) { - dec->time_inc_bits = log2bin(time_increment_resolution-1); + if (dec->time_inc_resolution > 0) { + dec->time_inc_bits = MAX(log2bin(dec->time_inc_resolution-1), 1); } else { - // dec->time_inc_bits = 0; - // for "old" xvid compatibility, set time_inc_bits = 1 +#if 0 + dec->time_inc_bits = 0; +#endif + /* for "old" xvid compatibility, set time_inc_bits = 1 */ dec->time_inc_bits = 1; } READ_MARKER(); - if (BitstreamGetBit(bs)) // fixed_vop_rate + if (BitstreamGetBit(bs)) /* fixed_vop_rate */ { - DPRINTF(DPRINTF_HEADER, "+ fixed_vop_rate"); - BitstreamSkip(bs, dec->time_inc_bits); // fixed_vop_time_increment + DPRINTF(XVID_DEBUG_HEADER, "+ fixed_vop_rate\n"); + BitstreamSkip(bs, dec->time_inc_bits); /* fixed_vop_time_increment */ } if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) { @@ -354,91 +572,115 @@ uint32_t width, height; READ_MARKER(); - width = BitstreamGetBits(bs, 13); // video_object_layer_width + width = BitstreamGetBits(bs, 13); /* video_object_layer_width */ READ_MARKER(); - height = BitstreamGetBits(bs, 13); // video_object_layer_height + height = BitstreamGetBits(bs, 13); /* video_object_layer_height */ READ_MARKER(); - DPRINTF(DPRINTF_HEADER, "width %i", width); - DPRINTF(DPRINTF_HEADER, "height %i", height); + DPRINTF(XVID_DEBUG_HEADER, "width %i\n", width); + DPRINTF(XVID_DEBUG_HEADER, "height %i\n", height); - // for auto set width & height - if (dec->width == 0) + if (dec->width != width || dec->height != height) + { + if (dec->fixed_dimensions) + { + DPRINTF(XVID_DEBUG_ERROR, "decoder width/height does not match bitstream\n"); + return -1; + } + resize = 1; dec->width = width; - if (dec->height == 0) dec->height = height; - - if (width != dec->width || height != dec->height) { - DPRINTF(DPRINTF_ERROR, "XVID_DEC_PARAM width/height does not match bitstream"); - return -1; } - } dec->interlacing = BitstreamGetBit(bs); - DPRINTF(DPRINTF_HEADER, "interlace", dec->interlacing); + DPRINTF(XVID_DEBUG_HEADER, "interlacing %i\n", dec->interlacing); - if (!BitstreamGetBit(bs)) // obmc_disable + if (!BitstreamGetBit(bs)) /* obmc_disable */ { - DPRINTF(DPRINTF_ERROR, "obmc_disabled==false not supported"); - // TODO - // fucking divx4.02 has this enabled + DPRINTF(XVID_DEBUG_ERROR, "obmc_disabled==false not supported\n"); + /* TODO */ + /* fucking divx4.02 has this enabled */ } - if (BitstreamGetBits(bs, (vol_ver_id == 1 ? 1 : 2))) // sprite_enable + dec->sprite_enable = BitstreamGetBits(bs, (vol_ver_id == 1 ? 1 : 2)); /* sprite_enable */ + + if (dec->sprite_enable == SPRITE_STATIC || dec->sprite_enable == SPRITE_GMC) { - DPRINTF(DPRINTF_ERROR, "spriate_enabled not supported"); - return -1; + int low_latency_sprite_enable; + + if (dec->sprite_enable != SPRITE_GMC) + { + int sprite_width; + int sprite_height; + int sprite_left_coord; + int sprite_top_coord; + sprite_width = BitstreamGetBits(bs, 13); /* sprite_width */ + READ_MARKER(); + sprite_height = BitstreamGetBits(bs, 13); /* sprite_height */ + READ_MARKER(); + sprite_left_coord = BitstreamGetBits(bs, 13); /* sprite_left_coordinate */ + READ_MARKER(); + sprite_top_coord = BitstreamGetBits(bs, 13); /* sprite_top_coordinate */ + READ_MARKER(); + } + dec->sprite_warping_points = BitstreamGetBits(bs, 6); /* no_of_sprite_warping_points */ + dec->sprite_warping_accuracy = BitstreamGetBits(bs, 2); /* sprite_warping_accuracy */ + dec->sprite_brightness_change = BitstreamGetBits(bs, 1); /* brightness_change */ + if (dec->sprite_enable != SPRITE_GMC) + { + low_latency_sprite_enable = BitstreamGetBits(bs, 1); /* low_latency_sprite_enable */ + } } if (vol_ver_id != 1 && dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) { - BitstreamSkip(bs, 1); // sadct_disable + BitstreamSkip(bs, 1); /* sadct_disable */ } - if (BitstreamGetBit(bs)) // not_8_bit + if (BitstreamGetBit(bs)) /* not_8_bit */ { - DPRINTF(DPRINTF_HEADER, "not_8_bit==true (ignored)"); - dec->quant_bits = BitstreamGetBits(bs, 4); // quant_precision - BitstreamSkip(bs, 4); // bits_per_pixel + DPRINTF(XVID_DEBUG_HEADER, "not_8_bit==true (ignored)\n"); + dec->quant_bits = BitstreamGetBits(bs, 4); /* quant_precision */ + BitstreamSkip(bs, 4); /* bits_per_pixel */ } else { dec->quant_bits = 5; } if (dec->shape == VIDOBJLAY_SHAPE_GRAYSCALE) { - BitstreamSkip(bs, 1); // no_gray_quant_update - BitstreamSkip(bs, 1); // composition_method - BitstreamSkip(bs, 1); // linear_composition + BitstreamSkip(bs, 1); /* no_gray_quant_update */ + BitstreamSkip(bs, 1); /* composition_method */ + BitstreamSkip(bs, 1); /* linear_composition */ } - dec->quant_type = BitstreamGetBit(bs); // quant_type - DPRINTF(DPRINTF_HEADER, "quant_type %i", dec->quant_type); + dec->quant_type = BitstreamGetBit(bs); /* quant_type */ + DPRINTF(XVID_DEBUG_HEADER, "quant_type %i\n", dec->quant_type); if (dec->quant_type) { - if (BitstreamGetBit(bs)) // load_intra_quant_mat + if (BitstreamGetBit(bs)) /* load_intra_quant_mat */ { uint8_t matrix[64]; - DPRINTF(DPRINTF_HEADER, "load_intra_quant_mat"); + DPRINTF(XVID_DEBUG_HEADER, "load_intra_quant_mat\n"); bs_get_matrix(bs, matrix); - set_intra_matrix(matrix); + set_intra_matrix(dec->mpeg_quant_matrices, matrix); } else - set_intra_matrix(get_default_intra_matrix()); + set_intra_matrix(dec->mpeg_quant_matrices, get_default_intra_matrix()); - if (BitstreamGetBit(bs)) // load_inter_quant_mat + if (BitstreamGetBit(bs)) /* load_inter_quant_mat */ { uint8_t matrix[64]; - - DPRINTF(DPRINTF_HEADER, "load_inter_quant_mat"); + + DPRINTF(XVID_DEBUG_HEADER, "load_inter_quant_mat\n"); bs_get_matrix(bs, matrix); - set_inter_matrix(matrix); + set_inter_matrix(dec->mpeg_quant_matrices, matrix); } else - set_inter_matrix(get_default_inter_matrix()); + set_inter_matrix(dec->mpeg_quant_matrices, get_default_inter_matrix()); if (dec->shape == VIDOBJLAY_SHAPE_GRAYSCALE) { - DPRINTF(DPRINTF_ERROR, "greyscale matrix not supported"); + DPRINTF(XVID_DEBUG_ERROR, "greyscale matrix not supported\n"); return -1; } @@ -446,63 +688,90 @@ if (vol_ver_id != 1) { - dec->quarterpel = BitstreamGetBit(bs); // quarter_sampe - if (dec->quarterpel) { - DPRINTF(DPRINTF_ERROR, "quarter_sample not supported"); - } - } else { - dec->quarterpel = 0; + dec->quarterpel = BitstreamGetBit(bs); /* quarter_sample */ + DPRINTF(XVID_DEBUG_HEADER,"quarterpel %i\n", dec->quarterpel); } + else + dec->quarterpel = 0; + - if (!BitstreamGetBit(bs)) // complexity_estimation_disable + dec->complexity_estimation_disable = BitstreamGetBit(bs); /* complexity estimation disable */ + if (!dec->complexity_estimation_disable) { - DPRINTF(DPRINTF_ERROR, "complexity_estimation not supported"); - return -1; + read_vol_complexity_estimation_header(bs, dec); } - BitstreamSkip(bs, 1); // resync_marker_disable + BitstreamSkip(bs, 1); /* resync_marker_disable */ - if (BitstreamGetBit(bs)) // data_partitioned + if (BitstreamGetBit(bs)) /* data_partitioned */ { - DPRINTF(DPRINTF_ERROR, "data_partitioned not supported"); - BitstreamSkip(bs, 1); // reversible_vlc + DPRINTF(XVID_DEBUG_ERROR, "data_partitioned not supported\n"); + BitstreamSkip(bs, 1); /* reversible_vlc */ } if (vol_ver_id != 1) { - if (BitstreamGetBit(bs)) // newpred_enable - { - DPRINTF(DPRINTF_HEADER, "+ newpred_enable"); - BitstreamSkip(bs, 2); // requested_upstream_message_type - BitstreamSkip(bs, 1); // newpred_segment_type - } - if (BitstreamGetBit(bs)) // reduced_resolution_vop_enable + dec->newpred_enable = BitstreamGetBit(bs); + if (dec->newpred_enable) /* newpred_enable */ { - DPRINTF(DPRINTF_ERROR, "reduced_resolution_vop not supported"); - return -1; + DPRINTF(XVID_DEBUG_HEADER, "+ newpred_enable\n"); + BitstreamSkip(bs, 2); /* requested_upstream_message_type */ + BitstreamSkip(bs, 1); /* newpred_segment_type */ } + dec->reduced_resolution_enable = BitstreamGetBit(bs); /* reduced_resolution_vop_enable */ + DPRINTF(XVID_DEBUG_HEADER, "reduced_resolution_enable %i\n", dec->reduced_resolution_enable); + } + else + { + dec->newpred_enable = 0; + dec->reduced_resolution_enable = 0; } - if ((dec->scalability = BitstreamGetBit(bs))) // scalability + dec->scalability = BitstreamGetBit(bs); /* scalability */ + if (dec->scalability) { - DPRINTF(DPRINTF_ERROR, "scalability not supported"); + DPRINTF(XVID_DEBUG_ERROR, "scalability not supported\n"); + BitstreamSkip(bs, 1); /* hierarchy_type */ + BitstreamSkip(bs, 4); /* ref_layer_id */ + BitstreamSkip(bs, 1); /* ref_layer_sampling_direc */ + BitstreamSkip(bs, 5); /* hor_sampling_factor_n */ + BitstreamSkip(bs, 5); /* hor_sampling_factor_m */ + BitstreamSkip(bs, 5); /* vert_sampling_factor_n */ + BitstreamSkip(bs, 5); /* vert_sampling_factor_m */ + BitstreamSkip(bs, 1); /* enhancement_type */ + if(dec->shape == VIDOBJLAY_SHAPE_BINARY /* && hierarchy_type==0 */) { + BitstreamSkip(bs, 1); /* use_ref_shape */ + BitstreamSkip(bs, 1); /* use_ref_texture */ + BitstreamSkip(bs, 5); /* shape_hor_sampling_factor_n */ + BitstreamSkip(bs, 5); /* shape_hor_sampling_factor_m */ + BitstreamSkip(bs, 5); /* shape_vert_sampling_factor_n */ + BitstreamSkip(bs, 5); /* shape_vert_sampling_factor_m */ + } return -1; } - } else // dec->shape == BINARY_ONLY + } else /* dec->shape == BINARY_ONLY */ { if (vol_ver_id != 1) { - if (BitstreamGetBit(bs)) // scalability + dec->scalability = BitstreamGetBit(bs); /* scalability */ + if (dec->scalability) { - DPRINTF(DPRINTF_ERROR, "scalability not supported"); + DPRINTF(XVID_DEBUG_ERROR, "scalability not supported\n"); + BitstreamSkip(bs, 4); /* ref_layer_id */ + BitstreamSkip(bs, 5); /* hor_sampling_factor_n */ + BitstreamSkip(bs, 5); /* hor_sampling_factor_m */ + BitstreamSkip(bs, 5); /* vert_sampling_factor_n */ + BitstreamSkip(bs, 5); /* vert_sampling_factor_m */ return -1; } } - BitstreamSkip(bs, 1); // resync_marker_disable + BitstreamSkip(bs, 1); /* resync_marker_disable */ } + return (resize ? -3 : -2 ); /* VOL */ + } else if (start_code == GRPOFVOP_START_CODE) { - DPRINTF(DPRINTF_STARTCODE, ""); + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); BitstreamSkip(bs, 32); { @@ -512,162 +781,267 @@ minutes = BitstreamGetBits(bs, 6); READ_MARKER(); seconds = BitstreamGetBits(bs, 6); - - DPRINTF(DPRINTF_HEADER, "time %ih%im%is", hours); + + DPRINTF(XVID_DEBUG_HEADER, "time %ih%im%is\n", hours,minutes,seconds); } - BitstreamSkip(bs, 1); // closed_gov - BitstreamSkip(bs, 1); // broken_link + BitstreamSkip(bs, 1); /* closed_gov */ + BitstreamSkip(bs, 1); /* broken_link */ } else if (start_code == VOP_START_CODE) { - DPRINTF(DPRINTF_STARTCODE, ""); + DPRINTF(XVID_DEBUG_STARTCODE, "\n"); - BitstreamSkip(bs, 32); // vop_start_code + BitstreamSkip(bs, 32); /* vop_start_code */ - coding_type = BitstreamGetBits(bs, 2); // vop_coding_type - DPRINTF(DPRINTF_HEADER, "coding_type %i", coding_type); + coding_type = BitstreamGetBits(bs, 2); /* vop_coding_type */ + DPRINTF(XVID_DEBUG_HEADER, "coding_type %i\n", coding_type); -// *************************** for decode B-frame time *********************** - while (BitstreamGetBit(bs) != 0) // time_base + /*********************** for decode B-frame time ***********************/ + while (BitstreamGetBit(bs) != 0) /* time_base */ time_incr++; READ_MARKER(); if (dec->time_inc_bits) { - time_increment = (BitstreamGetBits(bs, dec->time_inc_bits)); // vop_time_increment + time_increment = (BitstreamGetBits(bs, dec->time_inc_bits)); /* vop_time_increment */ } - DPRINTF(DPRINTF_HEADER, "time_base %i", time_incr); - DPRINTF(DPRINTF_HEADER, "time_increment %i", time_increment); + DPRINTF(XVID_DEBUG_HEADER, "time_base %i\n", time_incr); + DPRINTF(XVID_DEBUG_HEADER, "time_increment %i\n", time_increment); - DPRINTF(DPRINTF_TIMECODE, "%c %i:%i", - coding_type == I_VOP ? 'I' : coding_type == P_VOP ? 'P' : 'B', + DPRINTF(XVID_DEBUG_TIMECODE, "%c %i:%i\n", + coding_type == I_VOP ? 'I' : coding_type == P_VOP ? 'P' : coding_type == B_VOP ? 'B' : 'S', time_incr, time_increment); if (coding_type != B_VOP) { dec->last_time_base = dec->time_base; dec->time_base += time_incr; - dec->time = time_increment; - -/* dec->time_base * time_increment_resolution + - time_increment; -*/ dec->time_pp = (uint32_t) - (time_increment_resolution + dec->time - dec->last_non_b_time)%time_increment_resolution; + 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; } else { - dec->time = time_increment; -/* - (dec->last_time_base + - time_incr) * time_increment_resolution + time_increment; -*/ - dec->time_bp = (uint32_t) - (time_increment_resolution + dec->last_non_b_time - dec->time)%time_increment_resolution; + 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); } + DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp); + DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp); READ_MARKER(); - if (!BitstreamGetBit(bs)) // vop_coded + if (!BitstreamGetBit(bs)) /* vop_coded */ { - DPRINTF(DPRINTF_HEADER, "vop_coded==false"); + DPRINTF(XVID_DEBUG_HEADER, "vop_coded==false\n"); return N_VOP; } - /* if (newpred_enable) - { - } - */ + if (dec->newpred_enable) + { + int vop_id; + int vop_id_for_prediction; - // fix a little bug by MinChen + vop_id = BitstreamGetBits(bs, MIN(dec->time_inc_bits + 3, 15)); + DPRINTF(XVID_DEBUG_HEADER, "vop_id %i\n", vop_id); + if (BitstreamGetBit(bs)) /* vop_id_for_prediction_indication */ + { + vop_id_for_prediction = BitstreamGetBits(bs, MIN(dec->time_inc_bits + 3, 15)); + DPRINTF(XVID_DEBUG_HEADER, "vop_id_for_prediction %i\n", vop_id_for_prediction); + } + READ_MARKER(); + } + + + + /* fix a little bug by MinChen */ if ((dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) && - (coding_type == P_VOP)) { - *rounding = BitstreamGetBit(bs); // rounding_type - DPRINTF(DPRINTF_HEADER, "rounding %i", *rounding); + ( (coding_type == P_VOP) || (coding_type == S_VOP && dec->sprite_enable == SPRITE_GMC) ) ) { + *rounding = BitstreamGetBit(bs); /* rounding_type */ + DPRINTF(XVID_DEBUG_HEADER, "rounding %i\n", *rounding); } - /* if (reduced_resolution_enable) - { - } - */ + if (dec->reduced_resolution_enable && + dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR && + (coding_type == P_VOP || coding_type == I_VOP)) { + + *reduced_resolution = BitstreamGetBit(bs); + DPRINTF(XVID_DEBUG_HEADER, "reduced_resolution %i\n", *reduced_resolution); + } + else + { + *reduced_resolution = 0; + } if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) { - uint32_t width, height; - uint32_t horiz_mc_ref, vert_mc_ref; + if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) { - width = BitstreamGetBits(bs, 13); - READ_MARKER(); - height = BitstreamGetBits(bs, 13); - READ_MARKER(); - horiz_mc_ref = BitstreamGetBits(bs, 13); - READ_MARKER(); - vert_mc_ref = BitstreamGetBits(bs, 13); - READ_MARKER(); + uint32_t width, height; + uint32_t horiz_mc_ref, vert_mc_ref; - DPRINTF(DPRINTF_HEADER, "width %i", width); - DPRINTF(DPRINTF_HEADER, "height %i", height); - DPRINTF(DPRINTF_HEADER, "horiz_mc_ref %i", horiz_mc_ref); - DPRINTF(DPRINTF_HEADER, "vert_mc_ref %i", vert_mc_ref); + width = BitstreamGetBits(bs, 13); + READ_MARKER(); + height = BitstreamGetBits(bs, 13); + READ_MARKER(); + horiz_mc_ref = BitstreamGetBits(bs, 13); + READ_MARKER(); + vert_mc_ref = BitstreamGetBits(bs, 13); + READ_MARKER(); + + DPRINTF(XVID_DEBUG_HEADER, "width %i\n", width); + DPRINTF(XVID_DEBUG_HEADER, "height %i\n", height); + DPRINTF(XVID_DEBUG_HEADER, "horiz_mc_ref %i\n", horiz_mc_ref); + DPRINTF(XVID_DEBUG_HEADER, "vert_mc_ref %i\n", vert_mc_ref); + } - BitstreamSkip(bs, 1); // change_conv_ratio_disable - if (BitstreamGetBit(bs)) // vop_constant_alpha + BitstreamSkip(bs, 1); /* change_conv_ratio_disable */ + if (BitstreamGetBit(bs)) /* vop_constant_alpha */ { - BitstreamSkip(bs, 8); // vop_constant_alpha_value + BitstreamSkip(bs, 8); /* vop_constant_alpha_value */ } } - if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY) { - // intra_dc_vlc_threshold + + if (!dec->complexity_estimation_disable) + { + read_vop_complexity_estimation_header(bs, dec, coding_type); + } + + /* intra_dc_vlc_threshold */ *intra_dc_threshold = intra_dc_threshold_table[BitstreamGetBits(bs, 3)]; + dec->top_field_first = 0; + dec->alternate_vertical_scan = 0; + if (dec->interlacing) { dec->top_field_first = BitstreamGetBit(bs); - DPRINTF(DPRINTF_HEADER, "interlace top_field_first %i", dec->top_field_first); + DPRINTF(XVID_DEBUG_HEADER, "interlace top_field_first %i\n", dec->top_field_first); dec->alternate_vertical_scan = BitstreamGetBit(bs); - DPRINTF(DPRINTF_HEADER, "interlace alternate_vertical_scan %i", dec->alternate_vertical_scan); - + DPRINTF(XVID_DEBUG_HEADER, "interlace alternate_vertical_scan %i\n", dec->alternate_vertical_scan); + } } - if ((*quant = BitstreamGetBits(bs, dec->quant_bits)) < 1) // vop_quant - *quant = 1; + if ((dec->sprite_enable == SPRITE_STATIC || dec->sprite_enable== SPRITE_GMC) && coding_type == S_VOP) { + + int i; + + for (i = 0 ; i < dec->sprite_warping_points; i++) + { + int length; + int x = 0, y = 0; + + /* sprite code borowed from ffmpeg; thx Michael Niedermayer */ + length = bs_get_spritetrajectory(bs); + if(length){ + x= BitstreamGetBits(bs, length); + if ((x >> (length - 1)) == 0) /* if MSB not set it is negative*/ + x = - (x ^ ((1 << length) - 1)); + } + READ_MARKER(); + + length = bs_get_spritetrajectory(bs); + if(length){ + y = BitstreamGetBits(bs, length); + if ((y >> (length - 1)) == 0) /* if MSB not set it is negative*/ + y = - (y ^ ((1 << length) - 1)); + } + READ_MARKER(); + + gmc_warp->duv[i].x = x; + gmc_warp->duv[i].y = y; + + DPRINTF(XVID_DEBUG_HEADER,"sprite_warping_point[%i] xy=(%i,%i)\n", i, x, y); + } + + if (dec->sprite_brightness_change) + { + /* XXX: brightness_change_factor() */ + } + if (dec->sprite_enable == SPRITE_STATIC) + { + /* XXX: todo */ + } - DPRINTF(DPRINTF_HEADER, "quant %i", *quant); + } + + if ((*quant = BitstreamGetBits(bs, dec->quant_bits)) < 1) /* vop_quant */ + *quant = 1; + DPRINTF(XVID_DEBUG_HEADER, "quant %i\n", *quant); if (coding_type != I_VOP) { - *fcode_forward = BitstreamGetBits(bs, 3); // fcode_forward - DPRINTF(DPRINTF_HEADER, "fcode_forward %i", *fcode_forward); + *fcode_forward = BitstreamGetBits(bs, 3); /* fcode_forward */ + DPRINTF(XVID_DEBUG_HEADER, "fcode_forward %i\n", *fcode_forward); } if (coding_type == B_VOP) { - *fcode_backward = BitstreamGetBits(bs, 3); // fcode_backward - DPRINTF(DPRINTF_HEADER, "fcode_backward %i", *fcode_backward); + *fcode_backward = BitstreamGetBits(bs, 3); /* fcode_backward */ + DPRINTF(XVID_DEBUG_HEADER, "fcode_backward %i\n", *fcode_backward); } if (!dec->scalability) { if ((dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) && (coding_type != I_VOP)) { - BitstreamSkip(bs, 1); // vop_shape_coding_type + BitstreamSkip(bs, 1); /* vop_shape_coding_type */ } } return coding_type; } else if (start_code == USERDATA_START_CODE) { + char tmp[256]; + int i, version, build; + char packed; + + BitstreamSkip(bs, 32); /* user_data_start_code */ + + memset(tmp, 0, 256); + tmp[0] = BitstreamShowBits(bs, 8); + + for(i = 1; i < 256; i++){ + tmp[i] = (BitstreamShowBits(bs, 16) & 0xFF); + + if(tmp[i] == 0) + break; + + BitstreamSkip(bs, 8); + } + + DPRINTF(XVID_DEBUG_STARTCODE, ": %s\n", tmp); + + /* read xvid bitstream version */ + if(strncmp(tmp, "XviD", 4) == 0) { + if (tmp[strlen(tmp)-1] == 'C') { + sscanf(tmp, "XviD%dC", &dec->bs_version); + dec->cartoon_mode = 1; + } + else + sscanf(tmp, "XviD%d", &dec->bs_version); + + DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i\n", dec->bs_version); + } - DPRINTF(DPRINTF_STARTCODE, ""); + /* divx detection */ + i = sscanf(tmp, "DivX%dBuild%d%c", &version, &build, &packed); + if (i < 2) + i = sscanf(tmp, "DivX%db%d%c", &version, &build, &packed); - BitstreamSkip(bs, 32); // user_data_start_code + if (i >= 2) + { + dec->packed_mode = (i == 3 && packed == 'p'); + DPRINTF(XVID_DEBUG_HEADER, "divx version=%i, build=%i packed=%i\n", + version, build, dec->packed_mode); + } - } else // start_code == ? + } else /* start_code == ? */ { if (BitstreamShowBits(bs, 24) == 0x000001) { - DPRINTF(DPRINTF_STARTCODE, "", BitstreamShowBits(bs, 32)); + DPRINTF(XVID_DEBUG_STARTCODE, "\n", BitstreamShowBits(bs, 32)); } BitstreamSkip(bs, 8); } } - while ((BitstreamPos(bs) >> 3) < bs->length); - //DPRINTF("*** WARNING: no vop_start_code found"); +#if 0 + DPRINTF("*** WARNING: no vop_start_code found"); +#endif return -1; /* ignore it */ } @@ -676,7 +1050,7 @@ static void bs_put_matrix(Bitstream * bs, - const int16_t * matrix) + const uint16_t * matrix) { int i, j; const int last = matrix[scan_tables[0][63]]; @@ -699,171 +1073,325 @@ void BitstreamWriteVolHeader(Bitstream * const bs, const MBParam * pParam, - const FRAMEINFO * frame) + const FRAMEINFO * const frame) { - // video object_start_code & vo_id + static const unsigned int vo_id = 0; + static const unsigned int vol_id = 0; + int vol_ver_id = 1; + int vol_type_ind = VIDOBJLAY_TYPE_SIMPLE; + 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)) + 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_QUARTERPEL) || + (pParam->vol_flags & XVID_VOL_GMC)) { + vol_type_ind = VIDOBJLAY_TYPE_ASP; + } + + /* visual_object_sequence_start_code */ +#if 0 + BitstreamPad(bs); +#endif + + /* + * no padding here, anymore. You have to make sure that you are + * byte aligned, and that always 1-8 padding bits have been written + */ + + if (!vol_profile) { + /* Profile was not set by client app, use the more permissive profile + * compatible with the vol_type_id */ + switch(vol_type_ind) { + case VIDOBJLAY_TYPE_ASP: + vol_profile = 0xf5; /* ASP level 5 */ + break; + case VIDOBJLAY_TYPE_ART_SIMPLE: + vol_profile = 0x94; /* ARTS level 4 */ + break; + default: + vol_profile = 0x03; /* Simple level 3 */ + break; + } + } + + /* Write the VOS header */ + BitstreamPutBits(bs, VISOBJSEQ_START_CODE, 32); + BitstreamPutBits(bs, vol_profile, 8); /* profile_and_level_indication */ + + + /* visual_object_start_code */ + BitstreamPad(bs); + BitstreamPutBits(bs, VISOBJ_START_CODE, 32); + BitstreamPutBits(bs, 0, 1); /* is_visual_object_identifier */ + + /* Video type */ + BitstreamPutBits(bs, VISOBJ_TYPE_VIDEO, 4); /* visual_object_type */ + BitstreamPutBit(bs, 0); /* video_signal_type */ + + /* video object_start_code & vo_id */ + BitstreamPadAlways(bs); /* next_start_code() */ + BitstreamPutBits(bs, VIDOBJ_START_CODE|(vo_id&0x5), 32); + + /* video_object_layer_start_code & vol_id */ BitstreamPad(bs); - BitstreamPutBits(bs, VO_START_CODE, 27); - BitstreamPutBits(bs, 0, 5); + BitstreamPutBits(bs, VIDOBJLAY_START_CODE|(vol_id&0x4), 32); - // video_object_layer_start_code & vol_id - BitstreamPutBits(bs, VOL_START_CODE, 28); - BitstreamPutBits(bs, 0, 4); - - BitstreamPutBit(bs, 0); // random_accessible_vol - BitstreamPutBits(bs, 0, 8); // video_object_type_indication - BitstreamPutBit(bs, 0); // is_object_layer_identified (0=not given) - BitstreamPutBits(bs, 1, 4); // aspect_ratio_info (1=1:1) + BitstreamPutBit(bs, 0); /* random_accessible_vol */ + BitstreamPutBits(bs, vol_type_ind, 8); /* video_object_type_indication */ + + if (vol_ver_id == 1) { + BitstreamPutBit(bs, 0); /* is_object_layer_identified (0=not given) */ + } else { + BitstreamPutBit(bs, 1); /* is_object_layer_identified */ + BitstreamPutBits(bs, vol_ver_id, 4); /* vol_ver_id == 2 */ + BitstreamPutBits(bs, 4, 3); /* vol_ver_priority (1==highest, 7==lowest) */ + } + + /* Aspect ratio */ + BitstreamPutBits(bs, pParam->par, 4); /* aspect_ratio_info (1=1:1) */ + if(pParam->par == XVID_PAR_EXT) { + BitstreamPutBits(bs, pParam->par_width, 8); + BitstreamPutBits(bs, pParam->par_height, 8); + } + + BitstreamPutBit(bs, 1); /* vol_control_parameters */ + BitstreamPutBits(bs, 1, 2); /* chroma_format 1="4:2:0" */ -#ifdef BFRAMES if (pParam->max_bframes > 0) { - //DPRINTF("low_delay=1"); - BitstreamPutBit(bs, 1); // vol_control_parameters - BitstreamPutBits(bs, 1, 2); // chroma_format 1="4:2:0" - BitstreamPutBit(bs, 0); // low_delay - BitstreamPutBit(bs, 0); // vbv_parameters (0=not given) + BitstreamPutBit(bs, 0); /* low_delay */ } else -#endif { - BitstreamPutBits(bs, 0, 1); // vol_control_parameters (0=not given) + BitstreamPutBit(bs, 1); /* low_delay */ } + BitstreamPutBit(bs, 0); /* vbv_parameters (0=not given) */ - - BitstreamPutBits(bs, 0, 2); // video_object_layer_shape (0=rectangular) + BitstreamPutBits(bs, 0, 2); /* video_object_layer_shape (0=rectangular) */ WRITE_MARKER(); - /* time_increment_resolution; ignored by current decore versions - eg. 2fps res=2 inc=1 - 25fps res=25 inc=1 - 29.97fps res=30000 inc=1001 + /* + * time_inc_resolution; ignored by current decore versions + * eg. 2fps res=2 inc=1 + * 25fps res=25 inc=1 + * 29.97fps res=30000 inc=1001 */ -#ifdef BFRAMES BitstreamPutBits(bs, pParam->fbase, 16); -#else - BitstreamPutBits(bs, 2, 16); -#endif WRITE_MARKER(); -#ifdef BFRAMES - BitstreamPutBit(bs, 1); // fixed_vop_rate = 1 - BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase)); // fixed_vop_time_increment -#else - BitstreamPutBit(bs, 0); // fixed_vop_rate = 0 -#endif + if (pParam->fincr>0) { + BitstreamPutBit(bs, 1); /* fixed_vop_rate = 1 */ + BitstreamPutBits(bs, pParam->fincr, MAX(log2bin(pParam->fbase-1),1)); /* fixed_vop_time_increment */ + }else{ + BitstreamPutBit(bs, 0); /* fixed_vop_rate = 0 */ + } WRITE_MARKER(); - BitstreamPutBits(bs, pParam->width, 13); // width + BitstreamPutBits(bs, pParam->width, 13); /* width */ WRITE_MARKER(); - BitstreamPutBits(bs, pParam->height, 13); // height + BitstreamPutBits(bs, pParam->height, 13); /* height */ WRITE_MARKER(); - BitstreamPutBit(bs, frame->global_flags & XVID_INTERLACING); // interlace - BitstreamPutBit(bs, 1); // obmc_disable (overlapped block motion compensation) - BitstreamPutBit(bs, 0); // sprite_enable - BitstreamPutBit(bs, 0); // not_in_bit + BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_INTERLACING); /* interlace */ + BitstreamPutBit(bs, 1); /* obmc_disable (overlapped block motion compensation) */ - // quant_type 0=h.263 1=mpeg4(quantizer tables) - BitstreamPutBit(bs, pParam->m_quant_type); + if (vol_ver_id != 1) + { if ((pParam->vol_flags & XVID_VOL_GMC)) + { BitstreamPutBits(bs, 2, 2); /* sprite_enable=='GMC' */ + BitstreamPutBits(bs, 3, 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 */ + BitstreamPutBit(bs, 0); /* sprite_brightness_change (not supported) */ + + /* + * currently we use no_of_sprite_warping_points==2, sprite_warping_accuracy==3 + * for DivX5 compatability + */ - if (pParam->m_quant_type) { - BitstreamPutBit(bs, get_intra_matrix_status()); // load_intra_quant_mat - if (get_intra_matrix_status()) { - bs_put_matrix(bs, get_intra_matrix()); - } + } else + BitstreamPutBits(bs, 0, 2); /* sprite_enable==off */ + } + else + BitstreamPutBit(bs, 0); /* sprite_enable==off */ - BitstreamPutBit(bs, get_inter_matrix_status()); // load_inter_quant_mat - if (get_inter_matrix_status()) { - bs_put_matrix(bs, get_inter_matrix()); - } + BitstreamPutBit(bs, 0); /* not_8_bit */ + + /* quant_type 0=h.263 1=mpeg4(quantizer tables) */ + BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_MPEGQUANT); + + if ((pParam->vol_flags & XVID_VOL_MPEGQUANT)) { + BitstreamPutBit(bs, is_custom_intra_matrix(pParam->mpeg_quant_matrices)); /* load_intra_quant_mat */ + if(is_custom_intra_matrix(pParam->mpeg_quant_matrices)) + bs_put_matrix(bs, get_intra_matrix(pParam->mpeg_quant_matrices)); + + BitstreamPutBit(bs, is_custom_inter_matrix(pParam->mpeg_quant_matrices)); /* load_inter_quant_mat */ + if(is_custom_inter_matrix(pParam->mpeg_quant_matrices)) + bs_put_matrix(bs, get_inter_matrix(pParam->mpeg_quant_matrices)); + } + + if (vol_ver_id != 1) { + if ((pParam->vol_flags & XVID_VOL_QUARTERPEL)) + BitstreamPutBit(bs, 1); /* quarterpel */ + else + BitstreamPutBit(bs, 0); /* no quarterpel */ + } + + BitstreamPutBit(bs, 1); /* complexity_estimation_disable */ + BitstreamPutBit(bs, 1); /* resync_marker_disable */ + 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); /* scalability */ + + BitstreamPadAlways(bs); /* next_start_code(); */ + /* fake divx5 id, to ensure compatibility with divx5 decoder */ +#define DIVX5_ID "DivX999b000p" + if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) { + BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID)); } - BitstreamPutBit(bs, 1); // complexity_estimation_disable - BitstreamPutBit(bs, 1); // resync_marker_disable - BitstreamPutBit(bs, 0); // data_partitioned - BitstreamPutBit(bs, 0); // scalability + /* xvid id */ + { + const char xvid_user_format[] = "XviD%04d%c"; + char xvid_user_data[100]; + sprintf(xvid_user_data, + xvid_user_format, + XVID_BS_VERSION, + (frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0'); + BitstreamWriteUserData(bs, xvid_user_data, strlen(xvid_user_data)); + } } /* write vop header - - NOTE: doesnt handle bother with time_base & time_inc - time_base = n seconds since last resync (eg. last iframe) - time_inc = nth of a second since last resync - (decoder uses these values to determine precise time since last resync) */ void -BitstreamWriteVopHeader(Bitstream * const bs, +BitstreamWriteVopHeader( + Bitstream * const bs, const MBParam * pParam, - const FRAMEINFO * frame, - int vop_coded) + const FRAMEINFO * const frame, + int vop_coded, + unsigned int quant) { -#ifdef BFRAMES uint32_t i; -#endif + +#if 0 BitstreamPad(bs); +#endif + + /* + * 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, VOP_START_CODE, 32); BitstreamPutBits(bs, frame->coding_type, 2); +#if 0 + DPRINTF(XVID_DEBUG_HEADER, "coding_type = %i\n", frame->coding_type); +#endif - // time_base = 0 write n x PutBit(1), PutBit(0) -#ifdef BFRAMES for (i = 0; i < frame->seconds; i++) { BitstreamPutBit(bs, 1); } BitstreamPutBit(bs, 0); -#else - BitstreamPutBits(bs, 0, 1); -#endif WRITE_MARKER(); - // time_increment: value=nth_of_sec, nbits = log2(resolution) -#ifdef BFRAMES - BitstreamPutBits(bs, frame->ticks, log2bin(pParam->fbase)); - /*DPRINTF("[%i:%i] %c\n", frame->seconds, frame->ticks, - frame->coding_type == I_VOP ? 'I' : frame->coding_type == - P_VOP ? 'P' : 'B');*/ -#else - BitstreamPutBits(bs, 1, 1); + /* time_increment: value=nth_of_sec, nbits = log2(resolution) */ + BitstreamPutBits(bs, frame->ticks, MAX(log2bin(pParam->fbase-1), 1)); +#if 0 + DPRINTF("[%i:%i] %c", + frame->seconds, frame->ticks, + frame->coding_type == I_VOP ? 'I' : + frame->coding_type == P_VOP ? 'P' : + frame->coding_type == S_VOP ? 'S' : 'B'); #endif WRITE_MARKER(); if (!vop_coded) { BitstreamPutBits(bs, 0, 1); +#if 0 + BitstreamPadAlways(bs); /* next_start_code() */ +#endif + /* NB: It's up to the function caller to write the next_start_code(). + * At the moment encoder.c respects that requisite because a VOP + * always ends with a next_start_code either if it's coded or not + * and encoder.c terminates a frame with a next_start_code in whatever + * case */ return; } - BitstreamPutBits(bs, 1, 1); // vop_coded + BitstreamPutBits(bs, 1, 1); /* vop_coded */ - if (frame->coding_type == P_VOP) + if ( (frame->coding_type == P_VOP) || (frame->coding_type == S_VOP) ) BitstreamPutBits(bs, frame->rounding_type, 1); - BitstreamPutBits(bs, 0, 3); // intra_dc_vlc_threshold + if ((frame->vol_flags & XVID_VOL_REDUCED_ENABLE)) + BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_REDUCED)?1:0); - if (frame->global_flags & XVID_INTERLACING) { - BitstreamPutBit(bs, 1); // top field first - BitstreamPutBit(bs, 0); // alternate vertical scan + BitstreamPutBits(bs, 0, 3); /* intra_dc_vlc_threshold */ + + if ((frame->vol_flags & XVID_VOL_INTERLACING)) { + BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_TOPFIELDFIRST)); + BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_ALTERNATESCAN)); } - BitstreamPutBits(bs, frame->quant, 5); // quantizer + if (frame->coding_type == S_VOP) { + if (1) { /* no_of_sprite_warping_points>=1 (we use 2!) */ + int k; + for (k=0;k<3;k++) + { + bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k] */ + WRITE_MARKER(); + + bs_put_spritetrajectory(bs, frame->warp.duv[k].y ); /* dv[k] */ + WRITE_MARKER(); + + if ((frame->vol_flags & XVID_VOL_QUARTERPEL)) + { + DPRINTF(XVID_DEBUG_HEADER,"sprite_warping_point[%i] xy=(%i,%i) *QPEL*\n", k, frame->warp.duv[k].x/2, frame->warp.duv[k].y/2); + } + else + { + DPRINTF(XVID_DEBUG_HEADER,"sprite_warping_point[%i] xy=(%i,%i)\n", k, frame->warp.duv[k].x, frame->warp.duv[k].y); + } + } + } + } + + +#if 0 + DPRINTF(XVID_DEBUG_HEADER, "quant = %i\n", quant); +#endif + + BitstreamPutBits(bs, quant, 5); /* quantizer */ if (frame->coding_type != I_VOP) - BitstreamPutBits(bs, frame->fcode, 3); // forward_fixed_code + BitstreamPutBits(bs, frame->fcode, 3); /* forward_fixed_code */ if (frame->coding_type == B_VOP) - BitstreamPutBits(bs, frame->bcode, 3); // backward_fixed_code + BitstreamPutBits(bs, frame->bcode, 3); /* backward_fixed_code */ } - -void -BitstreamWriteUserData(Bitstream * const bs, - uint8_t * data, +void +BitstreamWriteUserData(Bitstream * const bs, + uint8_t * data, const int length) { int i;