September 2017 - MPlayer-dev-eng

[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

[PATCH] aalib subtitle fix
by za3k＠za3k.com 15 Apr '19

15 Apr '19

For some time now, aalib rendering has had broken subtitles. -vo aa is designed to use human-readable text at the size of one character per character. In actuality, it's somehow switched to trying to render a standard font using dithering since its introduction. This patch fixes it. Explanation: vo_font doesn't seem to get used anywhere, because OSD rendering is actually done in a completely separate way from other video output, but I kept it in just in case. As a side note, someone may want to investigate unicode support for subtitles in -vo aa. *** /var/src/MPlayer-1.3.0/libvo/vo_aa.c 2016-02-12 12:23:39.000000000 -0800 --- vo_aa.c 2017-05-07 02:07:11.900548663 -0700 *************** static int osdx, osdy; *** 92,97 **** --- 92,98 ---- static int osd_text_length = 0; int aaconfigmode=1; font_desc_t* vo_font_save = NULL; + font_desc_t* sub_font_save = NULL; static struct SwsContext *sws=NULL; /* configuration */ *************** config(uint32_t width, uint32_t height, *** 249,256 **** /* now init our own 'font' */ if(!vo_font_save) vo_font_save = vo_font; ! if(vo_font == vo_font_save) { ! vo_font=malloc(sizeof(font_desc_t));//if(!desc) return NULL; memset(vo_font,0,sizeof(font_desc_t)); vo_font->pic_a[0]=malloc(sizeof(raw_file)); memset(vo_font->pic_a[0],0,sizeof(raw_file)); --- 250,258 ---- /* now init our own 'font' */ if(!vo_font_save) vo_font_save = vo_font; ! if(!sub_font_save) sub_font_save = vo_font; ! if(vo_font == vo_font_save || sub_font == sub_font_save) { ! vo_font=sub_font=malloc(sizeof(font_desc_t));//if(!desc) return NUL L; memset(vo_font,0,sizeof(font_desc_t)); vo_font->pic_a[0]=malloc(sizeof(raw_file)); memset(vo_font->pic_a[0],0,sizeof(raw_file));

3 4

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

mpv (MPlayer fork) LGPL relicensing mostly done
by wm4 10 Oct '17

10 Oct '17

Hello MPlayer developers, mpv is a MPlayer fork, that wants to relicense itself to LGPL. Some time ago I posted a thread about this on this mailing list, as getting permission by contributors of code still in MPlayer is required. I promised to post here when it's done, to give anyone a chance to review the changes. Also to make sure no GPL code was accidentally relicensed without relicensing permission. Keep in mind that none of this actually affects MPlayer. I'm only posting this here because mpv is based on MPlayer. The relicensing in mpv won't be enough to relicense MPlayer either - mpv replaced or removed so much MPlayer code, that relicensing MPlayer using the mpv relicensing work would take at least 3 times as much effort. The project is here: https://github.com/mpv-player/mpv It can be built in LGPLv3 "or later" mode with: ./bootstrap.py ./waf configure --enable-preliminary-lgpl3 ./waf build/mpv This builds the player with the GPL-only parts disabled. I encourage anyone to test whether his favorite piece of unrelicensed GPL code is _actually_ excluded. (The relicensing targets LGPLv2.1+, but 1 contributor agreed to LGPLv3+ only, so 4 source files are LGPLv3+.) Here is a list of functionality disabled under LGPLv3 mode: https://github.com/mpv-player/mpv/blob/master/Copyright#L34 These parts are disabled, because the authors either disagreed, or were not reachable, or because I did not try to relicense those parts. On Linux/X11, the command line player is not really functional in LGPLv3 mode, but using Wayland, or a libmpv application using opengl-cb (like most libmpv demos in the mpv-examples repo), should work. (The latter requires building libmpv with --enable-libmpv.) In a few days or weeks I will make the relicensing final. It will stay GPL/LGPL dual-licensed, though. The GPL parts will be kept, but are not compiled in LGPL mode. I want to thank everyone who agreed to the relicensing. I want to thank anyone who helped me with this, especially tmm1 and Compn. It took so long, and I had to annoy so many people. Now it's finally done.

1 1

[PATCH] haiku support
by Compn 10 Sep '17

10 Sep '17

patch looks ok to me. maintained by miqlas. any haiku users out there? :) -compn

3 3

[PATCH] configure: allow to link to a static lib of FreeType
by KO Myung-Hun 10 Sep '17

10 Sep '17

--- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 1db109488..6223cd1ea 100755 --- a/configure +++ b/configure @@ -6330,6 +6330,7 @@ if test "$_iconv" = no ; then fi if test "$_freetype" = auto ; then + test -n "$ld_static" && _freetypeconfig="$_freetypeconfig --static" if ( $_freetypeconfig --version ) >/dev/null 2>&1 ; then cat > $TMPC << EOF #include <stdio.h> -- 2.13.3

3 2

[PATCH] ao/alsa: Plug device leak if init() fails
by Ville Syrjälä 08 Sep '17

08 Sep '17

Close the device instead of leaking it when init() fails. Otherwise subsequent attempts at using the device are going to fail if the device doesn't support mixing multiple streams. --- libao2/ao_alsa.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 36dcc1136926..2ada64d3bec8 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -508,10 +508,12 @@ static int init(int rate_hz, int channels, int format, int flags) mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_ALSA_OpenInNonblockModeFailed); if ((err = try_open_device(alsa_device, 0, isac3)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_PlaybackOpenError, snd_strerror(err)); + uninit(1); return 0; } } else { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_PlaybackOpenError, snd_strerror(err)); + uninit(1); return 0; } } @@ -530,6 +532,7 @@ static int init(int rate_hz, int channels, int format, int flags) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToGetInitialParameters, snd_strerror(err)); + uninit(1); return 0; } @@ -538,6 +541,7 @@ static int init(int rate_hz, int channels, int format, int flags) if (err < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetAccessType, snd_strerror(err)); + uninit(1); return 0; } @@ -562,6 +566,7 @@ static int init(int rate_hz, int channels, int format, int flags) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetFormat, snd_strerror(err)); + uninit(1); return 0; } @@ -570,6 +575,7 @@ static int init(int rate_hz, int channels, int format, int flags) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetChannels, snd_strerror(err)); + uninit(1); return 0; } @@ -582,6 +588,7 @@ static int init(int rate_hz, int channels, int format, int flags) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToDisableResampling, snd_strerror(err)); + uninit(1); return 0; } #endif @@ -591,6 +598,7 @@ static int init(int rate_hz, int channels, int format, int flags) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetSamplerate2, snd_strerror(err)); + uninit(1); return 0; } @@ -603,6 +611,7 @@ static int init(int rate_hz, int channels, int format, int flags) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetBufferTimeNear, snd_strerror(err)); + uninit(1); return 0; } @@ -610,6 +619,7 @@ static int init(int rate_hz, int channels, int format, int flags) &alsa_fragcount, NULL)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetPeriods, snd_strerror(err)); + uninit(1); return 0; } @@ -618,6 +628,7 @@ static int init(int rate_hz, int channels, int format, int flags) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetHwParameters, snd_strerror(err)); + uninit(1); return 0; } // end setting hw-params @@ -627,6 +638,7 @@ static int init(int rate_hz, int channels, int format, int flags) if ((err = snd_pcm_hw_params_get_buffer_size(alsa_hwparams, &bufsize)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToGetBufferSize, snd_strerror(err)); + uninit(1); return 0; } else { @@ -636,6 +648,7 @@ static int init(int rate_hz, int channels, int format, int flags) if ((err = snd_pcm_hw_params_get_period_size(alsa_hwparams, &chunk_size, NULL)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToGetPeriodSize, snd_strerror(err)); + uninit(1); return 0; } else { mp_msg(MSGT_AO,MSGL_V,"alsa-init: got period size %li\n", chunk_size); @@ -646,12 +659,14 @@ static int init(int rate_hz, int channels, int format, int flags) if ((err = snd_pcm_sw_params_current(alsa_handler, alsa_swparams)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToGetSwParameters, snd_strerror(err)); + uninit(1); return 0; } #if SND_LIB_VERSION >= 0x000901 if ((err = snd_pcm_sw_params_get_boundary(alsa_swparams, &boundary)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToGetBoundary, snd_strerror(err)); + uninit(1); return 0; } #else @@ -661,12 +676,14 @@ static int init(int rate_hz, int channels, int format, int flags) if ((err = snd_pcm_sw_params_set_start_threshold(alsa_handler, alsa_swparams, chunk_size)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetStartThreshold, snd_strerror(err)); + uninit(1); return 0; } /* disable underrun reporting */ if ((err = snd_pcm_sw_params_set_stop_threshold(alsa_handler, alsa_swparams, boundary)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetStopThreshold, snd_strerror(err)); + uninit(1); return 0; } #if SND_LIB_VERSION >= 0x000901 @@ -674,12 +691,14 @@ static int init(int rate_hz, int channels, int format, int flags) if ((err = snd_pcm_sw_params_set_silence_size(alsa_handler, alsa_swparams, boundary)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetSilenceSize, snd_strerror(err)); + uninit(1); return 0; } #endif if ((err = snd_pcm_sw_params(alsa_handler, alsa_swparams)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToGetSwParameters, snd_strerror(err)); + uninit(1); return 0; } /* end setting sw-params */ -- 2.13.0

2 1

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

07 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