generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936' into release/0.10

Browse Source 
* commit '4a6622550a4a4bf4690ea7d9fe42210a30a67936':
  huffyuv: Check and propagate function return values

Conflicts:
	libavcodec/huffyuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-09 19:58:37 +02:00
parent 2ec8e46550 4a6622550a
commit 7d42ede8fe
1 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
libavcodec/huffyuv.c
View File

@@ -302,10 +302,12 @@ static void generate_len_table(uint8_t *dst, const uint64_t *stats){
} }
#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ #endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */
static void generate_joint_tables(HYuvContext *s){ static int generate_joint_tables(HYuvContext *s){
uint16_t symbols[1<<VLC_BITS]; uint16_t symbols[1<<VLC_BITS];
uint16_t bits[1<<VLC_BITS]; uint16_t bits[1<<VLC_BITS];
uint8_t len[1<<VLC_BITS]; uint8_t len[1<<VLC_BITS];
int ret;
if(s->bitstream_bpp < 24){ if(s->bitstream_bpp < 24){
int p, i, y, u; int p, i, y, u;
for(p=0; p<3; p++){ for(p=0; p<3; p++){
@@ -327,7 +329,9 @@ static void generate_joint_tables(HYuvContext *s){
} }
} }
ff_free_vlc(&s->vlc[3+p]); ff_free_vlc(&s->vlc[3+p]);
ff_init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0); if ((ret = ff_init_vlc_sparse(&s->vlc[3 + p], VLC_BITS, i, len, 1, 1,
bits, 2, 2, symbols, 2, 2, 0)) < 0)
return ret;
} }
}else{ }else{
uint8_t (*map)[4] = (uint8_t(*)[4])s->pix_bgr_map; uint8_t (*map)[4] = (uint8_t(*)[4])s->pix_bgr_map;
@@ -369,29 +373,33 @@ static void generate_joint_tables(HYuvContext *s){
} }
} }
ff_free_vlc(&s->vlc[3]); ff_free_vlc(&s->vlc[3]);
init_vlc(&s->vlc[3], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0); if ((ret = init_vlc(&s->vlc[3], VLC_BITS, i, len, 1, 1,
bits, 2, 2, 0)) < 0)
return ret;
} }
return 0;
} }
static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length){ static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length){
GetBitContext gb; GetBitContext gb;
int i; int i, ret;
int ret;
init_get_bits(&gb, src, length*8); if ((ret = init_get_bits(&gb, src, length * 8)) < 0)
return ret;
for(i=0; i<3; i++){ for(i=0; i<3; i++){
if(read_len_table(s->len[i], &gb)<0) if ((ret = read_len_table(s->len[i], &gb)) < 0)
return -1; return ret;
if(generate_bits_table(s->bits[i], s->len[i])<0){ if ((ret = generate_bits_table(s->bits[i], s->len[i])) < 0)
return -1; return ret;
}
ff_free_vlc(&s->vlc[i]); ff_free_vlc(&s->vlc[i]);
if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0)) < 0) if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1,
s->bits[i], 4, 4, 0)) < 0)
return ret; return ret;
} }
generate_joint_tables(s); if ((ret = generate_joint_tables(s)) < 0)
return ret;
return (get_bits_count(&gb)+7)/8; return (get_bits_count(&gb)+7)/8;
} }
@@ -399,15 +407,18 @@ static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length){
static int read_old_huffman_tables(HYuvContext *s){ static int read_old_huffman_tables(HYuvContext *s){
#if 1 #if 1
GetBitContext gb; GetBitContext gb;
int i; int i, ret;
int ret;
init_get_bits(&gb, classic_shift_luma, classic_shift_luma_table_size*8); if ((ret = init_get_bits(&gb, classic_shift_luma,
if(read_len_table(s->len[0], &gb)<0) classic_shift_luma_table_size * 8)) < 0)
return -1; return ret;
init_get_bits(&gb, classic_shift_chroma, classic_shift_chroma_table_size*8); if ((ret = read_len_table(s->len[0], &gb)) < 0)
if(read_len_table(s->len[1], &gb)<0) return ret;
return -1; if ((ret = init_get_bits(&gb, classic_shift_chroma,
classic_shift_chroma_table_size * 8)) < 0)
return ret;
if ((ret = read_len_table(s->len[1], &gb)) < 0)
return ret;
for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i]; for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i];
for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i]; for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i];
@@ -421,11 +432,13 @@ static int read_old_huffman_tables(HYuvContext *s){
for(i=0; i<3; i++){ for(i=0; i<3; i++){
ff_free_vlc(&s->vlc[i]); ff_free_vlc(&s->vlc[i]);
if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0)) < 0) if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1,
s->bits[i], 4, 4, 0)) < 0)
return ret; return ret;
} }
generate_joint_tables(s); if ((ret = generate_joint_tables(s)) < 0)
return ret;
return 0; return 0;
#else #else
@@ -465,6 +478,7 @@ static av_cold int common_init(AVCodecContext *avctx){
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
HYuvContext *s = avctx->priv_data; HYuvContext *s = avctx->priv_data;
int ret;
common_init(avctx); common_init(avctx);
memset(s->vlc, 0, 3*sizeof(VLC)); memset(s->vlc, 0, 3*sizeof(VLC));
@@ -500,8 +514,9 @@ s->bgr32=1;
s->interlaced= (interlace==1) ? 1 : (interlace==2) ? 0 : s->interlaced; s->interlaced= (interlace==1) ? 1 : (interlace==2) ? 0 : s->interlaced;
s->context= ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0; s->context= ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0;
if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size-4) < 0) if ((ret = read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
return -1; avctx->extradata_size - 4)) < 0)
return ret;
}else{ }else{
switch(avctx->bits_per_coded_sample&7){ switch(avctx->bits_per_coded_sample&7){
case 1: case 1:
@@ -528,8 +543,8 @@ s->bgr32=1;
s->bitstream_bpp= avctx->bits_per_coded_sample & ~7; s->bitstream_bpp= avctx->bits_per_coded_sample & ~7;
s->context= 0; s->context= 0;
if(read_old_huffman_tables(s) < 0) if ((ret = read_old_huffman_tables(s)) < 0)
return -1; return ret;
} }
switch(s->bitstream_bpp){ switch(s->bitstream_bpp){
@@ -565,7 +580,7 @@ s->bgr32=1;
static av_cold int decode_init_thread_copy(AVCodecContext *avctx) static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
{ {
HYuvContext *s = avctx->priv_data; HYuvContext *s = avctx->priv_data;
int i; int i, ret;
avctx->coded_frame= &s->picture; avctx->coded_frame= &s->picture;
alloc_temp(s); alloc_temp(s);
@@ -574,11 +589,12 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
s->vlc[i].table = NULL; s->vlc[i].table = NULL;
if(s->version==2){ if(s->version==2){
if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0) if ((ret = read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
return -1; avctx->extradata_size)) < 0)
return ret;
}else{ }else{
if(read_old_huffman_tables(s) < 0) if ((ret = read_old_huffman_tables(s)) < 0)
return -1; return ret;
} }
return 0; return 0;
@@ -1001,7 +1017,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
const int height= s->height; const int height= s->height;
int fake_ystride, fake_ustride, fake_vstride; int fake_ystride, fake_ustride, fake_vstride;
AVFrame * const p= &s->picture; AVFrame * const p= &s->picture;
int table_size= 0; int table_size = 0, ret;
AVFrame *picture = data; AVFrame *picture = data;
@@ -1016,21 +1032,23 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
ff_thread_release_buffer(avctx, p); ff_thread_release_buffer(avctx, p);
p->reference= 0; p->reference= 0;
if(ff_thread_get_buffer(avctx, p) < 0){ if ((ret = ff_thread_get_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
if(s->context){ if(s->context){
table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size); table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size);
if(table_size < 0) if(table_size < 0)
return -1; return table_size;
} }
if((unsigned)(buf_size-table_size) >= INT_MAX/8) if((unsigned)(buf_size-table_size) >= INT_MAX/8)
return -1; return -1;
init_get_bits(&s->gb, s->bitstream_buffer+table_size, (buf_size-table_size)*8); if ((ret = init_get_bits(&s->gb, s->bitstream_buffer + table_size,
(buf_size - table_size) * 8)) < 0)
return ret;
fake_ystride= s->interlaced ? p->linesize[0]*2 : p->linesize[0]; fake_ystride= s->interlaced ? p->linesize[0]*2 : p->linesize[0];
fake_ustride= s->interlaced ? p->linesize[1]*2 : p->linesize[1]; fake_ustride= s->interlaced ? p->linesize[1]*2 : p->linesize[1];