August 2013 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] avutil: add av_get_colorspace_name()
by Michael Niedermayer 19 Sep '13

19 Sep '13

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/utils.c | 21 ++++++--------------- libavutil/frame.c | 18 ++++++++++++++++++ libavutil/frame.h | 2 ++ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index faa6a16..4dc8748 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2592,6 +2592,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) case AVMEDIA_TYPE_VIDEO: if (enc->pix_fmt != AV_PIX_FMT_NONE) { char detail[256] = "("; + const char *colorspace_name; snprintf(buf + strlen(buf), buf_size - strlen(buf), ", %s", av_get_pix_fmt_name(enc->pix_fmt)); @@ -2601,21 +2602,11 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) if (enc->color_range != AVCOL_RANGE_UNSPECIFIED) av_strlcatf(detail, sizeof(detail), enc->color_range == AVCOL_RANGE_MPEG ? "TV, ": "PC, "); - if (enc->colorspace<9U) { - static const char *name[] = { - "GBR", - "bt709", - NULL, - NULL, - "fcc", - "bt470bg", - "smpte170m", - "smpte240m", - "YCgCo", - }; - if (name[enc->colorspace]) - av_strlcatf(detail, sizeof(detail), "%s, ", name[enc->colorspace]); - } + + colorspace_name = av_get_colorspace_name(enc->colorspace); + if (colorspace_name) + av_strlcatf(detail, sizeof(detail), "%s, ", colorspace_name); + if (strlen(detail) > 1) { detail[strlen(detail) - 2] = 0; av_strlcatf(buf, buf_size, "%s)", detail); diff --git a/libavutil/frame.c b/libavutil/frame.c index b0fdd49..4f2a5b8 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -70,6 +70,24 @@ int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type) return f->qp_table_buf->data; } +const char *av_get_colorspace_name(enum AVColorSpace val) +{ + static const char *name[] = { + "GBR", + "bt709", + NULL, + NULL, + "fcc", + "bt470bg", + "smpte170m", + "smpte240m", + "YCgCo", + }; + if (val < 0 || val >= FF_ARRAY_ELEMS(name)) + return NULL; + return name[val]; +} + static void get_frame_defaults(AVFrame *frame) { if (frame->extended_data != frame->data) diff --git a/libavutil/frame.h b/libavutil/frame.h index 3313703..98410b9 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -508,6 +508,8 @@ void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val); enum AVColorRange av_frame_get_color_range(const AVFrame *frame); void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val); +const char *av_get_colorspace_name(enum AVColorSpace val); + /** * Allocate an AVFrame and set its fields to default values. The resulting * struct must be freed using av_frame_free(). -- 1.7.9.5

2 4

[PATCH] ffprobe: add -ss option
by Stefano Sabatini 19 Sep '13

19 Sep '13

This is useful to test seeking on an input file. TODO: add Changelog entry --- doc/ffprobe.texi | 4 ++++ ffprobe.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 6295eb3..c2adcc4 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -162,6 +162,10 @@ corresponding stream section. Count the number of packets per stream and report it in the corresponding stream section. +@item -ss @var{seek_point} +Seek input to position specified by @var{seek_point}. +@var{seek_point} must be a duration specification. + @item -show_private_data, -private Show private data, that is data depending on the format of the particular shown element. diff --git a/ffprobe.c b/ffprobe.c index 1cf6c42..27f8638 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -70,6 +70,7 @@ static int show_private_data = 1; static char *print_format; static char *stream_specifier; +static int64_t seek_point = -INT64_MAX; /* section structure definition */ @@ -1863,6 +1864,24 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename) av_dump_format(fmt_ctx, 0, filename, 0); + if (seek_point > -INT64_MAX) { + // add the stream start time, should it exist + if (fmt_ctx->start_time != AV_NOPTS_VALUE) { + if (seek_point > INT64_MAX - fmt_ctx->start_time) { + av_log(NULL, AV_LOG_ERROR, + "Seek point value %"PRId64" overflow with start time value:%"PRId64"\n", + seek_point, fmt_ctx->start_time); + return AVERROR(EINVAL); + } + seek_point += fmt_ctx->start_time; + } + if ((err = av_seek_frame(fmt_ctx, -1, seek_point, AVSEEK_FLAG_BACKWARD)) < 0) { + av_log(NULL, AV_LOG_ERROR, "Could not seek to position %"PRId64"\n", + seek_point); + return err; + } + } + /* bind a decoder to each input stream */ for (i = 0; i < fmt_ctx->nb_streams; i++) { AVStream *stream = fmt_ctx->streams[i]; @@ -2056,6 +2075,12 @@ void show_help_default(const char *opt, const char *arg) show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM); } +static int opt_seek_point(void *optctx, const char *opt, const char *arg) +{ + seek_point = parse_time_or_die(opt, arg, 1); + return 0; +} + static int opt_pretty(void *optctx, const char *opt, const char *arg) { show_value_unit = 1; @@ -2103,6 +2128,7 @@ static const OptionDef real_options[] = { { "show_private_data", OPT_BOOL, {(void*)&show_private_data}, "show private data" }, { "private", OPT_BOOL, {(void*)&show_private_data}, "same as show_private_data" }, { "bitexact", OPT_BOOL, {&do_bitexact}, "force bitexact output" }, + { "ss", HAS_ARG, {.func_arg = opt_seek_point}, "seek input to the specified seek point", "seek_point" }, { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {.func_arg = opt_default}, "generic catch all option", "" }, { "i", HAS_ARG, {.func_arg = opt_input_file_i}, "read specified file", "input_file"}, { NULL, }, -- 1.7.5.4

3 12

[RFC] Dynamic filtergraph reconfiguration
by Stefano Sabatini 16 Sep '13

16 Sep '13

Hi, maybe it's time to finally tackle this, since it seems to be a recurring issue. Sometimes the input of the filterchain changes configuration parameters. For audio it means it could change channel layout/sample rate/sample format/timebase, for video it may change frame rate, size, pixel format, sample aspect ratio and timebase. Basically most filters assume these values to be invariant during the whole life of the filtergraph, others (e.g. the scale filter) monitors *some* of the input values and reconfigure themselves accordingly, sometimes calling configure on the following filters (which may or may not be correct). We need to make reconfiguration consistently applied at the framework level, and properly design it, in order to avoid brittle code and glitches. Problems to tackle are: - not all filters may support reconfigurations, for example some filters rely on some specific values defined during configuration, so in general we need a mechanism which allows to reconfigure only the filters which can do that - some filters may support only *one* parameter change (e.g. timebase may easily change). - since we don't mark codecs/containers which support variable configuration parameters (do we?), we may need to "normalize" the output before the terminal sink (depending on the application). Related questions: where should we check the changes (possibly in the framework code)? Where should we add the "buffer" filters which normalize input towards a "non-reconfigurable" filter (possibly we should auto-insert it only when required). Filter supporting reconfiguration should be marked as such (or alternatively we may mark filters *not* supporting it). Also I wonder if we should also support filters where the *number* of inputs or outputs change dinamically (e.g. a movie source which adds a new stream). I'll try to come with a more detailed design and proof of concept once we'll clear some of the design issues. -- FFmpeg = Frightening and Faithful Murdering Pacific Explosive Guru

4 3

[PATCH 1/2] avcodec/jpeg2000dec: Check cdx/y values more carefully
by Michael Niedermayer 15 Sep '13

15 Sep '13

Some invalid values where not handled correctly in the later pixel format matching code. Fixes out of array accesses Fixes Ticket2848 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/jpeg2000dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 3c14a13..34ac536 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -273,7 +273,8 @@ static int get_siz(Jpeg2000DecoderContext *s) s->sgnd[i] = !!(x & 0x80); s->cdx[i] = bytestream2_get_byteu(&s->g); s->cdy[i] = bytestream2_get_byteu(&s->g); - if (!s->cdx[i] || !s->cdy[i]) { + if ( !s->cdx[i] || s->cdx[i] == 3 || s->cdx[i] > 4 + || !s->cdy[i] || s->cdy[i] == 3 || s->cdy[i] > 4) { av_log(s->avctx, AV_LOG_ERROR, "Invalid sample seperation\n"); return AVERROR_INVALIDDATA; } -- 1.7.9.5

1 3

[PATCH] avfilter: avoid testing float == 0
by Michael Niedermayer 15 Sep '13

15 Sep '13

This fixes the hypothetical case of rounding errors causing incorrect values to be used. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavfilter/avfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 3f94dde..6c3cb05 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -994,7 +994,7 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) dstctx->var_values[VAR_T] = pts == AV_NOPTS_VALUE ? NAN : pts * av_q2d(link->time_base); dstctx->var_values[VAR_POS] = pos == -1 ? NAN : pos; - dstctx->is_disabled = !av_expr_eval(dstctx->enable, dstctx->var_values, NULL); + dstctx->is_disabled = fabs( av_expr_eval(dstctx->enable, dstctx->var_values, NULL) ) < 0.5; if (dstctx->is_disabled) filter_frame = dst->passthrough_filter_frame ? dst->passthrough_filter_frame : default_filter_frame; -- 1.7.9.5

3 4

[PATCH 2/3] avpacket: Removing a memset that could cause double free
by Vignesh Venkatasubramanian 12 Sep '13

12 Sep '13

Removing a memset from copy_side_data which could potentially cause double free. Signed-off-by: Vignesh Venkatasubramanian <vigneshv(a)google.com> --- libavcodec/avpacket.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 7196c31..ac761f1 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -225,8 +225,6 @@ int av_copy_packet_side_data(AVPacket *pkt, AVPacket *src) int i; DUP_DATA(pkt->side_data, src->side_data, src->side_data_elems * sizeof(*src->side_data), 0, ALLOC_MALLOC); - memset(pkt->side_data, 0, - src->side_data_elems * sizeof(*src->side_data)); for (i = 0; i < src->side_data_elems; i++) { DUP_DATA(pkt->side_data[i].data, src->side_data[i].data, src->side_data[i].size, 1, ALLOC_MALLOC); -- 1.8.4

3 14

[PATCH] add const to pix_fmt_lists in find_best
by Dylan Alex Simon 11 Sep '13

11 Sep '13

Passing AVCodec.pix_fmts to avcodec_find_best_pix_fmt_of_list results in a warning of non-constness. This patch adds const to the argument to avoid this warning. (If this is not something I should be doing in the first place, let me know.) Patch is attached and also available in github.com/dylex/FFmpeg.

2 2

[PATCH 1/2] opus/matroska: Adding support for DiscardPadding in muxer
by Vignesh Venkatasubramanian 11 Sep '13

11 Sep '13

Support for end trimming Opus in Matroska is implemented by using the DiscardPadding container element in the Block data. The last chunk is stored as a Block instead of SimpleBlock and the trimming information is stored and used to discard samples that were padded by the Opus codec. This patch adds support for muxing DiscardPadding element into the container with appropriate value. Matroska spec for the DiscardPadding element can be found here: http://matroska.org/technical/specs/index.html#DiscardPadding Signed-off-by: Vignesh Venkatasubramanian <vigneshv(a)google.com> --- libavcodec/avpacket.c | 2 -- libavcodec/libopusenc.c | 12 ++++++++++++ libavformat/matroska.h | 1 + libavformat/matroskaenc.c | 24 ++++++++++++++++++++++-- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 7196c31..ac761f1 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -225,8 +225,6 @@ int av_copy_packet_side_data(AVPacket *pkt, AVPacket *src) int i; DUP_DATA(pkt->side_data, src->side_data, src->side_data_elems * sizeof(*src->side_data), 0, ALLOC_MALLOC); - memset(pkt->side_data, 0, - src->side_data_elems * sizeof(*src->side_data)); for (i = 0; i < src->side_data_elems; i++) { DUP_DATA(pkt->side_data[i].data, src->side_data[i].data, src->side_data[i].size, 1, ALLOC_MALLOC); diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 59caac7..775b2ef 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -354,6 +354,18 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt, ff_af_queue_remove(&opus->afq, opus->opts.packet_size, &avpkt->pts, &avpkt->duration); + if (opus->opts.packet_size - avpkt->duration > 0) { + uint8_t* side_data = av_packet_new_side_data(avpkt, + AV_PKT_DATA_SKIP_SAMPLES, + 10); + if(side_data == NULL) { + av_free_packet(avpkt); + av_free(avpkt); + return AVERROR(ENOMEM); + } + AV_WL32(side_data + 4, opus->opts.packet_size - avpkt->duration); + } + *got_packet_ptr = 1; return 0; diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 7cf423c..002fc4c 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -198,6 +198,7 @@ #define MATROSKA_ID_BLOCKDURATION 0x9B #define MATROSKA_ID_BLOCKREFERENCE 0xFB #define MATROSKA_ID_CODECSTATE 0xA4 +#define MATROSKA_ID_DISCARDPADDING 0x75A2 /* IDs in the attachments master */ #define MATROSKA_ID_ATTACHEDFILE 0x61A7 diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 92df6cb..7ad35b5 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -43,6 +43,7 @@ #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" +#include "libavcodec/internal.h" typedef struct ebml_master { int64_t pos; ///< absolute offset in the file where the master's elements start @@ -1283,7 +1284,7 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, uint8_t *data = NULL, *side_data = NULL; int offset = 0, size = pkt->size, side_data_size = 0; int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts; - uint64_t additional_id = 0; + uint64_t additional_id = 0, discard_padding = 0; ebml_master block_group, block_additions, block_more; av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " @@ -1309,6 +1310,16 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, } side_data = av_packet_get_side_data(pkt, + AV_PKT_DATA_SKIP_SAMPLES, + &side_data_size); + + if (side_data && side_data_size >= 10) { + discard_padding = av_rescale_q(AV_RL32(side_data + 4), + (AVRational){1, codec->sample_rate}, + (AVRational){1, 1000000000}); + } + + side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size); if (side_data) { @@ -1317,7 +1328,7 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, side_data_size -= 8; } - if (side_data_size && additional_id == 1) { + if ((side_data_size && additional_id == 1) || discard_padding) { block_group = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, 0); blockid = MATROSKA_ID_BLOCK; } @@ -1331,6 +1342,10 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, if (data != pkt->data) av_free(data); + if (discard_padding) { + put_ebml_uint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding); + } + if (side_data_size && additional_id == 1) { block_additions = start_ebml_master(pb, MATROSKA_ID_BLOCKADDITIONS, 0); block_more = start_ebml_master(pb, MATROSKA_ID_BLOCKMORE, 0); @@ -1340,6 +1355,8 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, avio_write(pb, side_data, side_data_size); end_ebml_master(pb, block_more); end_ebml_master(pb, block_additions); + } + if ((side_data_size && additional_id == 1) || discard_padding) { end_ebml_master(pb, block_group); } } @@ -1556,6 +1573,9 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) ret = mkv->cur_audio_pkt.buf ? 0 : AVERROR(ENOMEM); } else ret = av_dup_packet(&mkv->cur_audio_pkt); + if (mkv->cur_audio_pkt.side_data_elems > 0) { + ret = av_copy_packet_side_data(&mkv->cur_audio_pkt, &mkv->cur_audio_pkt); + } } else ret = mkv_write_packet_internal(s, pkt); return ret; -- 1.8.3

3 22

[PATCH]Change stream id for DTS in mpeg program streams
by Carl Eugen Hoyos 10 Sep '13

10 Sep '13

Hi! Attached patch was suggested (and tested) in ticket #1398 (it is not related to the ticket), I don't have access to the relevant specification but several other open source projects use 0x88 for dts in mpegps. The relevant original commit is 23c99253. Please comment, Carl Eugen

4 4

[PATCH] mpeg4videodec: silence "Invalid and inefficient vfw-avi packed B frames detected" warning
by wm4 10 Sep '13

10 Sep '13

--- I mentioned it on IRC, and it wasn't really clear why this message is needed. On the other hand, this is printed with virtually every AVI file, and raises more questions than it answers, so I guess this is up to discussion. --- libavcodec/mpeg4videodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 9ff7574..c8a7d00 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1912,7 +1912,7 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){ s->divx_build= build; s->divx_packed= e==3 && last=='p'; if(s->divx_packed && !s->showed_packed_warning) { - av_log(s->avctx, AV_LOG_WARNING, "Invalid and inefficient vfw-avi packed B frames detected\n"); + av_log(s->avctx, AV_LOG_VERBOSE, "Invalid and inefficient vfw-avi packed B frames detected\n"); s->showed_packed_warning=1; } } -- 1.8.4.rc3

7 36