May 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 aarch64 compile by adding HAVE_ARMV8 define
by Bernd Kuhls 28 May '16

28 May '16

1 0

trac antispam meassures
by Michael Niedermayer 24 May '16

24 May '16

Hi all There where a few spams getting throgh in ffmpegs trac in the last 2 days. It was suggested in #ffmpeg-devel to add some custom anti spam meassures and ask for the project name during register. trac doesnt support doing that in the current release There are also hundreads of bots trying to register per hour since months So ive added a very basic pre registration page that asks 2 trivial questions. This is implemented purely at apache level so should be entirely unaffected by trac upgrades and also could probably be added in front of any other pages needing spam protection. Furthermore the preregistration page can of course be changed and extended if anyone wants and submits patches ... If this causes any problems please report them https://trac.mplayerhq.hu/register https://trac.ffmpeg.org/register Thanks -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have often repented speaking, but never of holding my tongue. -- Xenocrates

1 0

[PATCH] Added support for arm64
by jpinto 24 May '16

24 May '16

Signed-off-by: Joao Pinto <jpinto(a)synopsys.com> Tested-by: Joao Pinto <jpinto(a)synopsys.com> --- configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure b/configure index 722b8a4..d17e61e 100755 --- a/configure +++ b/configure @@ -2493,6 +2493,11 @@ EOF arch='generic' ;; + aarch64) + arch='arm64' + iproc='arm64' + ;; + *) echo "The architecture of your CPU ($host_arch) is not supported by this configure script" echo "It seems nobody has ported MPlayer to your OS or CPU type yet." -- 1.8.1.5

3 3

mailman
by Michael Niedermayer 17 May '16

17 May '16

Hi all today mailman was upgraded, if anyone experiences any new issues please report them to root at ffmpeg -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No snowflake in an avalanche ever feels responsible. -- Voltaire

1 0

Probable boolean logic bug
by Michael McConville 16 May '16

16 May '16

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;

2 1

[PATCH] fix compilation failure with MMX
by Mikulas Patocka 07 May '16

07 May '16

Hi The file libmpcodecs/vf_fspp.c doesn't compile if HAVE_MMX_INLINE is true and HAVE_MMXEXT_INLINE is false (i.e. on Pentium MMX, Pentium 2 or K6 processors). It fails with these errors: libmpcodecs/vf_fspp.c: In function 'column_fidct_c': libmpcodecs/vf_fspp.c:750:5: error: unknown type name 'int_simd16_t' libmpcodecs/vf_fspp.c:751:5: error: unknown type name 'int_simd16_t' libmpcodecs/vf_fspp.c:752:5: error: unknown type name 'int_simd16_t' libmpcodecs/vf_fspp.c:753:5: error: unknown type name 'int_simd16_t' libmpcodecs/vf_fspp.c:789:18: error: 'FIX_0_707106781' undeclared (first use in this function) libmpcodecs/vf_fspp.c:789:18: note: each undeclared identifier is reported only once for each function it appears in libmpcodecs/vf_fspp.c:804:21: error: 'FIX_1_414213562_A' undeclared (first use in this function) libmpcodecs/vf_fspp.c:817:18: error: 'FIX_0_382683433' undeclared (first use in this function) libmpcodecs/vf_fspp.c:818:18: error: 'FIX_0_541196100' undeclared (first use in this function) libmpcodecs/vf_fspp.c:819:18: error: 'FIX_1_306562965' undeclared (first use in this function) libmpcodecs/vf_fspp.c:844:21: error: 'FIX_1_414213562' undeclared (first use in this function) libmpcodecs/vf_fspp.c:845:21: error: 'FIX_1_847759065' undeclared (first use in this function) libmpcodecs/vf_fspp.c:846:21: error: 'FIX_1_082392200' undeclared (first use in this function) libmpcodecs/vf_fspp.c:847:21: error: 'FIX_2_613125930' undeclared (first use in this function) libmpcodecs/vf_fspp.c: At top level: libmpcodecs/vf_fspp.c:396:13: warning: 'column_fidct_mmx' used but never defined [enabled by default] libmpcodecs/vf_fspp.c:748:13: warning: 'column_fidct_c' defined but not used [-Wunused-function] This patch fixes it. Mikulas --- libmpcodecs/vf_fspp.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) Index: mplayer/libmpcodecs/vf_fspp.c =================================================================== --- mplayer.orig/libmpcodecs/vf_fspp.c 2016-04-28 20:30:50.000000000 +0200 +++ mplayer/libmpcodecs/vf_fspp.c 2016-04-29 12:52:13.000000000 +0200 @@ -173,7 +173,6 @@ static void row_fdct_c(int16_t *data, co #define store_slice_s store_slice_c #define store_slice2_s store_slice2_c #define mul_thrmat_s mul_thrmat_c -#define column_fidct_s column_fidct_c #define row_idct_s row_idct_c #define row_fdct_s row_fdct_c @@ -393,7 +392,6 @@ static void mul_thrmat_mmx(struct vf_pri ); } -static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); static void row_idct_mmx(int16_t* workspace, int16_t* output_adr, int output_stride, int cnt); static void row_fdct_mmx(int16_t *data, const uint8_t *pixels, int line_size, int cnt); @@ -401,11 +399,18 @@ static void row_fdct_mmx(int16_t *data, #define store_slice_s store_slice_mmx #define store_slice2_s store_slice2_mmx #define mul_thrmat_s mul_thrmat_mmx -#define column_fidct_s column_fidct_mmx #define row_idct_s row_idct_mmx #define row_fdct_s row_fdct_mmx #endif // HAVE_MMX_INLINE +#if !HAVE_MMXEXT_INLINE +static void column_fidct_c(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); +#define column_fidct_s column_fidct_c +#else +static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); +#define column_fidct_s column_fidct_mmx +#endif + static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, @@ -728,7 +733,9 @@ DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_ DECLARE_ASM_CONST(8, uint64_t, MM_DESCALE_RND)=C64(4); DECLARE_ASM_CONST(8, uint64_t, MM_2)=C64(2); -#else /* !HAVE_MMXEXT_INLINE */ +#endif /* !HAVE_MMX_INLINE */ + +#if !HAVE_MMX_INLINE || !HAVE_MMXEXT_INLINE typedef int32_t int_simd16_t; static const int16_t FIX_0_382683433=FIX(0.382683433, 14);

1 0