April 2014 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] doc/ffmpeg: note that -t is also an input option
by Lou Logan 26 May '14

26 May '14

--- doc/ffmpeg.texi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 8d646f5..3b09c8e 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -272,8 +272,13 @@ ffmpeg -i INPUT -map 0 -c copy -c:v:1 libx264 -c:a:137 libvorbis OUTPUT will copy all the streams except the second video, which will be encoded with libx264, and the 138th audio, which will be encoded with libvorbis. -@item -t @var{duration} (@emph{output}) -Stop writing the output after its duration reaches @var{duration}. +@item -t @var{duration} (@emph{input/output}) +When used as an input option (before @code{-i}), limit the @var{duration} of +data read from an input file. + +When used as an output option (before an output filename), stop writing the +output after its duration reaches @var{duration}. + @var{duration} may be a number in seconds, or in @code{hh:mm:ss[.xxx]} form. -to and -t are mutually exclusive and -t has priority. -- 1.9.0

2 3

[PATCH] avformat: add format_probesize to allow tuning the maximum amount of bytes to identify the filetype
by Michael Niedermayer 25 May '14

25 May '14

Currently probesize is cliped at 1mb before being used for format detection. Alternatively this cliping could be removed but this would then tie various things like stream analysis to the file detection. Fixes Ticket 3327 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavformat/avformat.h | 7 +++++++ libavformat/options_table.h | 2 ++ libavformat/utils.c | 6 ++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a495ee0..23d138d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1267,6 +1267,13 @@ typedef struct AVFormatContext { */ int probe_score; + /** + * number of bytes to read maximally to identify format. + * - encoding: unused + * - decoding: set by user through AVOPtions (NO direct access) + */ + int format_probesize; + /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavformat and can be changed and diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 3221042..65c603b 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "avformat.h" +#include "internal.h" #define OFFSET(x) offsetof(AVFormatContext,x) #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C @@ -36,6 +37,7 @@ static const AVOption avformat_options[] = { {"avioflags", NULL, OFFSET(avio_flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "avioflags"}, {"direct", "reduce buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVIO_FLAG_DIRECT }, INT_MIN, INT_MAX, D|E, "avioflags"}, {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.i64 = 5000000 }, 32, INT_MAX, D}, +{"formatprobesize", "number of bytes to probe file format", OFFSET(format_probesize), AV_OPT_TYPE_INT, {.i64 = PROBE_BUF_MAX}, 0, INT_MAX-1, D}, {"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, E}, {"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, D|E, "fflags"}, {"flush_packets", "reduce the latency by flushing out packets immediately", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, D, "fflags"}, diff --git a/libavformat/utils.c b/libavformat/utils.c index d425b5b..f6e75a9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -356,8 +356,6 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, if (!max_probe_size) max_probe_size = PROBE_BUF_MAX; - else if (max_probe_size > PROBE_BUF_MAX) - max_probe_size = PROBE_BUF_MAX; else if (max_probe_size < PROBE_BUF_MIN) { av_log(logctx, AV_LOG_ERROR, "Specified probe size value %u cannot be < %u\n", max_probe_size, PROBE_BUF_MIN); @@ -451,7 +449,7 @@ static int init_input(AVFormatContext *s, const char *filename, s->flags |= AVFMT_FLAG_CUSTOM_IO; if (!s->iformat) return av_probe_input_buffer2(s->pb, &s->iformat, filename, - s, 0, s->probesize); + s, 0, s->format_probesize); else if (s->iformat->flags & AVFMT_NOFILE) av_log(s, AV_LOG_WARNING, "Custom AVIOContext makes no sense and " "will be ignored with AVFMT_NOFILE format.\n"); @@ -468,7 +466,7 @@ static int init_input(AVFormatContext *s, const char *filename, if (s->iformat) return 0; return av_probe_input_buffer2(s->pb, &s->iformat, filename, - s, 0, s->probesize); + s, 0, s->format_probesize); } static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt, -- 1.7.9.5

1 1

[PATCH] ffplay: support rotated video.
by Clément Bœsch 23 May '14

23 May '14

Trolled-by: Linus Torvalds --- doc/ffplay.texi | 4 ++++ ffplay.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/doc/ffplay.texi b/doc/ffplay.texi index c26c68d..d73eadb 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -159,6 +159,10 @@ Force a specific video decoder. @item -scodec @var{codec_name} Force a specific subtitle decoder. + +@item -autorotate +Automatically rotate the video according to presentation metadata. Set by +default, use -noautorotate to disable. @end table @section While playing diff --git a/ffplay.c b/ffplay.c index 86b9126..520b337 100644 --- a/ffplay.c +++ b/ffplay.c @@ -327,6 +327,7 @@ static int cursor_hidden = 0; static char *vfilters = NULL; static char *afilters = NULL; #endif +static int autorotate = 1; /* current context */ static int is_full_screen; @@ -1773,7 +1774,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c char sws_flags_str[128]; char buffersrc_args[256]; int ret; - AVFilterContext *filt_src = NULL, *filt_out = NULL, *filt_crop; + AVFilterContext *filt_src = NULL, *filt_out = NULL, *last_filter = NULL; AVCodecContext *codec = is->video_st->codec; AVRational fr = av_guess_frame_rate(is->ic, is->video_st, NULL); @@ -1804,16 +1805,45 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c if ((ret = av_opt_set_int_list(filt_out, "pix_fmts", pix_fmts, AV_PIX_FMT_NONE, AV_OPT_SEARCH_CHILDREN)) < 0) goto fail; + last_filter = filt_out; + +#define INSERT_FILT(name, arg) do { \ + AVFilterContext *filt_ctx; \ + \ + ret = avfilter_graph_create_filter(&filt_ctx, \ + avfilter_get_by_name(name), \ + "ffplay_" name, arg, NULL, graph); \ + if (ret < 0) \ + goto fail; \ + \ + ret = avfilter_link(filt_ctx, 0, last_filter, 0); \ + if (ret < 0) \ + goto fail; \ + \ + last_filter = filt_ctx; \ +} while (0) + /* SDL YUV code is not handling odd width/height for some driver * combinations, therefore we crop the picture to an even width/height. */ - if ((ret = avfilter_graph_create_filter(&filt_crop, - avfilter_get_by_name("crop"), - "ffplay_crop", "floor(in_w/2)*2:floor(in_h/2)*2", NULL, graph)) < 0) - goto fail; - if ((ret = avfilter_link(filt_crop, 0, filt_out, 0)) < 0) - goto fail; + INSERT_FILT("crop", "floor(in_w/2)*2:floor(in_h/2)*2"); + + if (autorotate) { + AVDictionaryEntry *rotate_tag = av_dict_get(is->video_st->metadata, "rotate", NULL, 0); + if (rotate_tag) { + if (!strcmp(rotate_tag->value, "90")) { + INSERT_FILT("transpose", "1"); + } else if (!strcmp(rotate_tag->value, "180")) { + INSERT_FILT("hflip", NULL); + INSERT_FILT("vflip", NULL); + } else if (!strcmp(rotate_tag->value, "270")) { + INSERT_FILT("transpose", "2"); + } else { + INSERT_FILT("rotate", rotate_tag->value); + } + } + } - if ((ret = configure_filtergraph(graph, vfilters, filt_src, filt_crop)) < 0) + if ((ret = configure_filtergraph(graph, vfilters, filt_src, last_filter)) < 0) goto fail; is->in_video_filter = filt_src; @@ -3527,6 +3557,7 @@ static const OptionDef options[] = { { "acodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &audio_codec_name }, "force audio decoder", "decoder_name" }, { "scodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &subtitle_codec_name }, "force subtitle decoder", "decoder_name" }, { "vcodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &video_codec_name }, "force video decoder", "decoder_name" }, + { "autorotate", OPT_BOOL, { &autorotate }, "automatically rotate video", "" }, { NULL, }, }; -- 1.9.2

4 14

[PATCH 1/9] lavc/codec_desc: add separation comment.
by Nicolas George 19 May '14

19 May '14

Signed-off-by: Nicolas George <george(a)nsup.org> --- libavcodec/codec_desc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index e742b5d..6efc6ec 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2642,6 +2642,8 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), .props = AV_CODEC_PROP_TEXT_SUB, }, + + /* other kind of codecs and pseudo-codecs */ { .id = AV_CODEC_ID_BINTEXT, .type = AVMEDIA_TYPE_VIDEO, -- 1.7.10.4

3 18

[PATCH 0/3] sbrdsp: SSE2 functions
by Christophe Gisquet 15 May '14

15 May '14

Drop SSE-only functions as much as possible to avoid any clutter. pre_shuffle and apply_noise were therefore affected. Christophe Gisquet (3): x86: sbrdsp: implement SSE2 qmf_pre_shuffle x86: sbrdsp: implement SSE qmf_deint_neg x86: sbrdsp: implement SSE2 hf_apply_noise libavcodec/aacsbrdata.h | 6 +- libavcodec/x86/sbrdsp.asm | 150 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/x86/sbrdsp_init.c | 20 ++++++ 3 files changed, 175 insertions(+), 1 deletion(-) -- 1.8.0.msysgit.0

2 14

[PATCH] build: rely on pkg-config for libx264 probing.
by Clément Bœsch 15 May '14

15 May '14

From: Clément Bœsch <clement(a)stupeflix.com> This helps populating {c,ld}flags properly without manual user intervention. x264 needs to be built with either --bit-depth=8 or --bit-depth=10. Most distro package the former, so users often have to build their own and install it in a separated place. Instead of having them to require --extra-ldflags and --extra-cflags, we can now use pkg-config utils to append them automatically. before: ./configure --enable-gpl --enable-libx264 --extra-cflags="-I/usr/local/include" --extra-ldflags="-L/usr/local/lib" after: PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --enable-gpl --enable-libx264 Trolled-on Ticket #3218 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 3c6d766..0f09310 100755 --- a/configure +++ b/configure @@ -4434,7 +4434,7 @@ enabled libvpx && { enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; } enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_SVC" -lvpx || disable libvpx_vp9_encoder; } } enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack -enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 && +enabled libx264 && require_pkg_config x264 "stdint.h x264.h" x264_encoder_encode && { check_cpp_condition x264.h "X264_BUILD >= 118" || die "ERROR: libx264 must be installed and version must be >= 0.118."; } enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs -- 1.8.5.1

4 7

[PATCH] avcodec/libx264: Implement reference frame count limiting based on level
by Michael Niedermayer 14 May '14

14 May '14

This makes libavcodec/libx264.c behave more similar to the x264 command line util Fixes Ticket3307 Implementation based on x264 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/libx264.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d9130b2..474c247 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/eval.h" #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/mem.h" @@ -426,6 +427,28 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.rc.f_qcompress = avctx->qcompress; /* 0.0 => cbr, 1.0 => constant qp */ if (avctx->refs >= 0) x4->params.i_frame_reference = avctx->refs; + else if (x4->level) { + int i; + int mbn = FF_CEIL_RSHIFT(avctx->width, 4) * FF_CEIL_RSHIFT(avctx->height, 4); + int level_id = -1; + char *tail; + int scale = X264_BUILD < 129 ? 384 : 1; + + if (!strcmp(x4->level, "1b")) { + level_id = 9; + } else if (strlen(x4->level) <= 3){ + level_id = av_strtod(x4->level, &tail) * 10 + 0.5; + if (*tail) + level_id = -1; + } + if (level_id <= 0) + av_log(avctx, AV_LOG_WARNING, "Failed to parse level\n"); + + for (i = 0; i<x264_levels[i].level_idc; i++) + if (x264_levels[i].level_idc == level_id) + x4->params.i_frame_reference = av_clip(x264_levels[i].dpb / mbn / scale, 1, x4->params.i_frame_reference); + } + if (avctx->trellis >= 0) x4->params.analyse.i_trellis = avctx->trellis; if (avctx->me_range >= 0) -- 1.7.9.5

4 5

RTCP question
by Fred Rothganger 14 May '14

14 May '14

I am dealing with a use-case that may involve long pauses in streaming. Because of this, it may be useful to ensure that a fresh RTCP SR packet is sent when streaming restarts. Here is a code fragment from rtpenc.c, round line 500: rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) / RTCP_TX_RATIO_DEN; if ((s->first_packet || ((rtcp_bytes >= RTCP_SR_SIZE) && (ff_ntp_time() - s->last_rtcp_ntp_time > 5000000))) && !(s->flags & FF_RTP_FLAG_SKIP_RTCP)) { rtcp_send_sr(s1, ff_ntp_time(), 0); s->last_octet_count = s->octet_count; s->first_packet = 0; } Notice the AND between the byte-ratio and time-elapsed conditions. Would it make more sense to make this an OR? IE: shouldn't we send a fresh SR message if *either* condition were true, as opposed to both simultaneously? As written, there could be a pause for 10 minutes, but if not enough bytes have been sent yet, it may be several packets before a fresh SR message is sent. Am I missing something here? I suppose the intention is that if the overall bandwidth use is very low, then don't fill it up with SR messages. I would argue that in that case, you won't add much to bandwidth usage anyway.

2 1

[PATCH] Support broadcast destination for udp protocol
by Olivier Langlois 13 May '14

13 May '14

Use the required socket option SO_BROADCAST to be able to stream to a broadcast address. Prior to the patch, trying to stream to a broadcast address was resulting to the following error: av_interleaved_write_frame(): Permission denied The patch has been tested with: ffmpeg -f v4l2 -framerate 30 -input_format yuyv422 -video_size 640x480 -i /dev/video0 \ -c:v libx264 -profile:v high -preset ultrafast -tune zerolatency -b:v 500k -pix_fmt yuv420p \ -f mpegts udp://192.168.1.255:5004?broadcast=1 I have added an option to let the user explicitly request broadcast in order to avoid ffmpeg to broadcast unintentionally. Signed-off-by: Olivier Langlois <olivier(a)trillion01.com> --- libavformat/udp.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/udp.c b/libavformat/udp.c index d9a18d5..7d204c9 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -62,6 +62,7 @@ typedef struct { int ttl; int buffer_size; int is_multicast; + int is_broadcast; int local_port; int reuse_socket; int overrun_nonfatal; @@ -96,6 +97,7 @@ static const AVOption options[] = { {"localaddr", "choose local IP address", OFFSET(local_addr), AV_OPT_TYPE_STRING, {.str = ""}, 0, 0, D|E }, {"pkt_size", "set size of UDP packets", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = 1472}, 0, INT_MAX, D|E }, {"reuse", "explicitly allow or disallow reusing UDP sockets", OFFSET(reuse_socket), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, +{"broadcast", "explicitly allow or disallow broadcast destination", OFFSET(is_broadcast), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E }, {"ttl", "set the time to live value (for multicast only)", OFFSET(ttl), AV_OPT_TYPE_INT, {.i64 = 16}, 0, INT_MAX, E }, {"connect", "set if connect() should be called on socket", OFFSET(is_connected), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, /* TODO 'sources', 'block' option */ @@ -602,6 +604,8 @@ static int udp_open(URLContext *h, const char *uri, int flags) } if (!is_output && av_find_info_tag(buf, sizeof(buf), "timeout", p)) s->timeout = strtol(buf, NULL, 10); + if (is_output && av_find_info_tag(buf, sizeof(buf), "broadcast", p)) + s->is_broadcast = strtol(buf, NULL, 10); } /* handling needed to support options picking from both AVOption and URL */ s->circular_buffer_size *= 188; @@ -642,6 +646,11 @@ static int udp_open(URLContext *h, const char *uri, int flags) goto fail; } + if (s->is_broadcast) { + if (setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), sizeof(s->is_broadcast)) != 0) + goto fail; + } + /* If multicast, try binding the multicast address first, to avoid * receiving UDP packets from other sources aimed at the same UDP * port. This fails on windows. This makes sending to the same address -- 1.9.1

2 2

Use rac_get_prob_branchy in any conditional branches
by Matt Oliver 13 May '14

13 May '14

After a discussion in another thread about some optimisation to vp56_rac_get_prob it was pointed out by Reimar that all conditional branches should be using the rac_get_prob_branchy function variant. Im going to quote Reimar directly on this one: "That should be wrong. All the ifs should be using the _branchy variant" Anyway many of the older vp5 and vp6 codecs are not using the _branchy variant at all. So before this conversation was forgotten and relegated to the mailing list archives I did a quick replace and updated all instance to the branchy version where that function was used in a if statement.

2 1