virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cfhd: reallocate internal buffers on format change.

Browse Source 
Fixes some, but not all, of the threading fuzz crashes
This commit is contained in:
Kieran Kunhya 2016-02-15 21:39:27 +00:00
parent d39b770aa2
commit 0096453f70
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/cfhd.c
View File

@ -156,6 +156,7 @@ static int alloc_buffers(AVCodecContext *avctx)
if ((ret = ff_set_dimensions(avctx, s->coded_width, s->coded_height)) < 0) if ((ret = ff_set_dimensions(avctx, s->coded_width, s->coded_height)) < 0)
return ret; return ret;
avctx->pix_fmt = s->coded_format;
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift); avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift);
@ -213,6 +214,7 @@ static int alloc_buffers(AVCodecContext *avctx)
s->a_height = s->coded_height; s->a_height = s->coded_height;
s->a_width = s->coded_width; s->a_width = s->coded_width;
s->a_format = s->coded_format;
return 0; return 0;
} }
@ -227,7 +229,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
int ret = 0, i, j, plane, got_buffer = 0; int ret = 0, i, j, plane, got_buffer = 0;
int16_t *coeff_data; int16_t *coeff_data;
avctx->pix_fmt = AV_PIX_FMT_YUV422P10; s->coded_format = AV_PIX_FMT_YUV422P10;
init_frame_defaults(s); init_frame_defaults(s);
bytestream2_init(&gb, avpkt->data, avpkt->size); bytestream2_init(&gb, avpkt->data, avpkt->size);
@ -405,9 +407,9 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
} else if (tag == 84) { } else if (tag == 84) {
av_log(avctx, AV_LOG_DEBUG, "Sample format? %i\n", data); av_log(avctx, AV_LOG_DEBUG, "Sample format? %i\n", data);
if (data == 1) if (data == 1)
avctx->pix_fmt = AV_PIX_FMT_YUV422P10; s->coded_format = AV_PIX_FMT_YUV422P10;
else if (data == 3) else if (data == 3)
avctx->pix_fmt = AV_PIX_FMT_GBRP12; s->coded_format = AV_PIX_FMT_GBRP12;
else { else {
avpriv_report_missing_feature(avctx, "Sample format of %"PRIu16" is unsupported\n", data); avpriv_report_missing_feature(avctx, "Sample format of %"PRIu16" is unsupported\n", data);
ret = AVERROR_PATCHWELCOME; ret = AVERROR_PATCHWELCOME;
@ -417,8 +419,10 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
av_log(avctx, AV_LOG_DEBUG, "Unknown tag %i data %x\n", tag, data); av_log(avctx, AV_LOG_DEBUG, "Unknown tag %i data %x\n", tag, data);
/* Some kind of end of header tag */ /* Some kind of end of header tag */
if (tag == 4 && data == 0x1a4a && s->coded_width && s->coded_height && avctx->pix_fmt != AV_PIX_FMT_NONE) { if (tag == 4 && data == 0x1a4a && s->coded_width && s->coded_height &&
if (s->a_width != s->coded_width || s->a_height != s->coded_height) { s->coded_format != AV_PIX_FMT_NONE) {
if (s->a_width != s->coded_width || s->a_height != s->coded_height ||
s->a_format != s->coded_format) {
free_buffers(avctx); free_buffers(avctx);
if ((ret = alloc_buffers(avctx)) < 0) { if ((ret = alloc_buffers(avctx)) < 0) {
free_buffers(avctx); free_buffers(avctx);
@ -431,6 +435,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
s->coded_width = 0; s->coded_width = 0;
s->coded_height = 0; s->coded_height = 0;
s->coded_format = AV_PIX_FMT_NONE;
got_buffer = 1; got_buffer = 1;
} }
coeff_data = s->plane[s->channel_num].subband[s->subband_num_actual]; coeff_data = s->plane[s->channel_num].subband[s->subband_num_actual];
@ -557,7 +562,8 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
} }
} }
if (!s->a_width || !s->a_height || s->coded_width || s->coded_height) { if (!s->a_width || !s->a_height || s->a_format == AV_PIX_FMT_NONE ||
s->coded_width || s->coded_height || s->coded_format != AV_PIX_FMT_NONE) {
av_log(avctx, AV_LOG_ERROR, "Invalid dimensions\n"); av_log(avctx, AV_LOG_ERROR, "Invalid dimensions\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;

2
libavcodec/cfhd.h
View File

@ -84,9 +84,11 @@ typedef struct CFHDContext {
int coded_width; int coded_width;
int coded_height; int coded_height;
int coded_format;
int a_width; int a_width;
int a_height; int a_height;
int a_format;
int bpc; int bpc;
int channel_cnt; int channel_cnt;