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

[PATCH] img2enc: add option to use strftime() for filename
by Ramiro Polla 08 Jan '14

08 Jan '14

Hello, Attached patch adds option to use strftime() for img2enc filename, as such: ffmpeg -f video4linux2 -r 1 -re -i /dev/video0 -strftime 1 "%Y-%m-%d_%H-%M-%S.jpg" Ramiro

3 4

[PATCH] lavfi/volume: add dynamic expression evaluation
by Stefano Sabatini 25 Dec '13

25 Dec '13

TODO: update docs, bump micro --- libavfilter/af_volume.c | 120 ++++++++++++++++++++++++++++++++++++----------- libavfilter/af_volume.h | 20 ++++++++ 2 files changed, 113 insertions(+), 27 deletions(-) diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c index 5ffa1fe..87898c8 100644 --- a/libavfilter/af_volume.c +++ b/libavfilter/af_volume.c @@ -29,6 +29,7 @@ #include "libavutil/eval.h" #include "libavutil/float_dsp.h" #include "libavutil/opt.h" +#include "libavutil/time.h" #include "audio.h" #include "avfilter.h" #include "formats.h" @@ -39,13 +40,28 @@ static const char *precision_str[] = { "fixed", "float", "double" }; +static const char *const var_names[] = { + "N", ///< frame number (starting at zero) + "NB_CONSUMED_SAMPLES", ///< number of samples consumed by the filter (only audio) + "NB_SAMPLES", ///< number of samples in the current frame (only audio) + "POS", ///< original position in the file of the frame + "PTS", ///< original pts in the file of the frame + "RTC_STARTT", ///< start wallclock (RTC) time in micro seconds + "SAMPLE_RATE", ///< sample rate (only audio) + "STARTPTS", ///< PTS at start of stream + "STARTT", ///< time at start of stream + "T", ///< original time in the file of the frame + "TB", ///< timebase + NULL +}; + #define OFFSET(x) offsetof(VolumeContext, x) #define A AV_OPT_FLAG_AUDIO_PARAM #define F AV_OPT_FLAG_FILTERING_PARAM static const AVOption volume_options[] = { - { "volume", "set volume adjustment", - OFFSET(volume), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 }, 0, 0x7fffff, A|F }, + { "volume", "set volume adjustment expression", + OFFSET(volume_expr), AV_OPT_TYPE_STRING, { .str = "1.0" }, .flags = A|F }, { "precision", "select mathematical precision", OFFSET(precision), AV_OPT_TYPE_INT, { .i64 = PRECISION_FLOAT }, PRECISION_FIXED, PRECISION_DOUBLE, A|F, "precision" }, { "fixed", "select 8-bit fixed-point", 0, AV_OPT_TYPE_CONST, { .i64 = PRECISION_FIXED }, INT_MIN, INT_MAX, A|F, "precision" }, @@ -68,21 +84,25 @@ static av_cold int init(AVFilterContext *ctx, const char *args) if ((ret = av_opt_set_from_string(vol, args, shorthand, "=", ":")) < 0) return ret; - if (vol->precision == PRECISION_FIXED) { - vol->volume_i = (int)(vol->volume * 256 + 0.5); - vol->volume = vol->volume_i / 256.0; - av_log(ctx, AV_LOG_VERBOSE, "volume:(%d/256)(%f)(%1.2fdB) precision:fixed\n", - vol->volume_i, vol->volume, 20.0*log(vol->volume)/M_LN10); - } else { - av_log(ctx, AV_LOG_VERBOSE, "volume:(%f)(%1.2fdB) precision:%s\n", - vol->volume, 20.0*log(vol->volume)/M_LN10, - precision_str[vol->precision]); + if ((ret = av_expr_parse(&vol->volume_pexpr,vol->volume_expr, + var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n", vol->volume_expr); + return ret; } - av_opt_free(vol); + vol->var_values[VAR_N ] = 0.0; + vol->var_values[VAR_STARTPTS] = vol->var_values[VAR_STARTT] = NAN; + return ret; } +static av_cold void uninit(AVFilterContext *ctx) +{ + VolumeContext *vol = ctx->priv; + av_expr_free(vol->volume_pexpr); + av_opt_free(vol); +} + static int query_formats(AVFilterContext *ctx) { VolumeContext *vol = ctx->priv; @@ -182,18 +202,6 @@ static void volume_init(VolumeContext *vol) vol->samples_align = 1; switch (av_get_packed_sample_fmt(vol->sample_fmt)) { - case AV_SAMPLE_FMT_U8: - if (vol->volume_i < 0x1000000) - vol->scale_samples = scale_samples_u8_small; - else - vol->scale_samples = scale_samples_u8; - break; - case AV_SAMPLE_FMT_S16: - if (vol->volume_i < 0x10000) - vol->scale_samples = scale_samples_s16_small; - else - vol->scale_samples = scale_samples_s16; - break; case AV_SAMPLE_FMT_S32: vol->scale_samples = scale_samples_s32; break; @@ -221,20 +229,73 @@ static int config_output(AVFilterLink *outlink) vol->channels = av_get_channel_layout_nb_channels(inlink->channel_layout); vol->planes = av_sample_fmt_is_planar(inlink->format) ? vol->channels : 1; - volume_init(vol); + vol->var_values[VAR_TB] = av_q2d(inlink->time_base); + vol->var_values[VAR_RTC_STARTT] = av_gettime(); + vol->var_values[VAR_SAMPLE_RATE] = inlink->sample_rate; + + av_log(inlink->src, AV_LOG_VERBOSE, "TB:%f SAMPLE_RATE:%f RTC_STARTT:%f\n", + vol->var_values[VAR_TB], + vol->var_values[VAR_SAMPLE_RATE], + vol->var_values[VAR_RTC_STARTT]); + volume_init(vol); return 0; } +#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) +#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) +#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb)) + static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) { + AVFilterContext *ctx = inlink->dst; VolumeContext *vol = inlink->dst->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; int nb_samples = buf->audio->nb_samples; AVFilterBufferRef *out_buf; - if (vol->volume == 1.0 || vol->volume_i == 256) - return ff_filter_frame(outlink, buf); + if (isnan(vol->var_values[VAR_STARTPTS])) { + vol->var_values[VAR_STARTPTS] = TS2D(buf->pts); + vol->var_values[VAR_STARTT ] = TS2T(buf->pts, inlink->time_base); + } + vol->var_values[VAR_PTS] = TS2D(buf->pts); + vol->var_values[VAR_T ] = TS2T(buf->pts, inlink->time_base); + vol->var_values[VAR_POS] = buf->pos == -1 ? NAN : buf->pos; + vol->volume = av_expr_eval(vol->volume_pexpr, vol->var_values, NULL); + if (isnan(vol->volume)) { + av_log(ctx, AV_LOG_WARNING, "Invalid value NaN for volume, setting to 0\n"); + vol->volume = 0; + } + + if (vol->precision == PRECISION_FIXED) { + vol->volume_i = (int)(vol->volume * 256 + 0.5); + vol->volume = vol->volume_i / 256.0; + av_log(ctx, AV_LOG_DEBUG, "volume_i:%d/256 volume:%f volume_db:%1.2f\n", + vol->volume_i, vol->volume, 20.0*log(vol->volume)/M_LN10); + } else { + av_log(ctx, AV_LOG_DEBUG, "volume:%f volume_db:%1.2f\n", + vol->volume, 20.0*log(vol->volume)/M_LN10); + } + + if (vol->volume == 1.0 || vol->volume_i == 256) { + out_buf = buf; + goto end; + } + + switch (av_get_packed_sample_fmt(vol->sample_fmt)) { + case AV_SAMPLE_FMT_U8: + if (vol->volume_i < 0x1000000) + vol->scale_samples = scale_samples_u8_small; + else + vol->scale_samples = scale_samples_u8; + break; + case AV_SAMPLE_FMT_S16: + if (vol->volume_i < 0x10000) + vol->scale_samples = scale_samples_s16_small; + else + vol->scale_samples = scale_samples_s16; + break; + } /* do volume scaling in-place if input buffer is writable */ if (buf->perms & AV_PERM_WRITE) { @@ -278,6 +339,10 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) if (buf != out_buf) avfilter_unref_buffer(buf); +end: + vol->var_values[VAR_N] += 1.0; + vol->var_values[VAR_NB_CONSUMED_SAMPLES] += buf->audio->nb_samples; + return ff_filter_frame(outlink, out_buf); } @@ -305,6 +370,7 @@ AVFilter avfilter_af_volume = { .query_formats = query_formats, .priv_size = sizeof(VolumeContext), .init = init, + .uninit = uninit, .inputs = avfilter_af_volume_inputs, .outputs = avfilter_af_volume_outputs, .priv_class = &volume_class, diff --git a/libavfilter/af_volume.h b/libavfilter/af_volume.h index bd7932e..38e43a8 100644 --- a/libavfilter/af_volume.h +++ b/libavfilter/af_volume.h @@ -25,6 +25,7 @@ #define AVFILTER_AF_VOLUME_H #include "libavutil/common.h" +#include "libavutil/eval.h" #include "libavutil/float_dsp.h" #include "libavutil/opt.h" #include "libavutil/samplefmt.h" @@ -35,10 +36,29 @@ enum PrecisionType { PRECISION_DOUBLE, }; +enum VolumeVarName { + VAR_N, + VAR_NB_CONSUMED_SAMPLES, + VAR_NB_SAMPLES, + VAR_POS, + VAR_PTS, + VAR_RTC_STARTT, + VAR_SAMPLE_RATE, + VAR_STARTPTS, + VAR_STARTT, + VAR_T, + VAR_TB, + VAR_VARS_NB +}; + typedef struct VolumeContext { const AVClass *class; AVFloatDSPContext fdsp; enum PrecisionType precision; + const char *volume_expr; + AVExpr *volume_pexpr; + double var_values[VAR_VARS_NB]; + double volume; int volume_i; int channels; -- 1.7.9.5

5 14

[PATCH] dshow: allow for more codecs take 2
by Roger Pack 13 Dec '13

13 Dec '13

Ok after the previous discussion http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2012-October/131942.html it appears the first patch attached (0001 -- re-attached here and modified to apply cleaning to git master) is ok. Also attached is a second patch for better error logging messages. Thank you for your consideration in their regard. -roger-

5 26

[PATCH 0/5] Windows Resource File support
by jamal 26 Nov '13

26 Nov '13

This patchset adds support for Windows Resource files in Windows shared libraries. I thought about doing it for the executables as well, but I'd rather wait until i can get an icon for them. The first four commits add some missing version macros and header dependencies. With this the macros across all libraries will be consistent. This was done because they are needed by the rc files. I implemented this in all libraries except for libavresample. It's not enabled by default and the ffmpeg project isn't maintaining it. Regards jamal (5): avcodec: Add missing include to version.h postproc: Create version.h header swresample: Create version.h header Add missing version macros to libraries Add Windows Resource File support for shared libraries Makefile | 3 +- common.mak | 7 +++++- configure | 15 +++++++++-- libavcodec/Makefile | 3 ++ libavcodec/avcodecres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 + libavdevice/Makefile | 3 ++ libavdevice/avdeviceres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ libavdevice/version.h | 2 + libavfilter/Makefile | 3 ++ libavfilter/avfilterres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ libavfilter/version.h | 2 + libavformat/Makefile | 3 ++ libavformat/avformatres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ libavutil/Makefile | 3 ++ libavutil/avutilres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ libpostproc/Makefile | 6 ++++- libpostproc/postprocess.h | 18 +-------------- libpostproc/postprocessres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ libpostproc/version.h | 47 ++++++++++++++++++++++++++++++++++++++ library.mak | 2 +- libswresample/Makefile | 6 ++++- libswresample/swresample.h | 8 +----- libswresample/swresampleres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ libswresample/version.h | 45 ++++++++++++++++++++++++++++++++++++ libswscale/Makefile | 3 ++ libswscale/swscaleres.rc | 49 ++++++++++++++++++++++++++++++++++++++++ 27 files changed, 541 insertions(+), 32 deletions(-) create mode 100644 libavcodec/avcodecres.rc create mode 100644 libavdevice/avdeviceres.rc create mode 100644 libavfilter/avfilterres.rc create mode 100644 libavformat/avformatres.rc create mode 100644 libavutil/avutilres.rc create mode 100644 libpostproc/postprocessres.rc create mode 100644 libpostproc/version.h create mode 100644 libswresample/swresampleres.rc create mode 100644 libswresample/version.h create mode 100644 libswscale/swscaleres.rc -- 1.7.8.6

6 21

[PATCH] avutil: expand the size of LINE_SZ to 2048.
by Stephen Hutchinson 20 Nov '13

20 Nov '13

It's possible to make FFMPEG_CONFIGURATION exceed the 1024 limit, causing a cosmetic issue when invoking the ff* binaries. 2048 should be more than enough to fit it comfortably. --- libavutil/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/log.c b/libavutil/log.c index 29ad2d0..9ad6875 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -39,7 +39,7 @@ #include "internal.h" #include "log.h" -#define LINE_SZ 1024 +#define LINE_SZ 2048 static int av_log_level = AV_LOG_INFO; static int flags; -- 1.8.1.2

5 20

[RFC] Scripting filter and foreign language bindings
by Stefano Sabatini 18 Nov '13

18 Nov '13

Hi, in many applications it is useful to perform very specific tasks e.g. to coordinate events in a filtergraph. For example, a filter may want to stop/start a stream depending on some external conditions (e.g. according to the result of inspecting the filesystem, or accessing an external DB, etc.). For such needs having a scripting engine in the filtergraph would be the best solution, since it would allow to write the logic in a compact way, relying on scripting and (possibly) external libraries with no need to hack/recompile the library. Thus I'm considering to write a scripting filter as a proof of concept. The filter should be able to load a program specified in the given script, which would provide hooks for the usual callbacks, should be able to process data, process and send events, call a given subsets of the public and private libav* API and such. I'm considering to try at first with Lua, since it seems it was designed with the objective of being easily embeddable in C, but if the experiment works nothing prevents us to extend the idea to other languages. Sending this email in case someone has ideas or recommendations to propose. -- FFmpeg = Forgiving and Frenzy Mysterious Perennial Erotic Gymnast

2 3

[PATCH] build: make sure probed tools don't wait for stdin input.
by Clément Bœsch 09 Nov '13

09 Nov '13

a758c5e added probing for various tools, such as as. Unfortunately, GNU as is reading stdin with -v, and thus configure is stalled with configure arguments such as --as=as. The --version calls are unchanged because it is supposed to -v + exit. Fixes Ticket #1898. --- configure | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 576905c..5dd27c9 100755 --- a/configure +++ b/configure @@ -2545,14 +2545,14 @@ probe_cc(){ unset _depflags _DEPCMD _DEPFLAGS _flags_filter=echo - if $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then + if $_cc -v 2>&1 < /dev/null | grep -q '^gcc.*LLVM'; then _type=llvm_gcc gcc_extra_ver=$(expr "$($_cc --version | head -n1)" : '.*$(.*)$') _ident="llvm-gcc $($_cc -dumpversion) $gcc_extra_ver" _depflags='-MMD -MF $(@:.o=.d) -MT $@' _cflags_speed='-O3' _cflags_size='-Os' - elif $_cc -v 2>&1 | grep -qi ^gcc; then + elif $_cc -v 2>&1 < /dev/null | grep -qi ^gcc; then _type=gcc gcc_version=$($_cc --version | head -n1) gcc_basever=$($_cc -dumpversion) @@ -2571,19 +2571,19 @@ probe_cc(){ _cflags_speed='-O3' _cflags_size='-Os' _cflags_noopt='-O1' - elif $_cc -v 2>&1 | grep -q xlc; then + elif $_cc -v 2>&1 < /dev/null | grep -q xlc; then _type=xlc _ident=$($_cc -qversion 2>/dev/null | head -n1) _cflags_speed='-O5' _cflags_size='-O5 -qcompact' - elif $_cc -V 2>/dev/null | grep -q Compaq; then + elif $_cc -V 2>/dev/null < /dev/null | grep -q Compaq; then _type=ccc _ident=$($_cc -V | head -n1 | cut -d' ' -f1-3) _DEPFLAGS='-M' _cflags_speed='-fast' _cflags_size='-O1' _flags_filter=ccc_flags - elif $_cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then + elif $_cc --vsn 2>/dev/null < /dev/null | grep -q "ARM C/C++ Compiler"; then test -d "$sysroot" || die "No valid sysroot specified." _type=armcc _ident=$($_cc --vsn | head -n1) @@ -2609,13 +2609,13 @@ probe_cc(){ _cflags_speed='-O3 -mf=5' _cflags_size='-O3 -mf=2' _flags_filter=tms470_flags - elif $_cc -v 2>&1 | grep -q clang; then + elif $_cc -v 2>&1 < /dev/null | grep -q clang; then _type=clang _ident=$($_cc --version | head -n1) _depflags='-MMD' _cflags_speed='-O3' _cflags_size='-Os' - elif $_cc -V 2>&1 | grep -q Sun; then + elif $_cc -V 2>&1 < /dev/null | grep -q Sun; then _type=suncc _ident=$($_cc -V 2>&1 | head -n1 | cut -d' ' -f 2-) _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)' @@ -2624,21 +2624,21 @@ probe_cc(){ _cflags_speed='-O5' _cflags_size='-O5 -xspace' _flags_filter=suncc_flags - elif $_cc -v 2>&1 | grep -q 'PathScale\|Path64'; then + elif $_cc -v 2>&1 < /dev/null | grep -q 'PathScale\|Path64'; then _type=pathscale _ident=$($_cc -v 2>&1 | head -n1 | tr -d :) _depflags='-MMD -MF $(@:.o=.d) -MT $@' _cflags_speed='-O2' _cflags_size='-Os' _flags_filter='filter_out -Wdisabled-optimization' - elif $_cc -v 2>&1 | grep -q Open64; then + elif $_cc -v 2>&1 < /dev/null | grep -q Open64; then _type=open64 _ident=$($_cc -v 2>&1 | head -n1 | tr -d :) _depflags='-MMD -MF $(@:.o=.d) -MT $@' _cflags_speed='-O2' _cflags_size='-Os' _flags_filter='filter_out -Wdisabled-optimization|-Wtype-limits|-fno-signed-zeros' - elif $_cc -V 2>&1 | grep -q Portland; then + elif $_cc -V 2>&1 < /dev/null | grep -q Portland; then _type=pgi _ident="PGI $($_cc -V 2>&1 | awk '/^pgcc/ { print $2; exit }')" opt_common='-alias=ansi -Mdse -Mlre -Mpre' @@ -2646,7 +2646,7 @@ probe_cc(){ _cflags_size="-O2 -Munroll=c:1 $opt_common" _cflags_noopt="-O1" _flags_filter=pgi_flags - elif $_cc 2>&1 | grep -q Microsoft; then + elif $_cc 2>&1 < /dev/null | grep -q Microsoft; then _type=msvc _ident=$($cc 2>&1 | head -n1) _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)' @@ -2654,7 +2654,7 @@ probe_cc(){ _cflags_speed="-O2" _cflags_size="-O1" # Nonstandard output options, to avoid msys path conversion issues, relies on wrapper to remap it - if $_cc 2>&1 | grep -q Linker; then + if $_cc 2>&1 < /dev/null | grep -q Linker; then _ld_o='-out $@' else _ld_o='-Fe$@' -- 1.8.1

4 13

[PATCH] ffv1enc: Make ffv1.3 non experimental
by Michael Niedermayer 28 Oct '13

28 Oct '13

The fate tests change as they used 1.2 previously Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/ffv1enc.c | 4 ++-- tests/fate/vcodec.mak | 2 +- tests/ref/seek/vsynth2-ffv1 | 40 ++++++++++++++++++++-------------------- tests/ref/vsynth/vsynth1-ffv1 | 4 ++-- tests/ref/vsynth/vsynth2-ffv1 | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index cc9a1a9..69474e9 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -651,7 +651,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) || avctx->slices>1) s->version = FFMAX(s->version, 2); - if (avctx->level == 3 || (s->version==2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL)) { + if ((avctx->level == 3 || avctx->level <= 0) && s->version == 2) { s->version = 3; } @@ -659,7 +659,7 @@ static av_cold int encode_init(AVCodecContext *avctx) s->ec = (s->version >= 3); } - if (s->version >= 2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + if ((s->version == 2 || s->version>3) && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(avctx, AV_LOG_ERROR, "Version 2 needed for requested features but version 2 is experimental and not enabled\n"); return AVERROR_INVALIDDATA; } diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 7aed089..5f2313c 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -55,7 +55,7 @@ fate-vsynth%-dv-50: DECOPTS = -sws_flags neighbor fate-vsynth%-dv-50: FMT = dv FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 -fate-vsynth%-ffv1: ENCOPTS = -slices 4 -strict -2 +fate-vsynth%-ffv1: ENCOPTS = -slices 4 FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff diff --git a/tests/ref/seek/vsynth2-ffv1 b/tests/ref/seek/vsynth2-ffv1 index 715a272..84e7436 100644 --- a/tests/ref/seek/vsynth2-ffv1 +++ b/tests/ref/seek/vsynth2-ffv1 @@ -1,46 +1,46 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631570 size: 72710 ret:-1 st: 0 flags:1 ts:-0.320000 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801634 size: 69485 ret:-1 st: 0 flags:1 ts:-0.760000 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631570 size: 72710 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801634 size: 69485 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631570 size: 72710 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.680000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801634 size: 69485 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/vsynth/vsynth1-ffv1 b/tests/ref/vsynth/vsynth1-ffv1 index a162a77..22c9341 100644 --- a/tests/ref/vsynth/vsynth1-ffv1 +++ b/tests/ref/vsynth/vsynth1-ffv1 @@ -1,4 +1,4 @@ -d236e8441d7e04e24d882bb97faccd36 *tests/data/fate/vsynth1-ffv1.avi -2689718 tests/data/fate/vsynth1-ffv1.avi +394aa2d2ee50abbc2372e6d126c7eb5a *tests/data/fate/vsynth1-ffv1.avi +2691264 tests/data/fate/vsynth1-ffv1.avi c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1 b/tests/ref/vsynth/vsynth2-ffv1 index 8263b01..6caffdd 100644 --- a/tests/ref/vsynth/vsynth2-ffv1 +++ b/tests/ref/vsynth/vsynth2-ffv1 @@ -1,4 +1,4 @@ -9d8486fc8a260204d8ee3212d95915b5 *tests/data/fate/vsynth2-ffv1.avi -3546258 tests/data/fate/vsynth2-ffv1.avi +0837dc7e6f625e2f6ac16140562c079d *tests/data/fate/vsynth2-ffv1.avi +3547788 tests/data/fate/vsynth2-ffv1.avi dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-ffv1.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 -- 1.7.9.5

8 26

[PATCH] lavu: add av_get_color_string() and use it in -colors option
by stefano.sabatini-lala＠poste.it 27 Oct '13

27 Oct '13

--- cmdutils.c | 13 +++++++++++++ cmdutils.h | 6 ++++++ cmdutils_common_opts.h | 1 + doc/fftools-common-opts.texi | 3 +++ libavutil/parseutils.c | 18 ++++++++++++++++++ libavutil/parseutils.h | 14 ++++++++++++++ 6 files changed, 55 insertions(+), 0 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index 514ebad..549c673 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -713,6 +713,19 @@ void show_pix_fmts(void) } } +void show_colors(void) +{ + char buf[256]; + int i; + + /* print header */ + fprintf(stderr, av_get_color_string(buf, sizeof(buf), -1)); + + for (i = 0; av_get_color_string(buf, sizeof(buf), i); i++) { + printf("%s", buf); + } +} + int read_yesno(void) { int c = getchar(); diff --git a/cmdutils.h b/cmdutils.h index c3d8a42..191ee36 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -195,6 +195,12 @@ void show_formats(void); void show_codecs(void); /** + * Print a listing containing all the color names supported by the + * program. + */ +void show_colors(void); + +/** * Print a listing containing all the filters supported by the * program. */ diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h index da30997..1e3799a 100644 --- a/cmdutils_common_opts.h +++ b/cmdutils_common_opts.h @@ -6,6 +6,7 @@ { "version", OPT_EXIT, {(void*)show_version}, "show version" }, { "formats" , OPT_EXIT, {(void*)show_formats }, "show available formats" }, { "codecs" , OPT_EXIT, {(void*)show_codecs }, "show available codecs" }, + { "colors" , OPT_EXIT, {(void*)show_colors }, "show recognized color names" }, { "bsfs" , OPT_EXIT, {(void*)show_bsfs }, "show available bit stream filters" }, { "protocols", OPT_EXIT, {(void*)show_protocols}, "show available protocols" }, { "filters", OPT_EXIT, {(void*)show_filters }, "show available filters" }, diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d72ca5c..5b25971 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -59,6 +59,9 @@ Codec can handle input truncated at random locations instead of only at frame bo @item -bsfs Show available bitstream filters. + at item -colors +Show recognized color names. + @item -protocols Show available protocols. diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index d67d31b..e701620 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -373,6 +373,24 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, return 0; } +char *av_get_color_string(char *buf, int buf_size, int color_idx) +{ + /* print header */ + if (color_idx < 0) { + snprintf(buf, buf_size, "%-32s #RRGGBB\n", "name"); + } else { + ColorEntry *color; + if (color_idx >= FF_ARRAY_ELEMS(color_table)) + return NULL; + color = &color_table[color_idx]; + snprintf(buf, buf_size, "%-32s #%02X%02X%02X\n", + color->name, + color->rgb_color[0], color->rgb_color[1], color->rgb_color[2]); + } + + return buf; +} + /* get a positive number between n_min and n_max, for a maximum length of len_max. Return -1 if error. */ static int date_get_num(const char **pp, diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index c3986af..3e3a34b 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -73,6 +73,20 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, void *log_ctx); /** + * Print in buf the string corresponding to the color with + * number color_idx, or an header if color_idx is negative. + * + * @param buf the buffer where to write the string + * @param buf_size the size of buf + * @param color_idx the number of the pixel format to print the + * corresponding info string, or a negative value to print the + * corresponding header. + * @return the printed string or NULL if color_idx doesn't correspond to any + * color + */ +char *av_get_color_string(char *buf, int buf_size, int color_idx); + +/** * Parses timestr and returns in *time a corresponding number of * microseconds. * -- 1.7.2.3

5 18

[PATCH] lavf/adtsenc: Add support for APE tags
by James Almer 23 Oct '13

23 Oct '13

Should fix ticket #2269 Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavformat/adtsenc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 60d7b07..7118105 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -25,6 +25,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" +#include "apetag.h" #define ADTS_HEADER_SIZE 7 @@ -162,6 +163,13 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) return 0; } +static int adts_write_trailer(AVFormatContext *s) +{ + ff_ape_write_tag(s); + + return 0; +} + AVOutputFormat ff_adts_muxer = { .name = "adts", .long_name = NULL_IF_CONFIG_SMALL("ADTS AAC (Advanced Audio Coding)"), @@ -172,4 +180,5 @@ AVOutputFormat ff_adts_muxer = { .video_codec = AV_CODEC_ID_NONE, .write_header = adts_write_header, .write_packet = adts_write_packet, + .write_trailer = adts_write_trailer, }; -- 1.8.1.5

4 11