videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

bitstream: make vlc init of static tables thread safe. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-06 21:45:26 +01:00
parent bbd44f6ca4
commit 4b6869d6e0
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/bitstream.c
View File

@ -270,11 +270,24 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
vlc->bits = nb_bits;
if(flags & INIT_VLC_USE_NEW_STATIC){
if(vlc->table_size && vlc->table_size == vlc->table_allocated){
VLC dyn_vlc = *vlc;
if (vlc->table_size)
return 0;
}else if(vlc->table_size){
abort(); // fatal error, we are called on a partially initialized table
}
ret = ff_init_vlc_sparse(&dyn_vlc, nb_bits, nb_codes,
bits, bits_wrap, bits_size,
codes, codes_wrap, codes_size,
symbols, symbols_wrap, symbols_size,
flags & ~INIT_VLC_USE_NEW_STATIC);
av_assert0(ret >= 0);
av_assert0(dyn_vlc.table_size <= vlc->table_allocated);
if(dyn_vlc.table_size < vlc->table_allocated)
av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", dyn_vlc.table_size, vlc->table_allocated);
memcpy(vlc->table, dyn_vlc.table, dyn_vlc.table_size * sizeof(*vlc->table));
vlc->table_size = dyn_vlc.table_size;
ff_free_vlc(&dyn_vlc);
return 0;
}else {
vlc->table = NULL;
vlc->table_allocated = 0;
@ -316,8 +329,6 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
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;
}