[vlc-devel] [PATCH] video_output: add support for Flaschen-Taschen screen protocol
Rémi Denis-Courmont
remi at remlab.net
Sun Jun 19 08:56:12 CEST 2016
On Sunday 19 June 2016 01:48:29 François Revol wrote:
> cf.
> https://github.com/hzeller/flaschen-taschen/blob/master/doc/protocols.md
>
> * TODO implement offset_{x,y,z} ? (mostly useful for games though)
> * TODO try to fix aspect ratio (it's 1:1 always)
> * TODO limit the framerate? It seems like we get lots of errors from
> net_Write()... ---
> modules/video_output/Makefile.am | 2 +
> modules/video_output/flaschen.c | 244
> +++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+)
> create mode 100644 modules/video_output/flaschen.c
>
> diff --git a/modules/video_output/Makefile.am
> b/modules/video_output/Makefile.am index e05d02a..24b77ba 100644
> --- a/modules/video_output/Makefile.am
> +++ b/modules/video_output/Makefile.am
> @@ -367,11 +367,13 @@ endif
>
>
> ### Common ###
> +libflaschen_plugin_la_SOURCES = video_output/flaschen.c
> libvdummy_plugin_la_SOURCES = video_output/vdummy.c
> libvmem_plugin_la_SOURCES = video_output/vmem.c
> libyuv_plugin_la_SOURCES = video_output/yuv.c
>
> vout_LTLIBRARIES += \
> + libflaschen_plugin.la \
> libvdummy_plugin.la \
> libvmem_plugin.la \
> libyuv_plugin.la
> diff --git a/modules/video_output/flaschen.c
> b/modules/video_output/flaschen.c new file mode 100644
> index 0000000..6fa725e
> --- /dev/null
> +++ b/modules/video_output/flaschen.c
> @@ -0,0 +1,244 @@
> +/**************************************************************************
> *** + * flaschentaschen.c: Flaschen-Taschen video output display for vlc + *
> cf. https://github.com/hzeller/flaschen-taschen
> +
> ***************************************************************************
> ** + * Copyright (C) 2000-2009 VLC authors and VideoLAN
> + * Copyright (C) 2016 François Revol <revol at free.fr>
> + *
> + * Includes code from vdummy.c and aa.c:
> + * Authors: Samuel Hocevar <sam at zoy.org>
> + * Authors: Sigmund Augdal Helberg <dnumgis at videolan.org>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU Lesser General Public License as published by
> + * the Free Software Foundation; either version 2.1 of the License, or + *
> (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public License
> + * along with this program; if not, write to the Free Software Foundation,
> + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. +
> ***************************************************************************
> **/ +
> +/**************************************************************************
> *** + * Preamble
> +
> ***************************************************************************
> **/ +
> +#ifdef HAVE_CONFIG_H
> +# include "config.h"
> +#endif
> +
> +#include <vlc_common.h>
> +#include <vlc_network.h>
> +#include <vlc_plugin.h>
> +#include <vlc_vout_display.h>
> +
> +#define T_FLDISPLAY N_("Flaschen-Taschen display address")
> +#define LT_FLDISPLAY N_( \
> + "IP address or hostname of the Flaschen-Taschen display. " \
> + "Something like ft.noise or ftkleine.noise")
> +
> +#define T_WIDTH N_("Width")
> +#define LT_WIDTH N_("Video width.")
> +
> +#define T_HEIGHT N_("Height")
> +#define LT_HEIGHT N_("Video height.")
Please don´t create new translated strings just for punctuation.
> +
> +/*
> + * TODO: implement offset_{x,y,z}
> + * TODO: limit the framerate?
> + */
> +
> +static int Open( vlc_object_t * );
> +static void Close( vlc_object_t * );
> +
> +vlc_module_begin ()
> + set_shortname( N_("Flaschen") )
> + set_description( N_("Flaschen-Taschen video output") )
> + set_capability( "vout display", 0 )
> + set_callbacks( Open, Close )
> + add_shortcut( "flaschen" )
> +
> + set_category( CAT_VIDEO )
> + set_subcategory( SUBCAT_VIDEO_VOUT )
> + add_string( "flaschen-display", NULL, T_FLDISPLAY, LT_FLDISPLAY, true )
> + add_integer("flaschen-width", 25, T_WIDTH, LT_WIDTH, false)
> + add_integer("flaschen-height", 20, T_HEIGHT, LT_HEIGHT, false)
> +vlc_module_end ()
> +
> +
> +/**************************************************************************
> *** + * Local prototypes
> +
> ***************************************************************************
> **/ +struct vout_display_sys_t {
> + int fd;
> +
> + picture_pool_t *pool;
> +};
> +static picture_pool_t *Pool(vout_display_t *, unsigned count);
> +static void Display(vout_display_t *, picture_t *, subpicture_t
> *);
> +static int Control(vout_display_t *, int, va_list);
> +
> +/**************************************************************************
> *** + * OpenVideo: activates flaschen vout display method
> +
> ***************************************************************************
> **/ +static int Open(vlc_object_t *object)
> +{
> + vout_display_t *vd = (vout_display_t *)object;
> + vout_display_sys_t *sys;
> + int fd;
> + unsigned port = 1337;
> +
> + vd->sys = sys = calloc(1, sizeof(*sys));
> + if (!sys)
> + return VLC_ENOMEM;
> + sys->pool = NULL;
> + sys->fd = -1;
> +
> + /* */
> + video_format_t fmt = vd->fmt;
> + fmt.i_chroma = VLC_CODEC_RGB24;
> + fmt.i_rmask = 0x0000ff;
> + fmt.i_gmask = 0x00ff00;
> + fmt.i_bmask = 0xff0000;
> + fmt.i_width = var_InheritInteger(vd, "flaschen-width");
> + fmt.i_height = var_InheritInteger(vd, "flaschen-height");
> + fmt.i_visible_width = fmt.i_width;
> + fmt.i_visible_height = fmt.i_height;
> +
> + /* p_vd->info is not modified */
> +
> + char *display = var_InheritString(vd, "flaschen-display");
> + if (!display)
> + display = strdup("ftkleine.noise");
??
> + msg_Dbg(vd, "using display at %s (%dx%d)", display, fmt.i_width,
> fmt.i_height);
> +
> + fd = net_ConnectDgram( vd, display, port, -1, IPPROTO_UDP );
> + free(display);
> +
> + if( fd == -1 )
> + {
> + msg_Err( vd,
> + "cannot create UDP socket for %s port %u",
> + display, port );
> + free(sys);
> + return VLC_EGENERIC;
> + }
> + sys->fd = fd;
> +
> + /* Ignore any unexpected incoming packet */
> + setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0 }, sizeof (int));
> +
> +
> + vd->fmt = fmt;
> +
> + vd->pool = Pool;
> + vd->prepare = NULL;
> + vd->display = Display;
> + vd->control = Control;
> + vd->manage = NULL;
> +
> + vout_display_DeleteWindow(vd, NULL);
> +
> + return VLC_SUCCESS;
> +}
> +
> +static void Close(vlc_object_t *object)
> +{
> + vout_display_t *vd = (vout_display_t *)object;
> + vout_display_sys_t *sys = vd->sys;
> +
> + if (sys->pool)
> + picture_pool_Release(sys->pool);
> +
> + net_Close(sys->fd);
> + free(sys);
> +}
> +
> +static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
> +{
> + vout_display_sys_t *sys = vd->sys;
> + if (!sys->pool)
> + sys->pool = picture_pool_NewFromFormat(&vd->fmt, count);
> + return sys->pool;
> +}
> +
> +static void Display(vout_display_t *vd, picture_t *picture, subpicture_t
> *subpicture)
> +{
> + vout_display_sys_t *sys = vd->sys;
> + int result;
> + VLC_UNUSED(vd);
Why?
> + VLC_UNUSED(subpicture);
> +
> + char *buffer = calloc(1, 64 + vd->fmt.i_width * vd->fmt.i_height * 3);
> + if (buffer) {
> + int header_len = snprintf(buffer, 64, "P6\n%d %d\n255\n",
> + vd->fmt.i_width, vd->fmt.i_height);
Lack of sequence number means the other end might receive picture is incorrect
order. Just saying.
> + uint8_t *dst = (uint8_t *)buffer + header_len;
> + uint8_t *src = picture->p->p_pixels;
> + unsigned int l, c;
> + for (l = 0; l < vd->fmt.i_height; l++)
> + {
> + for (c = 0; c < vd->fmt.i_width; c++)
> + {
> + uint8_t *d = &dst[c*3];
> + uint8_t *s = &src[c*3];
> + d[0] = s[0];
> + d[1] = s[1];
> + d[2] = s[2];
> + }
> + dst += vd->fmt.i_width * 3;
> + src += picture->p->i_pitch;
> + }
Memory copy is lame. Use struct iovec.
> +
> +
> + result = net_Write(vd, sys->fd, buffer, header_len +
> vd->fmt.i_width * vd->fmt.i_height * 3);
> +
> + /* TODO: check for errors; seems we flood a little...*/
> + VLC_UNUSED(result);
> + }
> + free(buffer);
> + picture_Release(picture);
> +}
> +
> +/**
> + * Control for vout display
> + */
> +static int Control(vout_display_t *vd, int query, va_list args)
> +{
> + VLC_UNUSED(args);
> + vout_display_sys_t *sys = vd->sys;
> +
> + switch (query) {
> + case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
> + /* We have to ignore what is requested */
> + vout_display_SendEventPicturesInvalid(vd);
Why do you invalidate?
> + return VLC_SUCCESS;
> +
> + case VOUT_DISPLAY_RESET_PICTURES:
> + if (sys->pool)
> + picture_pool_Release(sys->pool);
> + sys->pool = NULL;
> +
> + vd->fmt.i_width = var_InheritInteger(vd, "flaschen-width");
> + vd->fmt.i_height = var_InheritInteger(vd, "flaschen-height");
> + return VLC_SUCCESS;
Seems useless?
> +
> + case VOUT_DISPLAY_CHANGE_ZOOM:
> + case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
> + case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
> + return VLC_EGENERIC;
> +
> + case VOUT_DISPLAY_HIDE_MOUSE:
> + /* not really working */
> + return VLC_SUCCESS;
> +
> + default:
> + msg_Err(vd, "Unsupported query in vout display flaschen");
> + return VLC_EGENERIC;
> + }
> +}
--
Rémi Denis-Courmont
http://www.remlab.net/
More information about the vlc-devel
mailing list