February 2014 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/2] img2: added support for %t output pattern
by Yuval Adam 05 Dec '16

05 Dec '16

From: Yuval Adam <yuv.adm(a)gmail.com> The image2 muxer now supports timestamps in output filenames. When used in an output patterm '%t' will be replaced with the frames timestamp in hours, minutes and seconds (hh:mm:ss). Signed-off-by: Yuval Adam <yuv.adm(a)gmail.com> --- doc/muxers.texi | 5 +++++ libavformat/avformat.h | 6 ++++-- libavformat/img2.c | 13 ++++++++----- libavformat/utils.c | 32 +++++++++++++++++++++++++------- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 60a72d6..72212fe 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -109,6 +109,11 @@ If the pattern contains "%d" or "%0@var{N}d", the first filename of the file list specified will contain the number 1, all the following numbers will be sequential. +The pattern may also contain "%t", this string specifies the timestamp +of the frame in hours, minutes and seconds. Note that if two frames are written at the +same second, they will be overwritten, yielding a maximum output of 1 fps. +The "%t" and "%d" patterns may not be used simultaneously. + The pattern may contain a suffix which is used to automatically determine the format of the image files to write. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2ed6b56..a9ab0cc 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2067,7 +2067,8 @@ attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1 #endif /** - * Return in 'buf' the path with '%d' replaced by a number. + * Return in 'buf' the path with '%d' replaced by the frame number, + * and '%t' replaced by the frame timestamp. * * Also handles the '%0nd' format where 'n' is the total number * of digits and '%%'. @@ -2076,10 +2077,11 @@ attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1 * @param buf_size destination buffer size * @param path numbered sequence string * @param number frame number + * @param ts frame timestamp in seconds * @return 0 if OK, -1 on format error */ int av_get_frame_filename(char *buf, int buf_size, - const char *path, int number); + const char *path, int number, int ts); /** * Check whether filename actually is a numbered sequence generator. diff --git a/libavformat/img2.c b/libavformat/img2.c index bc35591..8012e5b 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -142,7 +142,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, /* find the first image */ for(first_index = 0; first_index < 5; first_index++) { - if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){ + if (av_get_frame_filename(buf, sizeof(buf), path, first_index, 0) < 0){ *pfirst_index = *plast_index = 1; if (avio_check(buf, AVIO_FLAG_READ) > 0) @@ -165,7 +165,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, else range1 = 2 * range; if (av_get_frame_filename(buf, sizeof(buf), path, - last_index + range1) < 0) + last_index + range1, 0) < 0) goto fail; if (avio_check(buf, AVIO_FLAG_READ) <= 0) break; @@ -310,7 +310,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) if (s->img_number > s->img_last) return AVERROR_EOF; if (av_get_frame_filename(filename, sizeof(filename), - s->path, s->img_number)<0 && s->img_number > 1) + s->path, s->img_number, 0)<0 && s->img_number > 1) return AVERROR(EIO); for(i=0; i<3; i++){ if (avio_open2(&f[i], filename, AVIO_FLAG_READ, @@ -389,12 +389,15 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) VideoData *img = s->priv_data; AVIOContext *pb[3]; char filename[1024]; - AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec; + AVStream *stream = s->streams[ pkt->stream_index ]; + AVCodecContext *codec = stream->codec; int i; + int ts = av_rescale_q(pkt->pts, stream->time_base, AV_TIME_BASE_Q) / AV_TIME_BASE; + if (!img->is_pipe) { if (av_get_frame_filename(filename, sizeof(filename), - img->path, img->img_number) < 0 && img->img_number>1 && !img->updatefirst) { + img->path, img->img_number, ts) < 0 && img->img_number>1 && !img->updatefirst) { av_log(s, AV_LOG_ERROR, "Could not get frame filename number %d from pattern '%s'\n", img->img_number, img->path); diff --git a/libavformat/utils.c b/libavformat/utils.c index f0df759..6db2db0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -319,7 +319,7 @@ int av_append_packet(AVIOContext *s, AVPacket *pkt, int size) int av_filename_number_test(const char *filename) { char buf[1024]; - return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); + return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1, 0)>=0); } AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret) @@ -3774,15 +3774,16 @@ int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info) #endif int av_get_frame_filename(char *buf, int buf_size, - const char *path, int number) + const char *path, int number, int ts) { const char *p; char *q, buf1[20], c; - int nd, len, percentd_found; + int nd, len, percent_found; + int hours, mins, secs; q = buf; p = path; - percentd_found = 0; + percent_found = 0; for(;;) { c = *p++; if (c == '\0') @@ -3800,9 +3801,9 @@ int av_get_frame_filename(char *buf, int buf_size, case '%': goto addchar; case 'd': - if (percentd_found) + if (percent_found) goto fail; - percentd_found = 1; + percent_found = 1; snprintf(buf1, sizeof(buf1), "%0*d", nd, number); len = strlen(buf1); if ((q - buf + len) > buf_size - 1) @@ -3810,6 +3811,23 @@ int av_get_frame_filename(char *buf, int buf_size, memcpy(q, buf1, len); q += len; break; + case 't': + if (percent_found) + goto fail; + percent_found = 1; + secs = ts % 60; + ts /= 60; + mins = ts % 60; + ts /= 60; + hours = ts; + snprintf(buf1, sizeof(buf1), + "%02d:%02d:%02d", hours, mins, secs); + len = strlen(buf1); + if ((q - buf + len) > buf_size - 1) + goto fail; + memcpy(q, buf1, len); + q += len; + break; default: goto fail; } @@ -3819,7 +3837,7 @@ int av_get_frame_filename(char *buf, int buf_size, *q++ = c; } } - if (!percentd_found) + if (!percent_found) goto fail; *q = '\0'; return 0; -- 1.7.2.2

4 22

Re: [FFmpeg-devel] [PATCH] Flush last frame in WMA lossless decoder
by Mashiat Sarker Shakkhar 10 Apr '16

10 Apr '16

On 5/2/2012 11:56 AM, Michael Niedermayer wrote: > On Wed, May 02, 2012 at 03:42:41AM +0600, Mashiat Sarker Shakkhar wrote: >> On 5/2/2012 2:49 AM, Michael Niedermayer wrote: >>> On Sun, Apr 29, 2012 at 10:43:47PM +0200, Jakub Stachowski wrote: >>>> Hello >>>> >>>> Here is cleaned up version of my patches to flush last frames and >>>> skip right number of samples in WMA lossless decoder. This causes >>>> ffmpeg to output the same number of samples as wmal2pcm.exe which I >>>> use as reference. [...] Hi The patch looks OK to the extent of my apprehension. And for the record, I have tested this patch and it fixes luckynight.wma. Patch has cosmetic issues, but that's another matter. Shakkhar P.S. Jakub, why did you use git send-email to send the patch? I tried and failed to review your patch on Gmane.

3 9

[PATCH] Support Ctrl+Break in ffmpeg.exe on Windows as if it was Ctrl+C
by Joe Wreschnig 30 Jun '15

30 Jun '15

On Windows, the Ctrl+Break key combination usually does what Ctrl+C does. It is more common for processes to send other processes Ctrl+Break rather than Ctrl+C, because sending Ctrl+C / SIGINT doesn't work if you started a child in a new process group. This patch makes ffmpeg.exe register what Windows calls a console control event handler, which allows it to intercept Ctrl+Break. It hands it off directly to the usual SIGINT/SIGTERM handler. The same function also processes closing the console window, mapping it to SIGTERM. Obviously, this is only enabled if compiling for a platform where SetConsoleCtrlHandler is available (i.e. modern Windows). (I've also submitted this as a ticket at https://ffmpeg.org/trac/ffmpeg/ticket/1463 but it was recommended I post it here also.)

5 17

jpeg2000: unsupported marker 0xFF5F at pos 0x73
by Wolfgang Woehl 12 Jun '15

12 Jun '15

See fdfcde74_excerpt_000000-000023 (on ftp://upload.ffmpeg.org/MPlayer/incoming/ as suggested by ffplay). The dir contains a MXF (DCI specs) with 24 4K frames and a 1/4-sized proxy video of that segment. The source MXF is real-world and currently in distribution. It was apparently generated with a Clipster system and asdcp-info says http://pastebin.com/raw.php?i=FFnHrW6K about it. ffplay (3e0c78b as of today) says http://pastebin.com/raw.php?i=df5sJDth when trying to play the excerpt MXF and fails to generate frames -- essentially the same as for the source MXF. Yes, the console output is that garbled. Wolfgang

3 9

[PATCH]Accept startcode 001 when remuxing H264 into mpegts
by Carl Eugen Hoyos 26 Feb '15

26 Feb '15

Hi! Attached patch fixes remuxing of h264 into mpeg-ts for some wtv input files. Please review, Carl Eugen

2 3

[PATCH 1/2] lavfi: remove mp=ilpack filter
by Paul B Mahol 27 Jan '15

27 Jan '15

The filter does not work, asserts here. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- doc/filters.texi | 1 - libavfilter/Makefile | 1 - libavfilter/libmpcodecs/vf_ilpack.c | 458 ------------------------------------ libavfilter/vf_mp.c | 2 - 4 files changed, 462 deletions(-) delete mode 100644 libavfilter/libmpcodecs/vf_ilpack.c Boring stuff removed.

6 13

[PATCH] avfilter: port qp filter from libmpcodecs
by Paul B Mahol 14 Jan '15

14 Jan '15

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- doc/filters.texi | 32 ++++++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_qp.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 libavfilter/vf_qp.c diff --git a/doc/filters.texi b/doc/filters.texi index 915f310..e7cac2d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6236,6 +6236,38 @@ The main purpose of setting @option{mp} to a chroma plane is to reduce CPU load and make pullup usable in realtime on slow machines. @end table +@section qp + +Quantization Parameter (QP) change filter. + +The filter accepts the following option: + +@table @option +@item qp +Set expression for quantization parameter. +@end table + +The expression is evaluated through the eval API and can contain, among others, +the following constants: + +@table @option +@item known +1 if index is not 129, 0 otherwise. + +@item qp +Sequentional index starting from -129 to 128. +@end table + +@subsection Examples + +@itemize +@item +Some equatition like: +@example +qp=2+2*sin(PI*qp) +@end example +@end itemize + @section removelogo Suppress a TV station logo, using an image file to determine which diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 198bf4c..5dc8389 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -174,6 +174,7 @@ OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o OBJS-$(CONFIG_PP_FILTER) += vf_pp.o OBJS-$(CONFIG_PSNR_FILTER) += vf_psnr.o dualinput.o OBJS-$(CONFIG_PULLUP_FILTER) += vf_pullup.o +OBJS-$(CONFIG_QP_FILTER) += vf_qp.o OBJS-$(CONFIG_REMOVELOGO_FILTER) += bbox.o lswsutils.o lavfutils.o vf_removelogo.o OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o OBJS-$(CONFIG_SEPARATEFIELDS_FILTER) += vf_separatefields.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 2825304..69e6cab 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -169,6 +169,7 @@ void avfilter_register_all(void) REGISTER_FILTER(PP, pp, vf); REGISTER_FILTER(PSNR, psnr, vf); REGISTER_FILTER(PULLUP, pullup, vf); + REGISTER_FILTER(QP, qp, vf); REGISTER_FILTER(REMOVELOGO, removelogo, vf); REGISTER_FILTER(ROTATE, rotate, vf); REGISTER_FILTER(SAB, sab, vf); diff --git a/libavfilter/vf_qp.c b/libavfilter/vf_qp.c new file mode 100644 index 0000000..b5b122e --- /dev/null +++ b/libavfilter/vf_qp.c @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2004 Michael Niedermayer <michaelni(a)gmx.at> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <math.h> +#include "libavutil/eval.h" +#include "libavutil/imgutils.h" +#include "libavutil/pixdesc.h" +#include "libavutil/opt.h" +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "video.h" + +typedef struct QPContext { + const AVClass *class; + char *qp_expr_str; + int8_t lut[257]; + int8_t *qp; + int h, qstride; +} QPContext; + +#define OFFSET(x) offsetof(QPContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption qp_options[] = { + { "qp", "set qp expression", OFFSET(qp_expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(qp); + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + QPContext *s = ctx->priv; + int i; + + if (!s->qp_expr_str) + return 0; + + s->h = (inlink->h + 15) >> 4; + s->qstride = (inlink->w + 15) >> 4; + av_reallocp_array(&s->qp, s->qstride * s->h, sizeof(*s->qp)); + if (!s->qp) + return AVERROR(ENOMEM); + + for (i = -129; i < 128; i++) { + double var_values[] = { i != -129, i, 0 }; + static const char *var_names[] = { "known", "qp", NULL }; + double temp_val; + int ret; + + ret = av_expr_parse_and_eval(&temp_val, s->qp_expr_str, + var_names, var_values, + NULL, NULL, NULL, NULL, 0, 0, ctx); + if (ret < 0) + return ret; + + s->lut[i + 129] = lrintf(temp_val); + } + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + QPContext *s = ctx->priv; + AVFrame *out; + + if (!s->qp_expr_str || ctx->is_disabled) + return ff_filter_frame(outlink, in); + + out = av_frame_clone(in); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + + out->qscale_table = s->qp; + out->qstride = s->qstride; + + if (in->qscale_table) { + int y, x; + + for (y = 0; y < s->h; y++) + for (x = 0; x < out->qstride; x++) + out->qscale_table[x + out->qstride * y] = s->lut[129 + + ((int8_t)in->qscale_table[x + in->qstride * y])]; + } else { + int y, x, qp = s->lut[0]; + + for (y = 0; y < s->h; y++) + for (x = 0; x < out->qstride; x++) + out->qscale_table[x + out->qstride * y] = qp; + } + + av_frame_free(&in); + return ff_filter_frame(outlink, out); +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + QPContext *s = ctx->priv; + + av_freep(&s->qp); +} + +static const AVFilterPad qp_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + .config_props = config_input, + }, + { NULL } +}; + +static const AVFilterPad qp_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +AVFilter avfilter_vf_qp = { + .name = "qp", + .description = NULL_IF_CONFIG_SMALL("Change Quantization Parameter."), + .priv_size = sizeof(QPContext), + .uninit = uninit, + .inputs = qp_inputs, + .outputs = qp_outputs, + .priv_class = &qp_class, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, +}; -- 1.7.11.2

6 19

[PATCH 0/4] Probe device API
by Lukasz Marek 13 Jan '15

13 Jan '15

This is probing API implementation which started from thread http://ffmpeg.org/pipermail/ffmpeg-devel/2014-January/153614.html It uses AVOptions API with some kind of abstraction layer. I wonder if adding pointer option safe? Lukasz Marek (4): [RFC]lavu/opt: add pointer option lavd: add device capabilities API lavd/opengl_enc: implement query capabilities API examples: opengl_device_settings doc/examples/Makefile | 1 + doc/examples/opengl_device_settings.c | 176 ++++++++++++++++++ libavdevice/avdevice.c | 191 ++++++++++++++++++++ libavdevice/avdevice.h | 238 +++++++++++++++++++++++++ libavdevice/opengl_enc.c | 326 +++++++++++++++++++++++++++++++++- libavdevice/version.h | 2 +- libavformat/avformat.h | 12 ++ libavformat/version.h | 2 +- libavutil/opt.c | 16 ++ libavutil/opt.h | 2 + 10 files changed, 959 insertions(+), 7 deletions(-) create mode 100644 doc/examples/opengl_device_settings.c -- 1.8.3.2

6 25

[PATCH] cdxl: fix duration
by Piotr Bandurski 22 Dec '14

22 Dec '14

fixes ticket #1937

4 10

[PATCH] avcodec/libxavs: remove global header code
by Michael Niedermayer 06 Dec '14

06 Dec '14

The code does not work, also the resulting files cannot be played when one fixes the code so it doesnt crash Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/libxavs.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index ffe3411..91507f4 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -200,7 +200,6 @@ static av_cold int XAVS_close(AVCodecContext *avctx) { XavsContext *x4 = avctx->priv_data; - av_freep(&avctx->extradata); av_free(x4->sei); av_freep(&x4->pts_buffer); @@ -346,9 +345,6 @@ static av_cold int XAVS_init(AVCodecContext *avctx) x4->params.i_threads = avctx->thread_count; x4->params.b_interlaced = avctx->flags & CODEC_FLAG_INTERLACED_DCT; - if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) - x4->params.b_repeat_headers = 0; - x4->enc = xavs_encoder_open(&x4->params); if (!x4->enc) return -1; @@ -360,32 +356,6 @@ static av_cold int XAVS_init(AVCodecContext *avctx) if (!avctx->coded_frame) return AVERROR(ENOMEM); - /* TAG: Do we have GLOBAL HEADER in AVS */ - /* We Have PPS and SPS in AVS */ - if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { - xavs_nal_t *nal; - int nnal, s, i, size; - uint8_t *p; - - s = xavs_encoder_headers(x4->enc, &nal, &nnal); - - avctx->extradata = p = av_malloc(s); - for (i = 0; i < nnal; i++) { - /* Don't put the SEI in extradata. */ - if (nal[i].i_type == NAL_SEI) { - x4->sei = av_malloc( 5 + nal[i].i_payload * 4 / 3 ); - if (xavs_nal_encode(x4->sei, &x4->sei_size, 1, nal + i) < 0) - return -1; - - continue; - } - size = xavs_nal_encode(p, &s, 1, nal + i); - if (size < 0) - return -1; - p += size; - } - avctx->extradata_size = p - avctx->extradata; - } return 0; } -- 1.7.9.5

1 1