June 2016 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] stream_ffmpeg: add -lavfstreamopts option.
by Reimar Döffinger 01 Nov '20

01 Nov '20

Allows specifying options to ffmpeg-based streams. --- DOCS/man/en/mplayer.1 | 4 ++++ cfg-common.h | 1 + stream/stream.h | 1 + stream/stream_ffmpeg.c | 19 ++++++++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 2a143cb..d8e9b3b 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -1806,6 +1806,10 @@ Skip the proxy for IPv6 addresses. It will still be used for IPv4 connections. . .TP +.B \-lavfstreamopts <options> +Specify extra options for libavformat based streams. +. +.TP .B \-loadidx <index file> The file from which to read the video index data saved by \-saveidx. This index will be used for seeking, overriding any index data diff --git a/cfg-common.h b/cfg-common.h index 3a422cf..ca4e9c9 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -545,6 +545,7 @@ const m_option_t common_opts[] = { #ifdef CONFIG_FFMPEG {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"lavfstreamopts", &lavfstreamopts, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif #ifdef CONFIG_XVID4 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, diff --git a/stream/stream.h b/stream/stream.h index 615f579..388c353 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -392,6 +392,7 @@ extern char *dvd_device; extern const m_option_t dvbin_opts_conf[]; extern char *rtsp_destination; +extern char *lavfstreamopts; typedef struct { int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c index 57d45e4..1883af3 100644 --- a/stream/stream_ffmpeg.c +++ b/stream/stream_ffmpeg.c @@ -27,6 +27,8 @@ #include "av_helpers.h" #include "libmpdemux/demuxer.h" +char *lavfstreamopts; + static int fill_buffer(stream_t *s, char *buffer, int max_len) { int r = avio_read(s->priv, buffer, max_len); @@ -90,6 +92,7 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) { int flags = 0; const char *filename; + AVDictionary *avopts = NULL; AVIOContext *ctx = NULL; int res = STREAM_ERROR; int64_t size; @@ -125,9 +128,23 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) dummy = !strncmp(filename, "rtsp:", 5) || !strncmp(filename, "dummy:", 6); mp_msg(MSGT_OPEN, MSGL_V, "[ffmpeg] Opening %s\n", filename); - if (!dummy && avio_open(&ctx, filename, flags) < 0) + if (lavfstreamopts && av_dict_parse_string(&avopts, lavfstreamopts, "=", ",", 0) < 0) { + mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavfstreamopts); + goto out; + } + + if (!dummy && avio_open2(&ctx, filename, flags, NULL, &avopts) < 0) goto out; + if (!dummy && av_dict_count(avopts)) { + AVDictionaryEntry *e = NULL; + while ((e = av_dict_get(avopts, "", e, AV_DICT_IGNORE_SUFFIX))) { + mp_msg(MSGT_HEADER,MSGL_ERR,"Unknown option %s\n", e->key); + } + goto out; + } + av_dict_free(&avopts); + stream->priv = ctx; size = dummy ? 0 : avio_size(ctx); if (size >= 0) -- 2.7.0

1 1

Probable boolean logic bug
by Michael McConville 25 Jun '17

25 Jun '17

Hi, everyone. It seems that there's a nonsensical if condition in the IVTV code. It always evaluates to true because it tests the same variable against multiple different constants. The most probable explanation is that || was used when && was intended. I found this with Coccinelle. Thanks for your time, Michael --- libao2/ao_ivtv.c +++ /tmp/cocci-output-71047-6811f3-ao_ivtv.c @@ -84,7 +84,7 @@ init (int rate, int channels, int format freq = rate; /* check for supported audio rate */ - if (rate != 32000 || rate != 41000 || rate != 48000) + if (rate != 32000 && rate != 41000 && rate != 48000) { mp_msg (MSGT_AO, MSGL_ERR, MSGTR_AO_MPEGPES_UnsupSamplerate, rate); rate = 48000;

3 2

Relicensing MPlayer or parts of it to LGPL
by wm4 28 Sep '16

28 Sep '16

I'm maintainer of mpv, a MPlayer fork. One of the changes in mpv was turning the slave mode interface into a library (libmpv), which replaces the stdin/stdout parsing slave mode MPlayer uses. One problem with this is that it forces every client to be GPL. libmpv basically exhibits the slave mode interface as API, but since the application code actually links to it, and the player runs in the same address space, the GPL technically applies (in my interpretation). To avoid this, I'm thinking of relicensing mpv to LGPL 2.1 (with the "or later"). While many things have changed in mpv compared to MPlayer (and many parts have been rewritten or removed), much of its core is still based on MPlayer, and I need agreement from the original authors of the code. I'm thinking it would be beneficial for MPlayer as well to relicense parts to LGPL (or all of it, if enough contributors can be reached). Alternatively, I'd just ask for permission to relicense the affected source files in mpv. Would there be any welcoming or opposing to such a move from MPlayer developers?

8 20

[PATCH]Allow longer url in demux_lavf.c
by Lu, Ran 22 Jul '16

22 Jul '16

Hi all, I noticed when playing some live stream from twitch mplayer cannot update the m3u8 playlist. The reason is the size of the mp_filename array is only 256 byte, so url like "http://video-edge-2aa234.iad02.hls.ttvnw.net/hls-835268/luzbelheim_21377489…" is truncated and the demuxer reports a "403 forbidden" error because the auth code is incomplete. The patch in the attachment simply increase the size of mp_filename to 2048. I pick this to match the size used in ffmpeg url. With this patch mplayer can play the stream without the help of other programs like livestream. But it is still imperfect. I think mplayer apply the cache mechanism to the initial m3u8 playlist instead of the real stream. As the result the cache is always 0%, and every time the stream move to a new ts chunk or update the m3u8 playlist there is a slight but noticeable pause, and mplayer drop 3-4 frames depends on the speed of the internet. I had a quick look at the source code but did not find a place I can wire the ffmpeg stream to mplayer cache. Any suggestions? -- Best Regards, LR

4 4

[PATCH] fix failure to initialize screenshot filter
by Thomas Kirsten 03 Jul '16

03 Jul '16

Hello, ffmpeg recently extended the verification logic in avcodec_open2, see https://github.com/FFmpeg/FFmpeg/commit/e62ff72fc1052273deb708ba715f73e5187… The function now fails when timebase (in AVCodecContext) is not set properly. This essentially disables the screenshot filter as it does not set those members and therefor its PNG output context fails to initialize. When run as "mplayer -vf screenshot file", it prints those errors during the start: [png @ 0x81101000]The encoder timebase is not set. Could not open libavcodec PNG encoder FATAL: Cannot initialize video driver. The first one is from the new ffmpeg code, the others are from libmpcodecs/vf_screenshot.c. Pressing the screenshot button makes the program crash in "write_png" in the libmpcodecs/vf_screenshot.c. The patch sets the timebase field in libmpcodecs/vf_screenshot.c to 1/1 (documentation states it should be 1/framerate, but a single screenshot doesn't have a framerate). It satisfies the new check in ffmpeg, the filter is initialized and making the screenshot works fine. I'm not sure whether the value 1/1 for the timebase is correct, someone knowing about avcodec_open2 should approve this.

2 1

Adding new codec to codecs.conf
by Mark Sugrue 02 Jul '16

02 Jul '16

Hi All, I'm looking for some advice on adding a new codec to mplayer. The codec is for CCTV video (*.asf) and made by Quadrox Codec Pack WebCCTV (link - http://www.webcctv.com/ftp/SoftwareTools/CodecsPack/QuadroxCodecsPackSetup-… ) The installer has two Dlls and I believe the OPJpegProc.dll is the one I need. fourcc is JR24 (this codec is some type of mjpeg, but ffmpeg doesn't play the files). I followed the instructions here ( http://www.mplayerhq.hu/DOCS/tech/win32-codec-howto.txt) and here ( http://www.mplayerhq.hu/DOCS/tech/codecs.conf.txt) Using GraphEdit, I got this data: [image: Inline image 1] I have added this to codecs.conf, but mplayer doesn't play the video so I must have made an error: videocodec qwtjr24 info "Quadrox Jr24" status working driver DMO dll "OPJpegProc.dll" fourcc JR24 guid 0x4A69B442, 0x28BE, 0x4991, 0x969C, 0xB500ADF5D8A8 ;guid 9004f687-fefc-4f8f-b23a-ddd3748082e7 out RGB24 The parts I am unsure about are: - Am I picking the right Guid from graphedit? - how to format the guid in the correct way for codecs.conf - What goes in 'out'? - Whether some extra steps are needed for DMO codecs (these seem unusual). Thanks in advance for any help and advice. Mark -- Dr Mark Sugrue Chief Technology Officer Kinesense, making video evidence smarter <http://youtu.be/kGgAN6K2iy0> Kinesense Ltd | www.kinesense-vca.com <http://www.kinesense-vca.com> | 79 Merrion Square, Dublin D02 TN27, Ireland Ire tel: +353 (0)16 62 45 46 | UK tel: +44 (0) 20 70 96 15 50 | US tel: +1 (703) 879 5904 Try Player Manager: http://www.getplayermanager.com Send me Files: https://dbinbox.com/kinesense ---- This is a confidential communication and is intended only for the addressee indicated in the message (or duly authorised to be responsible for the delivery of the message to such person). You are specifically prohibited from copying this message or delivering the same, or any part thereof, to any other person, whomsoever or howsoever, unless you receive written authorisation from us to do. If you are anyone other than the intended addressee, or person duly authorised and responsible for the delivery of this message to the intended addressee, you should destroy this message and notify us immediately. Please note that we accept no responsibility whatsoever in the event that this message or any other email message or any part thereof becomes known or is communicated to anyone other than the intended recipient or other person authorised in writing by us to receive it, howsoever arising and disclaim all liability for any losses or damage which may be sustained by any person as a result thereof. Kinesense Ltd is a company registered in Ireland. Registered Office is situated at at 79 Merrion Square, Dublin 2, Ireland. Registered number is 475397.

2 2