#include "avcodec.h"
#include "bitstream.h"
+const uint8_t ff_log2_run[32]={
+ 0, 0, 0, 0, 1, 1, 1, 1,
+ 2, 2, 2, 2, 3, 3, 3, 3,
+ 4, 4, 5, 5, 6, 6, 7, 7,
+ 8, 9,10,11,12,13,14,15
+};
+
/**
* Same as av_mallocz_static(), but does a realloc.
*
* @param[in] ptr The block of memory to reallocate.
* @param[in] size The requested size.
* @return Block of memory of requested size.
- * @deprecated. Code which uses ff_realloc_static is broken/missdesigned
+ * @deprecated. Code which uses ff_realloc_static is broken/misdesigned
* and should correctly use static arrays
*/
-attribute_deprecated void *ff_realloc_static(void *ptr, unsigned int size);
+attribute_deprecated av_alloc_size(2)
+static void *ff_realloc_static(void *ptr, unsigned int size);
+
+static void *ff_realloc_static(void *ptr, unsigned int size)
+{
+ return av_realloc(ptr, size);
+}
void align_put_bits(PutBitContext *s)
{
#endif
}
-void ff_put_string(PutBitContext * pbc, char *s, int put_zero)
+void ff_put_string(PutBitContext * pbc, const char *s, int put_zero)
{
while(*s){
put_bits(pbc, 8, *s);
put_bits(pbc, 8, 0);
}
-void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length)
+void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
{
- const uint16_t *srcw= (uint16_t*)src;
+ const uint16_t *srcw= (const uint16_t*)src;
int words= length>>4;
int bits= length&15;
int i;
if(length==0) return;
- if(words < 16){
- for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
- }else if(put_bits_count(pb)&7){
+ if(ENABLE_SMALL || words < 16 || put_bits_count(pb)&7){
for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
}else{
for(i=0; put_bits_count(pb)&31; i++)
index = vlc->table_size;
vlc->table_size += size;
if (vlc->table_size > vlc->table_allocated) {
+ if(use_static>1)
+ abort(); //cant do anything, init_vlc() is used with too little memory
vlc->table_allocated += (1 << vlc->bits);
if(use_static)
vlc->table = ff_realloc_static(vlc->table,
VLC_TYPE (*table)[2];
table_size = 1 << table_nb_bits;
- table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_STATIC);
+ table_index = alloc_table(vlc, table_size, flags & (INIT_VLC_USE_STATIC|INIT_VLC_USE_NEW_STATIC));
#ifdef DEBUG_VLC
av_log(NULL,AV_LOG_DEBUG,"new table index=%d size=%d code_prefix=%x n=%d\n",
table_index, table_size, code_prefix, n_prefix);
int flags)
{
vlc->bits = nb_bits;
- if(!(flags & INIT_VLC_USE_STATIC)) {
+ if(flags & INIT_VLC_USE_NEW_STATIC){
+ if(vlc->table_size && vlc->table_size == vlc->table_allocated){
+ return 0;
+ }else if(vlc->table_size){
+ abort(); // fatal error, we are called on a partially initialized table
+ }
+ }else if(!(flags & INIT_VLC_USE_STATIC)) {
vlc->table = NULL;
vlc->table_allocated = 0;
vlc->table_size = 0;
av_freep(&vlc->table);
return -1;
}
+ if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated)
+ av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated);
return 0;
}