July 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

[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

[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

[PATCH v2 1/5] vo_xv: Simplify plane swapping
by Alexander Strasser 26 Aug '17

26 Aug '17

Signed-off-by: Alexander Strasser <eclipse7(a)gmx.net> --- libvo/vo_xv.c | 54 +++++++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 95600fc85..a39c8d504 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -386,12 +386,17 @@ static int draw_slice(uint8_t * image[], int stride[], int w, int h, int x, int y) { uint8_t *dst; + int idx_p1 = 1, idx_p2 = 2; dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + xvimage[current_buf]->pitches[0] * y + x; memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], stride[0]); + switch (image_format) { + case IMGFMT_YV12: + idx_p1 = 2; idx_p2 = 1; + default: x /= 2; y /= 2; w /= 2; @@ -399,21 +404,15 @@ static int draw_slice(uint8_t * image[], int stride[], int w, int h, dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + xvimage[current_buf]->pitches[1] * y + x; - if (image_format != IMGFMT_YV12) - memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], - stride[1]); - else - memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], - stride[2]); + memcpy_pic(dst, image[idx_p1], w, h, xvimage[current_buf]->pitches[1], + stride[idx_p1]); dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + xvimage[current_buf]->pitches[2] * y + x; - if (image_format == IMGFMT_YV12) - memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], - stride[1]); - else - memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], - stride[2]); + memcpy_pic(dst, image[idx_p2], w, h, xvimage[current_buf]->pitches[1], + stride[idx_p2]); + break; + } return 0; } @@ -476,36 +475,25 @@ static uint32_t get_image(mp_image_t * mpi) if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0])) { + int idx_p1 = 1, idx_p2 = 2; current_buf = buf; mpi->planes[0] = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0]; mpi->stride[0] = xvimage[current_buf]->pitches[0]; mpi->width = mpi->stride[0] / (mpi->bpp / 8); - if (mpi->flags & MP_IMGFLAG_PLANAR) - { - if (mpi->flags & MP_IMGFLAG_SWAPPED) - { - // I420 + switch (image_format) { + case IMGFMT_YV12: + idx_p1 = 2; idx_p2 = 1; + default: mpi->planes[1] = xvimage[current_buf]->data + - xvimage[current_buf]->offsets[1]; + xvimage[current_buf]->offsets[idx_p1]; mpi->planes[2] = xvimage[current_buf]->data + - xvimage[current_buf]->offsets[2]; - mpi->stride[1] = xvimage[current_buf]->pitches[1]; - mpi->stride[2] = xvimage[current_buf]->pitches[2]; - } else - { - // YV12 - mpi->planes[1] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[2]; - mpi->planes[2] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[1]; - mpi->stride[1] = xvimage[current_buf]->pitches[2]; - mpi->stride[2] = xvimage[current_buf]->pitches[1]; - } + xvimage[current_buf]->offsets[idx_p2]; + mpi->stride[1] = xvimage[current_buf]->pitches[idx_p1]; + mpi->stride[2] = xvimage[current_buf]->pitches[idx_p2]; + break; } mpi->flags |= MP_IMGFLAG_DIRECT; mpi->priv = (void *)(intptr_t)current_buf; -- 2.13.2 Alexander

1 5

[PATCH 1/5] vo_xv: Simplify plane swapping
by Alexander Strasser 10 Jul '17

10 Jul '17

Signed-off-by: Alexander Strasser <eclipse7(a)gmx.net> --- libvo/vo_xv.c | 54 +++++++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 95600fc85..a39c8d504 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -386,12 +386,17 @@ static int draw_slice(uint8_t * image[], int stride[], int w, int h, int x, int y) { uint8_t *dst; + int idx_p1 = 1, idx_p2 = 2; dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + xvimage[current_buf]->pitches[0] * y + x; memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], stride[0]); + switch (image_format) { + case IMGFMT_YV12: + idx_p1 = 2; idx_p2 = 1; + default: x /= 2; y /= 2; w /= 2; @@ -399,21 +404,15 @@ static int draw_slice(uint8_t * image[], int stride[], int w, int h, dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + xvimage[current_buf]->pitches[1] * y + x; - if (image_format != IMGFMT_YV12) - memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], - stride[1]); - else - memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], - stride[2]); + memcpy_pic(dst, image[idx_p1], w, h, xvimage[current_buf]->pitches[1], + stride[idx_p1]); dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + xvimage[current_buf]->pitches[2] * y + x; - if (image_format == IMGFMT_YV12) - memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], - stride[1]); - else - memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], - stride[2]); + memcpy_pic(dst, image[idx_p2], w, h, xvimage[current_buf]->pitches[1], + stride[idx_p2]); + break; + } return 0; } @@ -476,36 +475,25 @@ static uint32_t get_image(mp_image_t * mpi) if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0])) { + int idx_p1 = 1, idx_p2 = 2; current_buf = buf; mpi->planes[0] = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0]; mpi->stride[0] = xvimage[current_buf]->pitches[0]; mpi->width = mpi->stride[0] / (mpi->bpp / 8); - if (mpi->flags & MP_IMGFLAG_PLANAR) - { - if (mpi->flags & MP_IMGFLAG_SWAPPED) - { - // I420 + switch (image_format) { + case IMGFMT_YV12: + idx_p1 = 2; idx_p2 = 1; + default: mpi->planes[1] = xvimage[current_buf]->data + - xvimage[current_buf]->offsets[1]; + xvimage[current_buf]->offsets[idx_p1]; mpi->planes[2] = xvimage[current_buf]->data + - xvimage[current_buf]->offsets[2]; - mpi->stride[1] = xvimage[current_buf]->pitches[1]; - mpi->stride[2] = xvimage[current_buf]->pitches[2]; - } else - { - // YV12 - mpi->planes[1] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[2]; - mpi->planes[2] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[1]; - mpi->stride[1] = xvimage[current_buf]->pitches[2]; - mpi->stride[2] = xvimage[current_buf]->pitches[1]; - } + xvimage[current_buf]->offsets[idx_p2]; + mpi->stride[1] = xvimage[current_buf]->pitches[idx_p1]; + mpi->stride[2] = xvimage[current_buf]->pitches[idx_p2]; + break; } mpi->flags |= MP_IMGFLAG_DIRECT; mpi->priv = (void *)(intptr_t)current_buf; --

3 12

Re: [MPlayer-dev-eng] [MPlayer-cvslog] r37945 - trunk/configure
by Roberto Togni 03 Jul '17

03 Jul '17

On Fri, 30 Jun 2017 23:29:33 +0300 (EEST) rtogni <subversion(a)mplayerhq.hu> wrote: > Author: rtogni > Date: Fri Jun 30 23:29:33 2017 > New Revision: 37945 > > Log: > Fix compilation after FFmpeg 0cc0c5b6dbf187f9c096de03d999da040197ffe6 > > This puts .o files from .asm sources back to the arch subdir, not wrongly in > ffmpeg root as it's now > > Modified: > trunk/configure > > Modified: trunk/configure > ============================================================================== > --- trunk/configure Sun Jun 25 20:02:14 2017 (r37944) > +++ trunk/configure Fri Jun 30 23:29:33 2017 (r37945) > @@ -8659,7 +8659,7 @@ X86ASM = $_yasm > DEPYASM = $_yasm > DEPX86ASM = $_yasm > YASMFLAGS = $YASMFLAGS > -X86ASMFLAGS = $YASMFLAGS > +X86ASMFLAGS = $YASMFLAGS -o\$@ > DEPX86ASMFLAGS=\$(X86ASMFLAGS) > STRIP = strip > I'm not really sure why this is needed, it should be added because of X86ASM_O by ffmpeg build system. But since it's needed to fix compilation I commmitted it anyway. Also asm dep generation is probably broken, but I didn't checked it too carefully. Ciao, Roberto

2 1