--- bitstream.h 2003/05/12 12:31:05 1.17.2.4 +++ bitstream.h 2003/11/19 15:42:38 1.17.2.7 @@ -3,25 +3,23 @@ * XVID MPEG-4 VIDEO CODEC * - Bitstream reader/writer inlined functions and constants- * - * Copyright (C) 2001-2003 - Peter Ross + * Copyright (C) 2001-2003 Peter Ross * - * This file is part of XviD, a free MPEG-4 video encoder/decoder - * - * 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 + * 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 + * 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 + * 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.h,v 1.17.2.4 2003/05/12 12:31:05 suxen_drol Exp $ + * $Id: bitstream.h,v 1.17.2.7 2003/11/19 15:42:38 syskin Exp $ * ****************************************************************************/ @@ -118,10 +116,10 @@ * Prototypes ****************************************************************************/ -int read_video_packet_header(Bitstream *bs, - DECODER * dec, - const int addbits, - int *quant, +int read_video_packet_header(Bitstream *bs, + DECODER * dec, + const int addbits, + int *quant, int *fcode_forward, int *fcode_backward, int *intra_dc_threshold); @@ -144,10 +142,11 @@ void BitstreamWriteVopHeader(Bitstream * const bs, const MBParam * pParam, const FRAMEINFO * const frame, - int vop_coded); + int vop_coded, + int quant); -void BitstreamWriteUserData(Bitstream * const bs, - uint8_t * data, +void BitstreamWriteUserData(Bitstream * const bs, + uint8_t * data, const int length); /* initialise bitstream structure */ @@ -255,7 +254,7 @@ /* number of bits to next byte alignment */ -static __inline uint32_t +static __inline uint32_t BitstreamNumBitsToByteAlign(Bitstream *bs) { uint32_t n = (32 - bs->pos) % 8; @@ -442,7 +441,7 @@ /* - * pad bitstream to the next byte boundary + * pad bitstream to the next byte boundary * alway pad: even if currently at the byte boundary */