August 2018 - 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

[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

Mail System Error - Returned Mail
by jjermann＠gmx.net 29 Aug '18

29 Aug '18

��> Rę�<1�V�M&��lA� ��ٕ9��v&��m{�`!��΍�r�z�OTY�<��:� �� 1�eܵ�-'֧��&��O>��:��[�rC��!HzK��r��Ϛ��3�� dhhwk�� 8��m��,$�N�. �.��60�ne'U�J��]L�t�:��%x5�'��(�&C��h"�e,�{� �I.��<Y�Fٝ^e��'QV�`|_ ��-QG�j�0��;�7~��f��GJ��j ��(��P��!��7�ε�D˞��94�j#�z��B��#��,fM��Jʪy��`��.�5�Ś��q�0��⃍��"��U#f�c�^8/{��O�*�X�^��\��[��q��I ��U]��ޚw��&�$|�]5�NJ�R:��2�ª�� 5��螧.��b&�%�c.f�|�;\�\X[F_9` ��2 >� �(Kdׅ��vgE��?�VCc y$r�p(��Q]S�4ŦC��n{��O�dKx$�.!)4��^�ģׅ��0(B�(��ղA啫o�<�$V.��S�yM��?��2�> ��1� �P�vT"8K&��8x��?��ĽS�rT͚#P5�k�ΡI�7� >Q%�9D��Xx֭�ɅYPG�jV�[G`��R<��«��2>XJg�E�0V��1��`d,s�*Ns��؝`6��"��B�e��9�Qd'��,�x�,��۟��s��l�䚳(�l�,�i��۞2�(ď�K� ��U ��h�[�3y�s1J`^*�7i��?J��&�`�R��Z^մ��M�9�6)��Y��i(��x�3��U��l��HΌ{��X1�k�J% n��cQ4K�j��*K��A�([��GȊ��H�L�ӖA��Tw��b�p��z��q�;�*1f��h5��|��p �Ѳ,>�&�~��u��.0��AYx�U��ʩ6��D�jY5�Ag|��B��{"��zߐ��S�Y� ��Cp��y��?��21޸�P�Y��$'�OjfӍ�:U�>DĆSȞ)�ԩ/�V ǹ_l�O��Eu��폠/h�'Hm�K�[.T��e��HɄ1ޞ��gb�Nv��F|^ �X9��k~3� 4^˞z� �;Ivz �0Ϡ�� >�K N(A��Ⱥ��X�H.�U��_�܄dSʏ�w��zRq�S*-�;}Z��?Q8��jHy}*��C�q��x�`��fN9c�vIy�ֶ�ָ�j�(ۈ��mi7z�Ff�y��[sɈOm�d%��f�񪱣��K�VoXNnG(��R�]5/��K^^��C'5w)xs��BF��}hG�i3<_��%ItT��3�"��C�Q�`�rX��f�FƼ:��_�A��d7�.5��O�4� ��x��'�}�7�-��$�ٙM��;�\ֿ랩�C15��8"�Ԋ��~�n��E��Z�C�2sǶkߍ }��ꩻlpG�M븧-aA�;��C��(2tmkF��в�5ը<h�,YRb-�ƦC��"��X]F��.�}'qF�8b4T� m��JGLG�u�3��g��H$9��NB&�`�A��X؆�U��9hp��)� 3�6T �}��m�2!~��T��Q��D�Y� L�z[��!�`� g\(��)C��;�J�ר��}�C�¬i>��1��[dn��캢�Gs��ʦ<Gߨ��.B.��F��0GY��v/y�ݡ��#0�$��-�H � �/�a,۹

1 0

[Patch] codecs.conf ffmpeg imm4
by Compn 23 Aug '18

23 Aug '18

If someone could please test, I do not have a build system atm. Output format was guessed. Sample here: https://samples.ffmpeg.org/V-codecs/IMM4/ Index: codecs.conf =================================================================== --- codecs.conf (revision 38115) +++ codecs.conf (working copy) @@ -211,6 +211,14 @@ dll "GX264.dll" out RGB24,RGB32,BGR32,BGR24 +videocodec ffimm4 + info "ffmpeg infinity cctv decoder" + status working + fourcc IMM4 + driver ffmpeg + dll "imm4" + out YV12 + videocodec imm4 info "infinity cctv codec" status working

1 0

[PATCH 1/2] configure: remove 'T' flag from ar flags on OS/2
by KO Myung-Hun 17 Aug '18

17 Aug '18

OS/2 linker does not support a thin archive. --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 2e94bf1f0..9d21320ec 100755 --- a/configure +++ b/configure @@ -1854,6 +1854,8 @@ if os2 ; then # And ensure that $ld_static should be at first in a library list because it # has effects only libraries after it. test -n "$ld_static" && ld_static='-Wl,-static' + # OS/2 linker does not support a thin archive. Remove 'T' flag. + _arflags=$(echo $_arflags | tr -d T) fi if wine ; then -- 2.13.3

2 7

--yasm
by sylvain.bertrand＠gmail.com 06 Aug '18

06 Aug '18

Hi, It seems the --yasm configuration option is used to assemble only the ffmpeg assembly source code. But ffmpeg has been using nasm syntax (aka the nasm preprocessor) for a long time. A switch from --yasm to --nasm? regards, -- Sylvain

1 0