From ba064ebe48376e199f353ef0b335ed8a39c638c5 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 22 Dec 2012 17:58:24 +0100 Subject: [PATCH 1/3] oggdec: check memory allocation --- libavformat/oggdec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index a1c126a3dc..07af5cf9d0 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -160,8 +160,13 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t serial, int new_avstream) AVStream *st; struct ogg_stream *os; - ogg->streams = av_realloc(ogg->streams, - ogg->nstreams * sizeof(*ogg->streams)); + os = av_realloc(ogg->streams, ogg->nstreams * sizeof(*ogg->streams)); + + if (!os) + return AVERROR(ENOMEM); + + ogg->streams = os; + memset(ogg->streams + idx, 0, sizeof(*ogg->streams)); os = ogg->streams + idx; @@ -305,6 +310,8 @@ static int ogg_read_page(AVFormatContext *s, int *str) if (os->bufsize - os->bufpos < size) { uint8_t *nb = av_malloc((os->bufsize *= 2) + FF_INPUT_BUFFER_PADDING_SIZE); + if (!nb) + return AVERROR(ENOMEM); memcpy(nb, os->buf, os->bufpos); av_free(os->buf); os->buf = nb; From ed40b6bf07342dc80f616e909f0e6fec4073ade4 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 20 Dec 2012 22:40:39 +0100 Subject: [PATCH 2/3] configure: cosmetics: Separate hwaccel dependencies from decoders/encoders Also move mpegvideo_select statement to the correct position. --- configure | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 5355300a79..7805e46655 100755 --- a/configure +++ b/configure @@ -1455,9 +1455,10 @@ mdct_select="fft" rdft_select="fft" mpegaudio_select="mpegaudiodsp" mpegaudiodsp_select="dct" +mpegvideo_select="videodsp" mpegvideoenc_select="mpegvideo" -# decoders / encoders / hardware accelerators +# decoders / encoders aac_decoder_select="mdct sinewin" aac_encoder_select="mdct sinewin" aac_latm_decoder_select="aac_decoder aac_latm_parser" @@ -1499,15 +1500,9 @@ h261_decoder_select="error_resilience mpegvideo" h261_encoder_select="aandcttables mpegvideoenc" h263_decoder_select="error_resilience h263_parser mpegvideo" h263_encoder_select="aandcttables error_resilience mpegvideoenc" -h263_vaapi_hwaccel_select="vaapi h263_decoder" h263i_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" h264_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo" -h264_dxva2_hwaccel_deps="dxva2api_h" -h264_dxva2_hwaccel_select="dxva2 h264_decoder" -h264_vaapi_hwaccel_select="vaapi h264_decoder" -h264_vda_hwaccel_select="vda h264_decoder" -h264_vdpau_decoder_select="vdpau h264_decoder" huffyuv_encoder_select="huffman" iac_decoder_select="fft mdct sinewin" imc_decoder_select="fft mdct sinewin" @@ -1530,22 +1525,14 @@ mp3on4_decoder_select="mpegaudio" mp3on4float_decoder_select="mpegaudio" mpc7_decoder_select="mpegaudiodsp" mpc8_decoder_select="mpegaudiodsp" -mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_select="mpegvideo_decoder" -mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" mpeg1video_decoder_select="error_resilience mpegvideo" mpeg1video_encoder_select="aandcttables error_resilience mpegvideoenc" -mpeg2_dxva2_hwaccel_deps="dxva2api_h" -mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder" -mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" mpeg2video_decoder_select="error_resilience mpegvideo" mpeg2video_encoder_select="aandcttables error_resilience mpegvideoenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" -mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" -mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder" -mpegvideo_select="videodsp" msmpeg4v1_decoder_select="h263_decoder" msmpeg4v1_encoder_select="h263_encoder" msmpeg4v2_decoder_select="h263_decoder" @@ -1584,10 +1571,6 @@ tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" utvideo_encoder_select="huffman" vc1_decoder_select="h263_decoder h264chroma h264qpel" -vc1_dxva2_hwaccel_deps="dxva2api_h" -vc1_dxva2_hwaccel_select="dxva2 vc1_decoder" -vc1_vaapi_hwaccel_select="vaapi vc1_decoder" -vc1_vdpau_decoder_select="vdpau vc1_decoder" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" @@ -1608,9 +1591,6 @@ wmv1_encoder_select="h263_encoder" wmv2_decoder_select="h263_decoder" wmv2_encoder_select="h263_encoder" wmv3_decoder_select="vc1_decoder" -wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel" -wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" -wmv3_vdpau_decoder_select="vc1_vdpau_decoder" wmv3image_decoder_select="wmv3_decoder" zerocodec_decoder_select="zlib" zlib_decoder_select="zlib" @@ -1618,10 +1598,32 @@ zlib_encoder_select="zlib" zmbv_decoder_select="zlib" zmbv_encoder_select="zlib" +# hardware accelerators vaapi_deps="va_va_h" vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +h263_vaapi_hwaccel_select="vaapi h263_decoder" +h264_dxva2_hwaccel_deps="dxva2api_h" +h264_dxva2_hwaccel_select="dxva2 h264_decoder" +h264_vaapi_hwaccel_select="vaapi h264_decoder" +h264_vda_hwaccel_select="vda h264_decoder" +h264_vdpau_decoder_select="vdpau h264_decoder" +mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" +mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" +mpeg2_dxva2_hwaccel_deps="dxva2api_h" +mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder" +mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" +mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" +mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder" +vc1_dxva2_hwaccel_deps="dxva2api_h" +vc1_dxva2_hwaccel_select="dxva2 vc1_decoder" +vc1_vaapi_hwaccel_select="vaapi vc1_decoder" +vc1_vdpau_decoder_select="vdpau vc1_decoder" +wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel" +wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" +wmv3_vdpau_decoder_select="vc1_vdpau_decoder" + # parsers h264_parser_select="error_resilience golomb h264dsp h264pred mpegvideo" mpeg4video_parser_select="error_resilience mpegvideo" From f3298f12997eb4b7ad203766f768f92e3dd72a2a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 23 Dec 2012 18:10:05 +0100 Subject: [PATCH 3/3] Return proper error code after av_log_ask_for_sample() --- libavcodec/anm.c | 2 +- libavcodec/cinepak.c | 2 +- libavcodec/h264.c | 2 +- libavcodec/pictordec.c | 2 +- libavcodec/ptx.c | 2 +- libavcodec/truemotion1.c | 2 +- libavcodec/truespeech.c | 2 +- libavcodec/wmalosslessdec.c | 2 +- libavcodec/wmaprodec.c | 6 +++--- libavformat/anm.c | 4 ++-- libavformat/au.c | 2 +- libavformat/filmstripdec.c | 2 +- libavformat/mtv.c | 2 +- libavformat/rsodec.c | 2 +- libavformat/smjpegdec.c | 2 +- libavformat/spdifenc.c | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libavcodec/anm.c b/libavcodec/anm.c index fc328bb06b..d08ed8d140 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -158,7 +158,7 @@ static int decode_frame(AVCodecContext *avctx, break; // stop if (type == 2) { av_log_ask_for_sample(avctx, "unknown opcode"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } continue; } diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index c6f4ffa25c..9bf68634a9 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -334,7 +334,7 @@ static int cinepak_decode (CinepakContext *s) if (s->sega_film_skip_bytes == -1) { if (!encoded_buf_size) { av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) { /* If the encoded frame size differs from the frame size as indicated diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1a0b341641..fae8440a1e 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2873,7 +2873,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) av_log_ask_for_sample(s->avctx, NULL); s->picture_structure = last_pic_structure; s->droppable = last_pic_droppable; - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } /* Take ownership of this buffer. Note that if another thread owned diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index e769537706..16f930730b 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -123,7 +123,7 @@ static int decode_frame(AVCodecContext *avctx, bpp = bits_per_plane * s->nb_planes; if (bits_per_plane > 8 || bpp < 1 || bpp > 32) { av_log_ask_for_sample(s, "unsupported bit depth\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } if (bytestream2_peek_byte(&s->g) == 0xFF) { diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 77fd19615a..d4cd963e46 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -57,7 +57,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (bytes_per_pixel != 2) { av_log_ask_for_sample(avctx, "Image format is not RGB15.\n"); - return -1; + return AVERROR_PATCHWELCOME; } avctx->pix_fmt = AV_PIX_FMT_RGB555; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index f6ca35c7b7..c49f9fecbf 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -356,7 +356,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s) if (s->flags & FLAG_SPRITE) { av_log_ask_for_sample(s->avctx, "SPRITE frame found.\n"); /* FIXME header.width, height, xoffset and yoffset aren't initialized */ - return -1; + return AVERROR_PATCHWELCOME; } else { s->w = header.xsize; s->h = header.ysize; diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index 66e3427b78..486e41f895 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -65,7 +65,7 @@ static av_cold int truespeech_decode_init(AVCodecContext * avctx) if (avctx->channels != 1) { av_log_ask_for_sample(avctx, "Unsupported channel count: %d\n", avctx->channels); - return AVERROR(EINVAL); + return AVERROR_PATCHWELCOME; } avctx->channel_layout = AV_CH_LAYOUT_MONO; diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index a36c2c21c3..747ac37dc0 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -203,7 +203,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } else { av_log_ask_for_sample(avctx, "Unsupported extradata size\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } /* generic init */ diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index e19c3d36b9..d58278b76d 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -299,7 +299,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } else { av_log_ask_for_sample(avctx, "Unknown extradata size\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } /** generic init */ @@ -680,7 +680,7 @@ static int decode_channel_transform(WMAProDecodeCtx* s) if (get_bits1(&s->gb)) { av_log_ask_for_sample(s->avctx, "unsupported channel transform bit\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } for (s->num_chgroups = 0; remaining_channels && @@ -1150,7 +1150,7 @@ static int decode_subframe(WMAProDecodeCtx *s) /** no idea for what the following bit is used */ if (get_bits1(&s->gb)) { av_log_ask_for_sample(s->avctx, "reserved bit set\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } diff --git a/libavformat/anm.c b/libavformat/anm.c index c7bc843c8e..7e52e8355b 100644 --- a/libavformat/anm.c +++ b/libavformat/anm.c @@ -86,7 +86,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 4); /* magic number */ if (avio_rl16(pb) != MAX_PAGES) { av_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES) "\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } anm->nb_pages = avio_rl16(pb); @@ -166,7 +166,7 @@ static int read_header(AVFormatContext *s) invalid: av_log_ask_for_sample(s, NULL); - ret = AVERROR_INVALIDDATA; + ret = AVERROR_PATCHWELCOME; fail: return ret; diff --git a/libavformat/au.c b/libavformat/au.c index 331c423fcc..8f9a3facd1 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -82,7 +82,7 @@ static int au_read_header(AVFormatContext *s) if (!av_get_bits_per_sample(codec)) { av_log_ask_for_sample(s, "could not determine bits per sample\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } if (channels == 0 || channels > 64) { diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index 7c327e9324..97cecfa58a 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -56,7 +56,7 @@ static int read_header(AVFormatContext *s) st->nb_frames = avio_rb32(pb); if (avio_rb16(pb) != 0) { av_log_ask_for_sample(s, "unsupported packing method\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } avio_skip(pb, 2); diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 572288894d..1566faa086 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -109,7 +109,7 @@ static int mtv_read_header(AVFormatContext *s) if (audio_subsegments == 0) { av_log_ask_for_sample(s, "MTV files without audio are not supported\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } mtv->full_segment_size = diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index 3a441a3a3d..2d57a964da 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -50,7 +50,7 @@ static int rso_read_header(AVFormatContext *s) bps = av_get_bits_per_sample(codec); if (!bps) { av_log_ask_for_sample(s, "could not determine bits per sample\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } /* now we are ready: build format streams */ diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c index 4cbfa2a580..39bb1b45f5 100644 --- a/libavformat/smjpegdec.c +++ b/libavformat/smjpegdec.c @@ -78,7 +78,7 @@ static int smjpeg_read_header(AVFormatContext *s) case SMJPEG_SND: if (ast) { av_log_ask_for_sample(s, "multiple audio streams not supported\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } hlength = avio_rb32(pb); if (hlength < 8) diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index dcdabae1de..cf421a7358 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -414,7 +414,7 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt) * distribute the TrueHD frames in the MAT frame */ av_log(s, AV_LOG_ERROR, "TrueHD frame too big, %d bytes\n", pkt->size); av_log_ask_for_sample(s, NULL); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } memcpy(&ctx->hd_buf[ctx->hd_buf_count * TRUEHD_FRAME_OFFSET - BURST_HEADER_SIZE + mat_code_length],