April 2017 - 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

mplayer 1.4.0 release
by Compn 15 Apr '18

15 Apr '18

i see development has dropped a bit... are we going to get a 1.4.0 release this year? -compn

3 3

[PATCH 1/2] osd: Add NV12/NV21 support
by Ville Syrjälä 06 Sep '17

06 Sep '17

Add support for NV12/NV21 by just using the YV12 code. It works since it doesn't actually touch chroma. --- sub/osd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sub/osd.c b/sub/osd.c index 81633d98c29f..a2d002526fe5 100644 --- a/sub/osd.c +++ b/sub/osd.c @@ -450,6 +450,8 @@ vo_draw_alpha_func vo_get_draw_alpha(unsigned fmt) { case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: + case IMGFMT_NV12: + case IMGFMT_NV21: return vo_draw_alpha_yv12; case IMGFMT_YUY2: case IMGFMT_YVYU: -- 2.10.2

3 10

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

[PATCH] fix Cygwin build
by Stephen Sheldon 18 Jun '17

18 Jun '17

The Cygwin developers have been enhancing their feature test macros and mplayer stopped compiling. The M_PI macro was undefined. The attached patch fixes it again.

2 3

[PATCH]can not open ISO file including multibyte file path. on Windows.
by Tadashi Ando 30 Apr '17

30 Apr '17

Hi All. I'm Ando from Japan. I found bug, and fixed it. Bug is relating to multibyte. And relating to DVD .ISO. DVDOpen() of MPlayer of Windows version requires ANSI multibyte path as argument. But current MPlayer using UTF-8. ( UTF-8 is internal encoding of MPlayer ) Therefore, If .ISO file path is including multibyte, DVDOpen() ( with libdvdread & libdvdcss ) can't open file. And MPlayer can't play .ISO file. My patch is, convert UTF-8 to ANSI when using DVDOpen(). Please check attached patch. Regards. -- Tadashi Ando

3 12

[PATCH 1/2] mplayer.c: Fix timing of first frame.
by Reimar Döffinger 29 Apr '17

29 Apr '17

It would usually be displayed twice as long. --- mplayer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mplayer.c b/mplayer.c index b0d1f1f19..3bffb9792 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2536,7 +2536,9 @@ static double update_video(int *blit_frame) mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n"); } frame_time = sh_video->pts - sh_video->last_pts; - if (!frame_time) + // The first frame should be displayed directly, + // all others should get a default frame_time + if (!frame_time && mpctx->startup_decode_retry == 0) frame_time = sh_video->frametime; sh_video->last_pts = sh_video->pts; advance_timer(frame_time); -- 2.11.0

1 2

[PATCH] Change xsl and docbook defaults
by Ingo Brückl 14 Apr '17

14 Apr '17

It doesn't make any sense at all to set the defaults to files that have been checked and found non-existing just before. So use network definitions as defaults instead. Additionally, update DocBook XML DTD to use V4.5 (which is the latest V4 since 2006). Ingo

1 0

[PATCH 1/2][Ticket #2321] Build error with latest FFmpeg
by Josh Finch 11 Apr '17

11 Apr '17

FFmpeg made a slight change to their configure, at least on MSYS2/Mingw-w64 causes a build error at link time and I was able to fix it. The first patch fixes the errors pertaining to HEVC in ticket #2321. Index: configure =================================================================== --- configure (revision 37930) +++ configure (working copy) @@ -8699,6 +8699,7 @@ CONFIG_H264PARSE = yes CONFIG_H264PRED= yes CONFIG_H264QPEL= yes +CONFIG_HEVCPARSE = yes CONFIG_HPELDSP = yes CONFIG_IIRFILTER = yes CONFIG_IVIDSP = yes @@ -9379,6 +9380,7 @@ #define CONFIG_H264DSP 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HUFFMAN 1 #define CONFIG_IDCTDSP 1 #define CONFIG_IVIDSP 1

2 2

[PATCH 0/2][ticket 2318] Problems with memory alignment
by Alexander Strasser 05 Apr '17

05 Apr '17

Hi, first patch fixes Windows builds after the removal of the memalign hack from FFmpeg. Second patch defines HAVE_SIMD_ALIGN_32 for AVX capable CPUs and should not be constrained to platforms that do not have memalign. Both of these fix ticket 2318 for me; on Winows with MSys2. I think testing results are a bit flaky for this ticket, as the alignment could just be fine by chance. Alexander Strasser (2): configure: Fix _aligned_malloc check configure: Define HAVE_SIMD_ALIGN_32 configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.11.0

1 4