August 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

[PATCH] Wideband Single-bit Data (WSD) demuxer
by Peter Ross 29 Apr '16

29 Apr '16

Signed-off-by: Peter Ross <pross(a)xvid.org> --- samples: www.acoust.rise.waseda.ac.jp/1bitcons/data.html Changelog | 1 + doc/general.texi | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/wsddec.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 175 insertions(+) create mode 100644 libavformat/wsddec.c diff --git a/Changelog b/Changelog index 6b46df3..09f015b 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ version <next>: - alternative rendition support for HTTP Live Streaming - AVFoundation input device - Direct Stream Digital (DSD) decoder +- Wideband Single-bit Data (WSD) demuxer version 2.2: diff --git a/doc/general.texi b/doc/general.texi index 8bf0379..2c9c1b5 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -470,6 +470,7 @@ library: @tab Multimedia format used in Westwood Studios games. @item Westwood Studios VQA @tab @tab X @tab Multimedia format used in Westwood Studios games. +@item Wideband Single-bit Data (WSD) @tab @tab X @item XMV @tab @tab X @tab Microsoft video container used in Xbox games. @item xWMA @tab @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 38b7f9a..ca6820e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -418,6 +418,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o +OBJS-$(CONFIG_WSD_DEMUXER) += wsddec.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asfdec.o asf.o asfcrypt.o \ avlanguage.o mpegts.o isom.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index f6d78ae..780019d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -305,6 +305,7 @@ void av_register_all(void) REGISTER_MUXER (WEBM, webm); REGISTER_MUXDEMUX(WEBVTT, webvtt); REGISTER_DEMUXER (WSAUD, wsaud); + REGISTER_DEMUXER (WSD, wsd); REGISTER_DEMUXER (WSVQA, wsvqa); REGISTER_MUXDEMUX(WTV, wtv); REGISTER_MUXDEMUX(WV, wv); diff --git a/libavformat/wsddec.c b/libavformat/wsddec.c new file mode 100644 index 0000000..7b127d9 --- /dev/null +++ b/libavformat/wsddec.c @@ -0,0 +1,171 @@ +/* + * Wideband Single-bit Data (WSD) demuxer + * Copyright (c) 2014 Peter Ross + * + * 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 "libavutil/intreadwrite.h" +#include "libavutil/timecode.h" +#include "avformat.h" +#include "internal.h" +#include "rawdec.h" + +static int wsd_probe(AVProbeData *p) +{ + if (p->buf_size < 45 || memcmp(p->buf, "1bit", 4) || + !AV_RB32(p->buf + 36) || !p->buf[44] || + (p->buf[0] >= 0x10 && (AV_RB32(p->buf + 20) < 0x80 || AV_RB32(p->buf + 24) < 0x80))) + return 0; + return AVPROBE_SCORE_MAX; +} + +static int empty_string(const char *buf, unsigned size) +{ + while (size--) { + if (*buf++ != ' ') + return 0; + } + return 1; +} + +static int wsd_to_av_channel_layoyt(AVFormatContext *s, int bit) +{ + switch (bit) { + case 2: return AV_CH_BACK_RIGHT; + case 3: + avpriv_request_sample(s, "Rr-middle"); + break; + case 4: return AV_CH_BACK_CENTER; + case 5: + avpriv_request_sample(s, "Lr-middle"); + break; + case 6: return AV_CH_BACK_LEFT; + case 24: return AV_CH_LOW_FREQUENCY; + case 26: return AV_CH_FRONT_RIGHT; + case 27: return AV_CH_FRONT_RIGHT_OF_CENTER; + case 28: return AV_CH_FRONT_CENTER; + case 29: return AV_CH_FRONT_LEFT_OF_CENTER; + case 30: return AV_CH_FRONT_LEFT; + default: + av_log(s, AV_LOG_WARNING, "reserved channel assignment\n"); + break; + } + return 0; +} + +static int get_metadata(AVFormatContext *s, const char *const tag, const unsigned size) +{ + uint8_t *buf; + if (!(size + 1)) + return AVERROR(ENOMEM); + + buf = av_malloc(size + 1); + if (!buf) + return AVERROR(ENOMEM); + + if (avio_read(s->pb, buf, size) != size) { + av_free(buf); + return AVERROR(EIO); + } + + if (empty_string(buf, size)) { + av_free(buf); + return 0; + } + + buf[size] = 0; + av_dict_set(&s->metadata, tag, buf, AV_DICT_DONT_STRDUP_VAL); + return 0; +} + +static int wsd_read_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + AVStream *st; + int version; + uint32_t text_offset, data_offset, channel_assign; + char playback_time[AV_TIMECODE_STR_SIZE]; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + avio_skip(pb, 8); + version = avio_r8(pb); + av_log(s, AV_LOG_DEBUG, "version: %i.%i\n", version >> 4, version & 0xF); + avio_skip(pb, 11); + + if (version < 0x10) { + text_offset = 0x80; + data_offset = 0x800; + avio_skip(pb, 8); + } else { + text_offset = avio_rb32(pb); + data_offset = avio_rb32(pb); + } + + avio_skip(pb, 4); + av_timecode_make_smpte_tc_string(playback_time, avio_rb32(pb), 0); + av_dict_set(&s->metadata, "playback_time", playback_time, 0); + + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = s->iformat->raw_codec_id; + st->codec->sample_rate = avio_rb32(pb) / 8; + avio_skip(pb, 4); + st->codec->channels = avio_r8(pb) & 0xF; + if (!st->codec->channels) + return AVERROR_INVALIDDATA; + + avio_skip(pb, 3); + channel_assign = avio_rb32(pb); + if (!(channel_assign & 1)) { + int i; + for (i = 1; i < 32; i++) + if (channel_assign & (1 << i)) + st->codec->channel_layout |= wsd_to_av_channel_layoyt(s, i); + } + + avio_skip(pb, 16); + if (avio_rb32(pb)) + avpriv_request_sample(s, "emphasis"); + + if (avio_seek(pb, text_offset, SEEK_SET) >= 0) { + get_metadata(s, "title", 128); + get_metadata(s, "composer", 128); + get_metadata(s, "song_writer", 128); + get_metadata(s, "artist", 128); + get_metadata(s, "album", 128); + get_metadata(s, "genre", 32); + get_metadata(s, "date", 32); + get_metadata(s, "location", 32); + get_metadata(s, "comment", 512); + get_metadata(s, "user", 512); + } + + return avio_seek(pb, data_offset, SEEK_SET); +} + +AVInputFormat ff_wsd_demuxer = { + .name = "wsd", + .long_name = NULL_IF_CONFIG_SMALL("Wideband Single-bit Data (WSD)"), + .read_probe = wsd_probe, + .read_header = wsd_read_header, + .read_packet = ff_raw_read_partial_packet, + .flags = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK, + .raw_codec_id = AV_CODEC_ID_DSD_MSBF, +}; -- 1.8.3.2 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

4 6

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]Mark experimental j2k decoder as experimental if libopenjpeg is available
by Carl Eugen Hoyos 08 Jun '15

08 Jun '15

Hi! Attached patch fixes ticket #3619. Please comment, Carl Eugen

5 14

[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

Re: [FFmpeg-devel] [PATCH] mark null encoder as ts-nonstrict , avoids error messages for null output
by Rodger Combs 22 Jan '15

22 Jan '15

> On Thu, Aug 21, 2014 at 02:00:22PM +0200, Hendrik Leppkes wrote: > > On Thu, Aug 21, 2014 at 1:38 PM, compn <tempn at mi.rr.com <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>> wrote: > > > https://gist.github.com/anonymous/0e26f490ec13d67996fd <https://gist.github.com/anonymous/0e26f490ec13d67996fd> > > > > > > commit e94a44543a96b13aa6a23efce2f0378a5479d530 > > > Author: Rodger Combs <rodger.combs at gmail.com <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>> > > > Date: Wed Aug 20 15:38:12 2014 -0700 > > > > > > avformat/nullenc: mark null as timestamp-nonstrict > > > This avoids unnecessary error messages for null output > > > > > > diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c > > > index 7c08c39..58b88a1 100644 > > > --- a/libavformat/nullenc.c > > > +++ b/libavformat/nullenc.c > > > @@ -32,5 +32,5 @@ AVOutputFormat ff_null_muxer = { > > > .audio_codec = AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE), > > > .video_codec = AV_CODEC_ID_RAWVIDEO, > > > .write_packet = null_write_packet, > > > - .flags = AVFMT_VARIABLE_FPS | AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE, > > > + .flags = AVFMT_TS_NONSTRICT | AVFMT_VARIABLE_FPS | AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE, > > > }; > > > > There is a lot of other muxers out there that also have NOTIMESTAMPS > > set, and not this flag. > > > > IMHO the code that complains about invalid timestamps should be > > adjusted to not do it when NOTIMESTAMPS is set, instead of this. > > maybe but for testing/fate at least we should retain timestamp > checks, null is used alot for testing if one looks at trac > iam not sure what is the best thing to do here How about adding a lavf option? I could imagine a few ways that could be done, but my favorite is to make `AVFMT_NOTIMESTAMPS` imply `AVFMT_TS_NONSTRICT` (on the checking code's end), and add an option to re-enable the error (possibly downgraded to a warning?) even with non-strict encoders. We could also have the option disable the error with strict encoders (but that seems less sensible to me).

2 1

probable dshow bug or strangeness
by Don Moir 15 Jan '15

15 Jan '15

I am posting here since not quite sure and need some advice. I got word that some captures devices were not working. Everything enumerated and went thru but no display. You get packets with zero size and then no decode success. I traced this into dshow_pin.c and function libAVMemInputPin_Receive. In this function there is: buf_size = IMediaSample_GetActualDataLength(sample); In this case, buf_size is always zero. I think it is supposed to be set somewhere with IMediaSample_SetActualDataLength and could be a coding issue with driver. This apparently happens enough where I can't just blame the driver if thats where it lies. Maybe it is supposed to be set in dshow_pin.c somewhere but don't know. When this happens (buf_size == 0), the real data length appears to be returned by IMediaSample_GetSize(sample); This is supposed to be the actual buffer length and not necessarily the data length. When I change it to use IMediaSample_GetSize it works perfect. So just not sure how to best handle it and can't find good information about it. It appears though, IMediaSample_GetSize is the thing to use and seems IMediaSample_GetActualDataLength can be ignored but have no real clue. I am still running some test with it and maybe someone out there has some more info.

4 18