virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

huffyuv: return meaningful error codes

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-12-06 16:56:40 +00:00
parent 4a722a5cab
commit 4d1912ff4d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/huffyuv.c
View File

@ -472,7 +472,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
if ( read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4, if ( read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
avctx->extradata_size - 4) < 0) avctx->extradata_size - 4) < 0)
return -1; return AVERROR_INVALIDDATA;
}else{ }else{
switch (avctx->bits_per_coded_sample & 7) { switch (avctx->bits_per_coded_sample & 7) {
case 1: case 1:
@ -500,7 +500,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->context = 0; s->context = 0;
if (read_old_huffman_tables(s) < 0) if (read_old_huffman_tables(s) < 0)
return -1; return AVERROR_INVALIDDATA;
} }
switch (s->bitstream_bpp) { switch (s->bitstream_bpp) {
@ -559,10 +559,10 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
if (s->version == 2) { if (s->version == 2) {
if (read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4, if (read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
avctx->extradata_size) < 0) avctx->extradata_size) < 0)
return -1; return AVERROR_INVALIDDATA;
} else { } else {
if (read_old_huffman_tables(s) < 0) if (read_old_huffman_tables(s) < 0)
return -1; return AVERROR_INVALIDDATA;
} }
return 0; return 0;
@ -628,7 +628,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "format not supported\n"); av_log(avctx, AV_LOG_ERROR, "format not supported\n");
return -1; return AVERROR(EINVAL);
} }
avctx->bits_per_coded_sample = s->bitstream_bpp; avctx->bits_per_coded_sample = s->bitstream_bpp;
s->decorrelate = s->bitstream_bpp >= 24; s->decorrelate = s->bitstream_bpp >= 24;
@ -640,7 +640,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"context=1 is not compatible with " "context=1 is not compatible with "
"2 pass huffyuv encoding\n"); "2 pass huffyuv encoding\n");
return -1; return AVERROR(EINVAL);
} }
}else s->context= 0; }else s->context= 0;
@ -649,13 +649,13 @@ static av_cold int encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Error: YV12 is not supported by huffyuv; use " "Error: YV12 is not supported by huffyuv; use "
"vcodec=ffvhuff or format=422p\n"); "vcodec=ffvhuff or format=422p\n");
return -1; return AVERROR(EINVAL);
} }
if (avctx->context_model) { if (avctx->context_model) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Error: per-frame huffman tables are not supported " "Error: per-frame huffman tables are not supported "
"by huffyuv; use vcodec=ffvhuff\n"); "by huffyuv; use vcodec=ffvhuff\n");
return -1; return AVERROR(EINVAL);
} }
if (s->interlaced != ( s->height > 288 )) if (s->interlaced != ( s->height > 288 ))
av_log(avctx, AV_LOG_INFO, av_log(avctx, AV_LOG_INFO,
@ -665,7 +665,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN) { if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Error: RGB is incompatible with median predictor\n"); "Error: RGB is incompatible with median predictor\n");
return -1; return AVERROR(EINVAL);
} }
((uint8_t*)avctx->extradata)[0] = s->predictor | (s->decorrelate << 6); ((uint8_t*)avctx->extradata)[0] = s->predictor | (s->decorrelate << 6);
@ -1017,7 +1017,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
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;
@ -1034,19 +1034,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
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 AVERROR_INVALIDDATA;
} }
if ((unsigned)(buf_size-table_size) >= INT_MAX / 8) if ((unsigned)(buf_size-table_size) >= INT_MAX / 8)
return -1; return AVERROR_INVALIDDATA;
init_get_bits(&s->gb, s->bitstream_buffer+table_size, init_get_bits(&s->gb, s->bitstream_buffer+table_size,
(buf_size-table_size) * 8); (buf_size-table_size) * 8);
@ -1070,7 +1070,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"YUY2 output is not implemented yet\n"); "YUY2 output is not implemented yet\n");
return -1; return AVERROR_PATCHWELCOME;
} else { } else {
leftv = p->data[2][0] = get_bits(&s->gb, 8); leftv = p->data[2][0] = get_bits(&s->gb, 8);
@ -1252,7 +1252,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
}else{ }else{
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"BGR24 output is not implemented yet\n"); "BGR24 output is not implemented yet\n");
return -1; return AVERROR_PATCHWELCOME;
} }
} }
emms_c(); emms_c();