November 2018 - ffmpeg-cvslog

hwcontext_opencl: Only release command queue if it exists
by Mark Thompson 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Sun Nov 25 19:14:27 2018 +0000| [b9aff7a53d598a7882bfe3db449a3e5dc6543f05] | committer: Mark Thompson hwcontext_opencl: Only release command queue if it exists If the frames context creation fails then the command queue reference need not exist when uninit is called. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9aff7a53d598a788… --- libavutil/hwcontext_opencl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 728877553f..be71c8323e 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -1726,10 +1726,13 @@ static void opencl_frames_uninit(AVHWFramesContext *hwfc) av_freep(&priv->mapped_frames); #endif - cle = clReleaseCommandQueue(priv->command_queue); - if (cle != CL_SUCCESS) { - av_log(hwfc, AV_LOG_ERROR, "Failed to release frame " - "command queue: %d.\n", cle); + if (priv->command_queue) { + cle = clReleaseCommandQueue(priv->command_queue); + if (cle != CL_SUCCESS) { + av_log(hwfc, AV_LOG_ERROR, "Failed to release frame " + "command queue: %d.\n", cle); + } + priv->command_queue = NULL; } }

1 0

lavf/Makefile: Fix demuxer dependencies: dvbsub, dvbtxt
by Carl Eugen Hoyos 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Tue Nov 27 18:48:29 2018 +0100| [8cc5107705e9d5758702075ad8f0473063f7f740] | committer: Carl Eugen Hoyos lavf/Makefile: Fix demuxer dependencies: dvbsub, dvbtxt Allow standalone compilation of the dvbsub and the dvbtxt demuxer. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8cc5107705e9d5758… --- libavformat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index a6c5ea9aa3..d0d621de07 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -162,8 +162,8 @@ OBJS-$(CONFIG_DTS_DEMUXER) += dtsdec.o rawdec.o OBJS-$(CONFIG_DTS_MUXER) += rawenc.o OBJS-$(CONFIG_DV_DEMUXER) += dv.o OBJS-$(CONFIG_DV_MUXER) += dvenc.o -OBJS-$(CONFIG_DVBSUB_DEMUXER) += dvbsub.o -OBJS-$(CONFIG_DVBTXT_DEMUXER) += dvbtxt.o +OBJS-$(CONFIG_DVBSUB_DEMUXER) += dvbsub.o rawdec.o +OBJS-$(CONFIG_DVBTXT_DEMUXER) += dvbtxt.o rawdec.o OBJS-$(CONFIG_DXA_DEMUXER) += dxa.o OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o

1 0

ffmpeg: Avoid duplicating Closed Captions when increasing frame rate.
by Carl Eugen Hoyos 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Fri Nov 23 18:49:27 2018 +0100| [698574ac5d68e806279a8d28aeff48a407377538] | committer: Carl Eugen Hoyos ffmpeg: Avoid duplicating Closed Captions when increasing frame rate. Fixes ticket #7506. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=698574ac5d68e8062… --- fftools/ffmpeg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 085d6d2dfb..6abcc57776 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1286,6 +1286,8 @@ static void do_video_out(OutputFile *of, ret = avcodec_send_frame(enc, in_picture); if (ret < 0) goto error; + // Make sure Closed Captions will not be duplicated + av_frame_remove_side_data(in_picture, AV_FRAME_DATA_A53_CC); while (1) { ret = avcodec_receive_packet(enc, &pkt);

1 0

lavfi/fps: Avoid duplicating Closed Captions when increasing frame rate.
by Carl Eugen Hoyos 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Fri Nov 23 18:48:50 2018 +0100| [1893c72086024e53ac32312ecb96693c5be023d0] | committer: Carl Eugen Hoyos lavfi/fps: Avoid duplicating Closed Captions when increasing frame rate. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1893c72086024e53a… --- libavfilter/version.h | 2 +- libavfilter/vf_fps.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/version.h b/libavfilter/version.h index 76b212305a..c6b4d981c9 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 7 #define LIBAVFILTER_VERSION_MINOR 46 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 9167a00a13..6b99f20d2b 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -249,6 +249,8 @@ static int write_frame(AVFilterContext *ctx, FPSContext *s, AVFilterLink *outlin frame = av_frame_clone(s->frames[0]); if (!frame) return AVERROR(ENOMEM); + // Make sure Closed Captions will not be duplicated + av_frame_remove_side_data(s->frames[0], AV_FRAME_DATA_A53_CC); frame->pts = s->next_pts++; av_log(ctx, AV_LOG_DEBUG, "Writing frame with pts %"PRId64" to pts %"PRId64"\n",

1 0

avcodec/diracdec: Check component quant
by Michael Niedermayer 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Nov 14 09:42:44 2018 +0100| [28c96c2ce2781c2cd147a9f3c299e18ce1dc7ff8] | committer: Michael Niedermayer avcodec/diracdec: Check component quant Fixes: Timeout Fixes: 10708/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5730140957442048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28c96c2ce2781c2cd… --- libavcodec/diracdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index af561d1426..fd23139062 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -676,6 +676,11 @@ static int decode_component(DiracContext *s, int comp) b->length = get_interleaved_ue_golomb(&s->gb); if (b->length) { b->quant = get_interleaved_ue_golomb(&s->gb); + if (b->quant > (DIRAC_MAX_QUANT_INDEX - 1)) { + av_log(s->avctx, AV_LOG_ERROR, "Unsupported quant %d\n", b->quant); + b->quant = 0; + return AVERROR_INVALIDDATA; + } align_get_bits(&s->gb); b->coeff_data = s->gb.buffer + get_bits_count(&s->gb)/8; b->length = FFMIN(b->length, FFMAX(get_bits_left(&s->gb)/8, 0));

1 0

lavf/dashdec: Add webm to the list of allowed extensions.
by Andrey Semashev 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Andrey Semashev <andrey.semashev(a)gmail.com> | Sat Nov 17 20:40:52 2018 +0300| [1035206102e2b44e2ad6ab6bef0cb4ba708ae36e] | committer: Karthick J lavf/dashdec: Add webm to the list of allowed extensions. This is in coherence with dashenc, which can now generate segments with webm file name extension by default. Dashdec should be able to handle such streams by default as well. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1035206102e2b44e2… --- libavformat/dashdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 497e7e469c..cf603bf075 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -2242,7 +2242,7 @@ static int dash_probe(AVProbeData *p) static const AVOption dash_options[] = { {"allowed_extensions", "List of file extensions that dash is allowed to access", OFFSET(allowed_extensions), AV_OPT_TYPE_STRING, - {.str = "aac,m4a,m4s,m4v,mov,mp4"}, + {.str = "aac,m4a,m4s,m4v,mov,mp4,webm"}, INT_MIN, INT_MAX, FLAGS}, {NULL} };

1 0

fftools/ffmpeg: delete the unused code.
by Jun Zhao 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Sun Nov 18 22:56:46 2018 +0800| [1ffac23885ee3a9966a58f122c93e7efb32730dd] | committer: Jun Zhao fftools/ffmpeg: delete the unused code. There are come from 2012 ago and have never been used from this time. Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ffac23885ee3a996… --- fftools/ffmpeg.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a12208cce9..085d6d2dfb 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1485,8 +1485,6 @@ static int reap_filters(int flush) av_rescale_q(filtered_frame->pts, filter_tb, enc->time_base) - av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base); } - //if (ost->source_index >= 0) - // *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold switch (av_buffersink_get_type(filter)) { case AVMEDIA_TYPE_VIDEO: @@ -3340,7 +3338,7 @@ static int init_output_stream_encode(OutputStream *ost) "if you want a different framerate.\n", ost->file_index, ost->index); } -// ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1}; + if (ost->enc->supported_framerates && !ost->force_fps) { int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates); ost->frame_rate = ost->enc->supported_framerates[idx]; @@ -4879,11 +4877,6 @@ int main(int argc, char **argv) exit_program(1); } -// if (nb_input_files == 0) { -// av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n"); -// exit_program(1); -// } - for (i = 0; i < nb_output_files; i++) { if (strcmp(output_files[i]->ctx->oformat->name, "rtp")) want_sdp = 0;

1 0

fftools/ffprobe: Indent the code.
by Jun Zhao 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Sun Nov 18 20:55:40 2018 +0800| [7608809ae4248948a5935d19fef4a9645f94f690] | committer: Jun Zhao fftools/ffprobe: Indent the code. commit 196765a7cc4 missed the reindet. Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7608809ae4248948a… --- fftools/ffprobe.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 544786ec72..dea489d02e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2646,20 +2646,20 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id } while (0) if (do_show_stream_disposition) { - writer_print_section_header(w, in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION : SECTION_ID_STREAM_DISPOSITION); - PRINT_DISPOSITION(DEFAULT, "default"); - PRINT_DISPOSITION(DUB, "dub"); - PRINT_DISPOSITION(ORIGINAL, "original"); - PRINT_DISPOSITION(COMMENT, "comment"); - PRINT_DISPOSITION(LYRICS, "lyrics"); - PRINT_DISPOSITION(KARAOKE, "karaoke"); - PRINT_DISPOSITION(FORCED, "forced"); - PRINT_DISPOSITION(HEARING_IMPAIRED, "hearing_impaired"); - PRINT_DISPOSITION(VISUAL_IMPAIRED, "visual_impaired"); - PRINT_DISPOSITION(CLEAN_EFFECTS, "clean_effects"); - PRINT_DISPOSITION(ATTACHED_PIC, "attached_pic"); - PRINT_DISPOSITION(TIMED_THUMBNAILS, "timed_thumbnails"); - writer_print_section_footer(w); + writer_print_section_header(w, in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION : SECTION_ID_STREAM_DISPOSITION); + PRINT_DISPOSITION(DEFAULT, "default"); + PRINT_DISPOSITION(DUB, "dub"); + PRINT_DISPOSITION(ORIGINAL, "original"); + PRINT_DISPOSITION(COMMENT, "comment"); + PRINT_DISPOSITION(LYRICS, "lyrics"); + PRINT_DISPOSITION(KARAOKE, "karaoke"); + PRINT_DISPOSITION(FORCED, "forced"); + PRINT_DISPOSITION(HEARING_IMPAIRED, "hearing_impaired"); + PRINT_DISPOSITION(VISUAL_IMPAIRED, "visual_impaired"); + PRINT_DISPOSITION(CLEAN_EFFECTS, "clean_effects"); + PRINT_DISPOSITION(ATTACHED_PIC, "attached_pic"); + PRINT_DISPOSITION(TIMED_THUMBNAILS, "timed_thumbnails"); + writer_print_section_footer(w); } if (do_show_stream_tags)

1 0

lavfi/buffersrc: Indent the code.
by Jun Zhao 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Sun Nov 18 17:09:29 2018 +0800| [e002ec332b75af3ba17191e1329ed2450996e294] | committer: Jun Zhao lavfi/buffersrc: Indent the code. commit b0012de420f missed reindent. Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e002ec332b75af3ba… --- libavfilter/buffersrc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index cd56f8ca45..0c12650e1e 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -205,21 +205,21 @@ static int av_buffersrc_add_frame_internal(AVFilterContext *ctx, if (!(flags & AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT)) { - switch (ctx->outputs[0]->type) { - case AVMEDIA_TYPE_VIDEO: - CHECK_VIDEO_PARAM_CHANGE(ctx, s, frame->width, frame->height, - frame->format); - break; - case AVMEDIA_TYPE_AUDIO: - /* For layouts unknown on input but known on link after negotiation. */ - if (!frame->channel_layout) - frame->channel_layout = s->channel_layout; - CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->channel_layout, - frame->channels, frame->format); - break; - default: - return AVERROR(EINVAL); - } + switch (ctx->outputs[0]->type) { + case AVMEDIA_TYPE_VIDEO: + CHECK_VIDEO_PARAM_CHANGE(ctx, s, frame->width, frame->height, + frame->format); + break; + case AVMEDIA_TYPE_AUDIO: + /* For layouts unknown on input but known on link after negotiation. */ + if (!frame->channel_layout) + frame->channel_layout = s->channel_layout; + CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->channel_layout, + frame->channels, frame->format); + break; + default: + return AVERROR(EINVAL); + } }

1 0

avcodec/tiff: Fix integer overflows in left shift in init_image()
by Michael Niedermayer 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Nov 26 02:57:32 2018 +0100| [a036c25969498693539f5e494e1f25ad2227e24c] | committer: Michael Niedermayer avcodec/tiff: Fix integer overflows in left shift in init_image() Fixes: left shift of 255 by 24 places cannot be represented in type 'int' Fixes: 11377/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5694319101476864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a036c259694986935… --- libavcodec/tiff.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 6271c937c3..751f23ef33 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -706,7 +706,7 @@ static int init_image(TiffContext *s, ThreadFrame *frame) s->avctx->pix_fmt = s->palette_is_set ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_GRAY8; break; case 10081: - switch (s->pattern[0] | (s->pattern[1] << 8) | (s->pattern[2] << 16) | (s->pattern[3] << 24)) { + switch (AV_RL32(s->pattern)) { case 0x02010100: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_RGGB8; break; @@ -721,12 +721,12 @@ static int init_image(TiffContext *s, ThreadFrame *frame) break; default: av_log(s->avctx, AV_LOG_ERROR, "Unsupported Bayer pattern: 0x%X\n", - s->pattern[0] | s->pattern[1] << 8 | s->pattern[2] << 16 | s->pattern[3] << 24); + AV_RL32(s->pattern)); return AVERROR_PATCHWELCOME; } break; case 10121: - switch (s->pattern[0] | s->pattern[1] << 8 | s->pattern[2] << 16 | s->pattern[3] << 24) { + switch (AV_RL32(s->pattern)) { case 0x02010100: s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_RGGB16LE : AV_PIX_FMT_BAYER_RGGB16BE; break; @@ -741,12 +741,12 @@ static int init_image(TiffContext *s, ThreadFrame *frame) break; default: av_log(s->avctx, AV_LOG_ERROR, "Unsupported Bayer pattern: 0x%X\n", - s->pattern[0] | s->pattern[1] << 8 | s->pattern[2] << 16 | s->pattern[3] << 24); + AV_RL32(s->pattern)); return AVERROR_PATCHWELCOME; } break; case 10161: - switch (s->pattern[0] | s->pattern[1] << 8 | s->pattern[2] << 16 | s->pattern[3] << 24) { + switch (AV_RL32(s->pattern)) { case 0x02010100: s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_RGGB16LE : AV_PIX_FMT_BAYER_RGGB16BE; break; @@ -761,7 +761,7 @@ static int init_image(TiffContext *s, ThreadFrame *frame) break; default: av_log(s->avctx, AV_LOG_ERROR, "Unsupported Bayer pattern: 0x%X\n", - s->pattern[0] | s->pattern[1] << 8 | s->pattern[2] << 16 | s->pattern[3] << 24); + AV_RL32(s->pattern)); return AVERROR_PATCHWELCOME; } break;

1 0