April 2013 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/2] lavu/opt: add AV_OPT_TYPE_DURATION.
by Nicolas George 01 Apr '13

01 Apr '13

Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- doc/APIchanges | 3 +++ libavutil/opt.c | 30 +++++++++++++++++++++++++++++- libavutil/opt.h | 1 + libavutil/version.h | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 2bde666..3f33e03 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-03-16 - xxxxxxx - lavu 52.20.100 - opt.h + Add AV_OPT_TYPE_DURATION value to AVOptionType enum. + 2013-03-07 - xxxxxx - lavu 52.18.100 - avstring.h,bprint.h Add av_escape() and av_bprint_escape() API. diff --git a/libavutil/opt.c b/libavutil/opt.c index f91d18b..b4c2dc7 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -77,6 +77,7 @@ static int read_number(const AVOption *o, void *dst, double *num, int *den, int6 case AV_OPT_TYPE_PIXEL_FMT: case AV_OPT_TYPE_SAMPLE_FMT: case AV_OPT_TYPE_INT: *intnum = *(int *)dst;return 0; + case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_INT64: *intnum = *(int64_t *)dst;return 0; case AV_OPT_TYPE_FLOAT: *num = *(float *)dst;return 0; case AV_OPT_TYPE_DOUBLE: *num = *(double *)dst;return 0; @@ -101,6 +102,7 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int case AV_OPT_TYPE_PIXEL_FMT: case AV_OPT_TYPE_SAMPLE_FMT: case AV_OPT_TYPE_INT: *(int *)dst= llrint(num/den)*intnum; break; + case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_INT64: *(int64_t *)dst= llrint(num/den)*intnum; break; case AV_OPT_TYPE_FLOAT: *(float *)dst= num*intnum/den; break; case AV_OPT_TYPE_DOUBLE:*(double *)dst= num*intnum/den; break; @@ -256,7 +258,7 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) return AVERROR_OPTION_NOT_FOUND; if (!val && (o->type != AV_OPT_TYPE_STRING && o->type != AV_OPT_TYPE_PIXEL_FMT && o->type != AV_OPT_TYPE_SAMPLE_FMT && - o->type != AV_OPT_TYPE_IMAGE_SIZE)) + o->type != AV_OPT_TYPE_IMAGE_SIZE && o->type != AV_OPT_TYPE_DURATION)) return AVERROR(EINVAL); dst = ((uint8_t*)target_obj) + o->offset; @@ -310,6 +312,15 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) } *(enum AVSampleFormat *)dst = ret; return 0; + case AV_OPT_TYPE_DURATION: + if (!val) { + *(int64_t *)dst = 0; + return 0; + } else { + if ((ret = av_parse_time(dst, val, 1)) < 0) + av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as duration\n", val); + return ret; + } } av_log(obj, AV_LOG_ERROR, "Invalid option type.\n"); @@ -530,6 +541,7 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); uint8_t *bin, buf[128]; int len, i, ret; + int64_t i64; if (!o || !target_obj || (o->offset<=0 && o->type != AV_OPT_TYPE_CONST)) return AVERROR_OPTION_NOT_FOUND; @@ -570,6 +582,12 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) case AV_OPT_TYPE_SAMPLE_FMT: ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_sample_fmt_name(*(enum AVSampleFormat *)dst), "none")); break; + case AV_OPT_TYPE_DURATION: + i64 = *(int64_t *)dst; + ret = snprintf(buf, sizeof(buf), "%"PRIi64"d:%02d:%02d.%06d", + i64 / 3600000000, (int)((i64 / 60000000) % 60), + (int)((i64 / 1000000) % 60), (int)(i64 % 1000000)); + break; default: return AVERROR(EINVAL); } @@ -815,6 +833,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, case AV_OPT_TYPE_SAMPLE_FMT: av_log(av_log_obj, AV_LOG_INFO, "%-12s ", "<sample_fmt>"); break; + case AV_OPT_TYPE_DURATION: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", "<duration>"); + break; case AV_OPT_TYPE_CONST: default: av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); @@ -891,6 +912,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags) case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: case AV_OPT_TYPE_INT64: + case AV_OPT_TYPE_DURATION: av_opt_set_int(s, opt->name, opt->default_val.i64, 0); break; case AV_OPT_TYPE_DOUBLE: @@ -1253,6 +1275,7 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch case AV_OPT_TYPE_SAMPLE_FMT: case AV_OPT_TYPE_FLOAT: case AV_OPT_TYPE_DOUBLE: + case AV_OPT_TYPE_DURATION: break; case AV_OPT_TYPE_STRING: range->component_min = 0; @@ -1311,6 +1334,7 @@ typedef struct TestContext int w, h; enum AVPixelFormat pix_fmt; enum AVSampleFormat sample_fmt; + int64_t duration; } TestContext; #define OFFSET(x) offsetof(TestContext, x) @@ -1331,6 +1355,7 @@ static const AVOption test_options[]= { {"size", "set size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE,{0}, 0, 0 }, {"pix_fmt", "set pixfmt", OFFSET(pix_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64 = AV_PIX_FMT_NONE}, -1, AV_PIX_FMT_NB-1}, {"sample_fmt", "set samplefmt", OFFSET(sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64 = AV_SAMPLE_FMT_NONE}, -1, AV_SAMPLE_FMT_NB-1}, +{"duration", "set duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX}, {NULL}, }; @@ -1381,6 +1406,9 @@ int main(void) "sample_fmt=s16", "sample_fmt=2", "sample_fmt=bogus", + "duration=bogus", + "duration=123.45", + "duration=1\\:23\\:45.67", }; test_ctx.class = &test_class; diff --git a/libavutil/opt.h b/libavutil/opt.h index baf1b82..1c86e6f 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -230,6 +230,7 @@ enum AVOptionType{ AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'), AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'), + AV_OPT_TYPE_DURATION = MKBETAG('D','U','R',' '), #if FF_API_OLD_AVOPTIONS FF_OPT_TYPE_FLAGS = 0, FF_OPT_TYPE_INT, diff --git a/libavutil/version.h b/libavutil/version.h index d95a8a2..1ff9ffe 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 19 +#define LIBAVUTIL_VERSION_MINOR 20 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- 1.7.10.4

5 18

mpegtsenc: add option to define a timestamp offset
by Harald Axmann 01 Apr '13

01 Apr '13

Hello, Mark Essel reported the problem, that the "setpts"-filter is not working for mpegts [1]. I could not find a solution for the problem with current ffmpeg, so I prepared a quick workaround for him, which adds an mpegts-specific offset option ("-timestamp_offset"). The offset is added, when the PES-packet is written. I have attached the patch as base for discussion. Best regards, Harald Axmann [1] http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/014050.html

2 4

[PATCH 1/4] lavu/opt: make sure av_opt_set_bin() handles NULL/0.
by Nicolas George 01 Apr '13

01 Apr '13

Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavutil/opt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 97fc6fd..8817a1d 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -420,8 +420,8 @@ int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int if (o->type != AV_OPT_TYPE_BINARY) return AVERROR(EINVAL); - ptr = av_malloc(len); - if (!ptr) + ptr = len ? av_malloc(len) : NULL; + if (len && !ptr) return AVERROR(ENOMEM); dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset); @@ -430,7 +430,8 @@ int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int av_free(*dst); *dst = ptr; *lendst = len; - memcpy(ptr, val, len); + if (len) + memcpy(ptr, val, len); return 0; } -- 1.7.10.4

2 6

One more thing about the DTS-HD MA decoder.
by Marcus Johnson 01 Apr '13

01 Apr '13

the samples are 32 bit, when the audio itself is only 24 bit, any idea what causes this bug (assuming ffmpeg is supposed to decode it at all) and how to cause it? I could patch it (hopefully anyway.)

4 3

[PATCH] lavfi: detect merge failure for unknown layouts.
by Nicolas George 01 Apr '13

01 Apr '13

Detect when filtering known layouts from an explicit list results in an empty list. Fix erratic behavior. Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavfilter/formats.c | 4 ++++ 1 file changed, 4 insertions(+) The problem can be observed with: ./ffmpeg_g -guess_layout_max 0 -f s16le -ac 1 -i /dev/zero -af atempo -c mp2 -f null - (atempo does not support unknown layouts yet) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 43718e4..ea24627 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -184,6 +184,10 @@ AVFilterChannelLayouts *ff_merge_channel_layouts(AVFilterChannelLayouts *a, for (i = j = 0; i < b->nb_channel_layouts; i++) if (KNOWN(b->channel_layouts[i])) b->channel_layouts[j++] = b->channel_layouts[i]; + /* Not optimal: the unknown layouts of b may become known after + another merge. */ + if (!j) + return NULL; b->nb_channel_layouts = j; } MERGE_REF(b, a, channel_layouts, AVFilterChannelLayouts, fail); -- 1.7.10.4

2 2

Best audio format for lossless decompression?
by Marcus Johnson 01 Apr '13

01 Apr '13

I'm working on a decompression library for a widely supported lossless codec, the only probelm is there aren't any open source decoders, hence the library, my question is, which format should I extract the mystery format from, and convert into so everyone can edit the audio easily, that also supports 4GB+ files, and 7.1+ channels? (so there goes WAVE)

2 1

Output from FFmpeg during dts-hd ma to flac conversion.
by Marcus Johnson 01 Apr '13

01 Apr '13

Last login: Sun Mar 31 21:01:35 on ttys000 Marcuss-MacBook-Pro:~ Marcus$ ffmpeg -i ~/Desktop/TheIncredibles.dtsma -vn -sn -acodec flac ~/Desktop/TheIncredibles.flac ffmpeg version N-51221-gdda04a5 Copyright (c) 2000-2013 the FFmpeg developers built on Mar 22 2013 18:54:23 with llvm-gcc 4.2.1 (LLVM build 2336.11.00) configuration: libavutil 52. 22.101 / 52. 22.101 libavcodec 55. 1.100 / 55. 1.100 libavformat 55. 0.100 / 55. 0.100 libavdevice 55. 0.100 / 55. 0.100 libavfilter 3. 48.100 / 3. 48.100 libswscale 2. 2.100 / 2. 2.100 libswresample 0. 17.102 / 0. 17.102 [dts @ 0x7fd32b018e00] max_analyze_duration 5000000 reached at 5002667 microseconds [dts @ 0x7fd32b018e00] Estimating duration from bitrate, this may be inaccurate Input #0, dts, from '/Users/Marcus/Desktop/TheIncredibles.dtsma': Duration: 04:48:05.37, start: 0.000000, bitrate: 1535 kb/s Stream #0:0: Audio: dts (DTS-HD MA), 48000 Hz, 5.1(side), fltp, 1536 kb/s [flac @ 0x7fd32b02ec00] encoding as 24 bits-per-sample Output #0, flac, to '/Users/Marcus/Desktop/TheIncredibles.flac': Metadata: encoder : Lavf55.0.100 Stream #0:0: Audio: flac, 48000 Hz, 5.1(side), s32, 128 kb/s Stream mapping: Stream #0:0 -> #0:0 (dca -> flac) Press [q] to stop, [?] for help Non standard configuration 31 !4 bitrate=3080.5kbits/s Error while decoding stream #0:0: Invalid data found when processing input Non standard configuration 63 !9 bitrate=3155.3kbits/s Error while decoding stream #0:0: Invalid data found when processing input size= 2729579kB time=01:55:25.82 bitrate=3228.6kbits/s video:0kB audio:2729571kB subtitle:0 global headers:0kB muxing overhead 0.000295% Marcuss-MacBook-Pro:~ Marcus$

2 1

[PATCH 1/2] libavutil/libavfilter: opencl wrapper based on comments on 20130331
by Wei Gao 01 Apr '13

01 Apr '13

3 4