/*
* copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file libavcodec/put_bits.h
+ * @file
* bitstream writer API
*/
} PutBitContext;
/**
- * Initializes the PutBitContext s.
+ * Initialize the PutBitContext s.
*
* @param buffer the buffer where to put bits
* @param buffer_size the size in bytes of buffer
}
/**
- * Returns the total number of bits written to the bitstream.
+ * @return the total number of bits written to the bitstream.
*/
static inline int put_bits_count(PutBitContext *s)
{
}
/**
- * Pads the end of the output stream with zeros.
+ * Pad the end of the output stream with zeros.
*/
static inline void flush_put_bits(PutBitContext *s)
{
#endif
}
+#if defined(ALT_BITSTREAM_WRITER) || defined(BITSTREAM_WRITER_LE)
+#define align_put_bits align_put_bits_unsupported_here
+#define ff_put_string ff_put_string_unsupported_here
+#define ff_copy_bits ff_copy_bits_unsupported_here
+#else
/**
- * Pads the bitstream with zeros up to the next byte boundary.
+ * Pad the bitstream with zeros up to the next byte boundary.
*/
void align_put_bits(PutBitContext *s);
/**
- * Puts the string s in the bitstream.
+ * Put the string string in the bitstream.
*
* @param terminate_string 0-terminates the written string if value is 1
*/
-void ff_put_string(PutBitContext * pbc, const char *s, int terminate_string);
+void ff_put_string(PutBitContext *pb, const char *string, int terminate_string);
/**
- * Copies the content of src to the bitstream.
+ * Copy the content of src to the bitstream.
*
* @param length the number of bits of src to copy
*/
void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length);
+#endif
/**
- * Writes up to 31 bits into a bitstream.
+ * Write up to 31 bits into a bitstream.
* Use put_bits32 to write 32 bits.
*/
static inline void put_bits(PutBitContext *s, int n, unsigned int value)
AV_WL32(s->buf_ptr, bit_buf);
} else
#endif
- *(uint32_t *)s->buf_ptr = le2me_32(bit_buf);
+ *(uint32_t *)s->buf_ptr = av_le2ne32(bit_buf);
s->buf_ptr+=4;
bit_buf = (bit_left==32)?0:value >> bit_left;
bit_left+=32;
AV_WB32(s->buf_ptr, bit_buf);
} else
#endif
- *(uint32_t *)s->buf_ptr = be2me_32(bit_buf);
+ *(uint32_t *)s->buf_ptr = av_be2ne32(bit_buf);
//printf("bitbuf = %08x\n", bit_buf);
s->buf_ptr+=4;
bit_left+=32 - n;
value<<= 32-n;
- ptr[0] |= be2me_32(value>>(index&31));
- ptr[1] = be2me_32(value<<(32-(index&31)));
+ ptr[0] |= av_be2ne32(value>>(index&31));
+ ptr[1] = av_be2ne32(value<<(32-(index&31)));
//if(n>24) printf("%d %d\n", n, value);
index+= n;
s->index= index;
int index= s->index;
uint32_t *ptr= (uint32_t*)(((uint8_t *)s->buf)+(index>>3));
- ptr[0] |= be2me_32(value<<(32-n-(index&7) ));
+ ptr[0] |= av_be2ne32(value<<(32-n-(index&7) ));
ptr[1] = 0;
//if(n>24) printf("%d %d\n", n, value);
index+= n;
}
#endif
-static inline void put_sbits(PutBitContext *pb, int bits, int32_t val)
+static inline void put_sbits(PutBitContext *pb, int n, int32_t value)
{
- assert(bits >= 0 && bits <= 31);
+ assert(n >= 0 && n <= 31);
- put_bits(pb, bits, val & ((1<<bits)-1));
+ put_bits(pb, n, value & ((1<<n)-1));
}
/**
- * Write exactly 32 bits into a bitstream
+ * Write exactly 32 bits into a bitstream.
*/
static void av_unused put_bits32(PutBitContext *s, uint32_t value)
{
int lo = value & 0xffff;
int hi = value >> 16;
-#ifdef ALT_BITSTREAM_WRITER_LE
+#ifdef BITSTREAM_WRITER_LE
put_bits(s, 16, lo);
put_bits(s, 16, hi);
#else
}
/**
- * Returns the pointer to the byte where the bitstream writer will put
+ * Return the pointer to the byte where the bitstream writer will put
* the next bit.
*/
static inline uint8_t* put_bits_ptr(PutBitContext *s)
}
/**
- * Skips the given number of bytes.
+ * Skip the given number of bytes.
* PutBitContext must be flushed & aligned to a byte boundary before calling this.
*/
static inline void skip_put_bytes(PutBitContext *s, int n)
}
/**
- * Skips the given number of bits.
+ * Skip the given number of bits.
* Must only be used if the actual values in the bitstream do not matter.
* If n is 0 the behavior is undefined.
*/
}
/**
- * Changes the end of the buffer.
+ * Change the end of the buffer.
*
* @param size the new size in bytes of the buffer where to put bits
*/
projects / ffmpeg / blobdiff