Fixed vaapi SD streams

- no .drirc needad anymore

.indent.pro

@@ -0,0 +1,37 @@
+--blank-lines-before-block-comments
+--blank-lines-after-declarations
+--blank-lines-after-procedures
+--no-blank-lines-after-commas
+--braces-on-if-line
+--no-blank-before-sizeof
+--comment-indentation41
+--declaration-comment-column41
+--no-comment-delimiters-on-blank-lines
+--swallow-optional-blank-lines
+--dont-format-comments
+--parameter-indentation4
+--indent-level4
+--line-comments-indentation0
+--cuddle-else
+--cuddle-do-while
+--brace-indent0
+--case-brace-indentation0
+//--start-left-side-of-comments
+--leave-preprocessor-space
+//--continuation-indentation8
+--case-indentation4
+--else-endif-column0
+--no-space-after-casts
+--declaration-indentation1
+--dont-line-up-parentheses
+--no-space-after-function-call-names
+--space-special-semicolon
+--tab-size4
+--no-tabs
+--line-length119
+--comment-line-length119
+--honour-newlines
+--dont-break-procedure-type
+--break-before-boolean-operator
+--continuation-indentation4
+--ignore-newlines

Makefile

@@ -1,46 +1,76 @@
 #
 # Makefile for a Video Disk Recorder plugin
-#
+# 
 # $Id: 2a41981a57e5e83036463c6a08c84b86ed9d2be3 $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
 
-PLUGIN = softhdcuvid
 
 ### Configuration (edit this for your needs)
+#  config as  needed
 
-    # support alsa audio output module
+# what kind of decoder do we make - 
+# if VAAPI is enabled the pluginname is softhdvaapi
+# if CUVID is enabled the pluginname is softhdcuvid
+# if DRM   is enabled the pluginname is softhddrm
+VAAPI ?= 0
+CUVID ?= 1
+
+# if you enable DRM then the plugin will only run without X server
+# only valid for VAAPI 
+# does not work with libplacebo
+DRM= ?= 0
+
+
+# use libplacebo - available for both decoders but not for DRM  
+LIBPLACEBO ?= 0
+
+# use YADIF deint - only available with cuvid
+#YADIF=1
+
+
+
+CONFIG :=  #-DDEBUG 		# remove # to enable debug output
+
+
+
+
+
+
+
+
+
+#--------------------- no more config needed past this point--------------------------------
+PLUGIN = softhdcuvid
+
+# support OPENGLOSD always needed
+OPENGLOSD=1
+
+# support alsa audio output module
 ALSA ?= $(shell pkg-config --exists alsa && echo 1)
     # support OSS audio output module
 OSS ?= 1
-    # support OPENGLOSD 
-OPENGLOSD=1
 
-    # use Libplacebo 
-LIBPLACEBO=0
-
-	# use DMPS
+# use DMPS
 SCREENSAVER=1
 
 OPENGL=1
-    # use ffmpeg libswresample
-#SWRESAMPLE ?= $(shell pkg-config --exists libswresample && echo 1)
-SWRESAMPLE = 1
-    # use libav libavresample
-ifneq ($(SWRESAMPLE),1)
-AVRESAMPLE ?= $(shell pkg-config --exists libavresample && echo 1)
-AVRESAMPLE = 0
-endif
 
-CONFIG :=  #-DDEBUG #-DOSD_DEBUG	# enable debug output+functions
-CONFIG += -DCUVID			# enable CUVID decoder
+# use ffmpeg libswresample
+SWRESAMPLE ?= $(shell pkg-config --exists libswresample && echo 1)
+SWRESAMPLE = 1
+
+# use libav libavresample
+#ifneq ($(SWRESAMPLE),1)
+#AVRESAMPLE ?= $(shell pkg-config --exists libavresample && echo 1#)
+#AVRESAMPLE = 1
+#endif
+
 CONFIG += -DHAVE_GL			# needed for mpv libs
 #CONFIG += -DSTILL_DEBUG=2		# still picture debug verbose level
-
 CONFIG += -DAV_INFO -DAV_INFO_TIME=3000	# info/debug a/v sync
-CONFIG += -DUSE_PIP			# PIP support
 #CONFIG += -DHAVE_PTHREAD_NAME		# supports new pthread_setname_np
 #CONFIG += -DNO_TS_AUDIO		# disable ts audio parser
 #CONFIG += -DUSE_TS_VIDEO		# build new ts video parser
@@ -53,8 +83,9 @@ CONFIG += -DUSE_VDR_SPU			# use VDR SPU decoder.
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = $(shell grep 'static const char \*const VERSION *=' $(PLUGIN).cpp | awk '{ print $$7 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char \*const VERSION *=' softhdcuvid.cpp | awk '{ print $$7 }' | sed -e 's/[";]//g')
 GIT_REV = $(shell git describe --always 2>/dev/null)
+### The name of the distribution archive:
 
 ### The directory environment:
 
@@ -86,14 +117,7 @@ APIVERSION = $(call PKGCFG,apiversion)
 
 -include $(PLGCFG)
 
-### The name of the distribution archive:
 
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### The name of the shared object file:
-
-SOFILE = libvdr-$(PLUGIN).so
 
 ### Parse softhddevice config
 
@@ -102,37 +126,76 @@ CONFIG += -DUSE_ALSA
 _CFLAGS += $(shell pkg-config --cflags alsa)
 LIBS += $(shell pkg-config --libs alsa)
 endif
+
 ifeq ($(OSS),1)
 CONFIG += -DUSE_OSS
 endif
+
 ifeq ($(OPENGL),1)
-_CFLAGS += $(shell pkg-config --cflags libva-glx)
-LIBS += $(shell pkg-config --libs libva-glx)
+#_CFLAGS += $(shell pkg-config --cflags libva-glx)
+#LIBS += $(shell pkg-config --libs libva-glx)
 endif
+
 ifeq ($(OPENGLOSD),1)
 CONFIG += -DUSE_OPENGLOSD
 endif
+
 ifeq ($(OPENGL),1)
 CONFIG += -DUSE_GLX
 _CFLAGS += $(shell pkg-config --cflags gl glu glew)
-LIBS += $(shell pkg-config --libs gl glu glew)
-_CFLAGS += $(shell pkg-config --cflags glew)
-LIBS += $(shell pkg-config --libs glew) 
+#LIBS += $(shell pkg-config --libs glu  glew)
 _CFLAGS += $(shell pkg-config --cflags freetype2)
 LIBS   += $(shell pkg-config --libs freetype2)
 endif
+
+ifeq ($(VAAPI),1)
+CONFIG += -DVAAPI 
+#LIBPLACEBO=1
+PLUGIN = softhdvaapi
+LIBS += -lEGL  
+endif
+
 ifeq ($(LIBPLACEBO),1)
 CONFIG += -DPLACEBO
 endif
 
+ifeq ($(DRM),1)
+PLUGIN = softhddrm
+CONFIG += -DUSE_DRM -DVAAPI
+_CFLAGS += $(shell pkg-config --cflags libdrm)
+LIBS += -lgbm -ldrm
+LIBS += -lEGL  
+endif
+
+
+ifeq ($(CUVID),1)
+CONFIG += -DUSE_PIP			# PIP support
+CONFIG += -DCUVID			# enable CUVID decoder
+LIBS += -lEGL -lGL 
+ifeq ($(YADIF),1)
+CONFIG += -DYADIF			# Yadif only with CUVID
+endif
+endif
+
+
+
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
+
 #
 # Test that libswresample is available 
 #
-ifneq (exists, $(shell pkg-config libswresample && echo exists))
-  $(warning ******************************************************************)
-  $(warning 'libswresample' not found!)
-  $(error ******************************************************************)
-endif
+#ifneq (exists, $(shell pkg-config libswresample && echo exists))
+#  $(warning ******************************************************************)
+#  $(warning 'libswresample' not found!)
+#  $(error ******************************************************************)
+#endif
 
 #
 # Test and set config for libavutil 
@@ -165,7 +228,7 @@ ifneq (exists, $(shell pkg-config libavcodec && echo exists))
   $(error ******************************************************************)
 endif
 _CFLAGS += $(shell pkg-config --cflags libavcodec)
-LIBS += $(shell pkg-config --libs libavcodec)
+LIBS += $(shell pkg-config --libs libavcodec libavfilter)
 
 
 ifeq ($(SCREENSAVER),1)
@@ -178,11 +241,11 @@ CONFIG += -DUSE_SWRESAMPLE
 _CFLAGS += $(shell pkg-config --cflags libswresample)
 LIBS += $(shell pkg-config --libs libswresample)
 endif
-#ifeq ($(AVRESAMPLE),1)
-#CONFIG += -DUSE_AVRESAMPLE
-#_CFLAGS += $(shell pkg-config --cflags libavresample)
-#LIBS += $(shell pkg-config --libs libavresample)
-#endif
+ifeq ($(AVRESAMPLE),1)
+CONFIG += -DUSE_AVRESAMPLE
+_CFLAGS += $(shell pkg-config --cflags libavresample)
+LIBS += $(shell pkg-config --libs libavresample)
+endif
 
 #_CFLAGS += $(shell pkg-config --cflags libavcodec x11 x11-xcb xcb xcb-icccm)
 #LIBS += -lrt $(shell pkg-config --libs libavcodec x11 x11-xcb xcb xcb-icccm)
@@ -192,14 +255,18 @@ LIBS += -lrt $(shell pkg-config --libs  x11 x11-xcb xcb xcb-icccm)
 _CFLAGS += -I/usr/local/cuda/include 
 _CFLAGS += -I./opengl -I./
 
-LIBS += -L/usr/lib64/opengl/nvidia/lib
+LIBS += -L/usr/lib64
 LIBS += -L/usr/local/cuda/lib64
 
 ifeq ($(LIBPLACEBO),1)
-LIBS += -lplacebo -lglut
+LIBS += -lplacebo 
 endif
 
-LIBS += -lGLEW  -lGLX -ldl -lcuda  -L/usr/local/cuda/targets/x86_64-linux/lib -lcudart -lnvcuvid 
+ifeq ($(CUVID),1)
+LIBS +=  -lcuda  -L/usr/local/cuda/targets/x86_64-linux/lib -lcudart -lnvcuvid  
+endif
+
+LIBS += -lGLEW -lGLU  -ldl -lglut 
 ### Includes and Defines (add further entries here):
 
 INCLUDES +=
@@ -210,19 +277,19 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE $(CONFIG) \
 ### Make it standard
 
 override CXXFLAGS += $(_CFLAGS) $(DEFINES) $(INCLUDES) \
-    -g  -Wextra -Winit-self -Werror=overloaded-virtual -std=c++0x 
+    -g  -W -Wextra -Winit-self -Werror=overloaded-virtual  -Wno-unused-parameter 
 override CFLAGS	  += $(_CFLAGS) $(DEFINES) $(INCLUDES) \
     -g -W  -Wextra -Winit-self -Wdeclaration-after-statement
 
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o softhddev.o video.o audio.o codec.o ringbuffer.o  
+OBJS = softhdcuvid.o softhddev.o video.o audio.o codec.o ringbuffer.o  
 ifeq ($(OPENGLOSD),1)
 OBJS += openglosd.o 
 endif
 
-SRCS = $(wildcard $(OBJS:.o=.c)) $(PLUGIN).cpp
+SRCS = $(wildcard $(OBJS:.o=.c)) *.cpp
 
 ### The main target:
 

README.md

@@ -5,7 +5,7 @@ Copyright (c) 2018 by jojo61.  All Rights Reserved.
 
 Contributor(s):
 
-jojo61 
+jojo61
 
 License: AGPLv3
 
@@ -31,24 +31,28 @@ A software and GPU emulated UHD output device plugin for VDR.
     o HDMI/SPDIF pass-through
     o Software volume, compression, normalize and channel resample
     o VDR ScaleVideo API
-    o CUDA deinterlacer 
+    o CUDA deinterlacer
     o Autocrop
     o Suspend / Dettach
     o PIP (Picture-in-Picture) (not working yet)
 
 
-To compile you must have the 'requires' installed. 
+To compile you must have the 'requires' installed.
 
 
-This is a fork of johns original softhddevice work and I reworked ist to support HEVC with CUDA and opengl output.
+This is a fork of johns original softhddevice work and I reworked it to support HEVC with CUDA and opengl output.
 Currently I have tested it with a GTX 1050 from NVIDIA. SD, HD and UHD is working.
 
-Current Status NVIDA:
+Current Status NVIDIA:
 The CUDA driver supports HEVC with 8 Bit and 10 Bit up to UHD resolution. Opengl is able to output also 10 Bit, but NVIDIA does not support to output 10 Bit via HDMI.
-Only via DisplayPort you can get 10 Bit output to a ompatible screen. This is a restriction from NVIDIA.
+Only via DisplayPort you can get 10 Bit output to a compatible screen. This is a restriction from NVIDIA.
 
+Current Status with VAAPI
+You need libplacebo.
+It is still beta and I tested it with Intel VAAPI. If you have problmes with the shaders then copy the drirc file in your home directory as .drirc
+AMD VAAPI is broken by AMD and will not work currently. The vaapi_deinterlace is broken and the amdgpu driver is instable. I have not testet with amdgpupro
 
-You have to adapt the Makefile to your needs. I use FFMPEG 4.0 
+You have to adapt the Makefile to your needs. I use FFMPEG 4.0
 The Makefile expects the CUDA SDK in /usr/local/cuda. Currently it is tested with CUDA 10
 
 Unfortunatly older FFMEGs has a bug with deinterlacing cuda frames. Best to get the latest FFMPEG Version.
@@ -61,13 +65,16 @@ old:
 new:
      ctx->frame_queue = av_fifo_alloc((ctx->nb_surfaces + 2 ) * sizeof(CuvidParsedFrame));
 
-This Version supports building with libplacebo. https://github.com/haasn/libplacebo 
+This Version supports building with libplacebo. https://github.com/haasn/libplacebo
 You have to enable it in the Makefile and install libplacebo yourself.
-At the moment this is Work in progress and the used upscaler is hardcoded. This will be changend to be configurable.
+At the moment this is Work in progress.
 It also needs the NVIDIA driver 410.48 or newer as well as CUDA 10.
 
+In the settings you can enable a correction for Colorblindness. First you have to decide what kind of colorblindness to use. And then the faktor of correction. If the faktor is negativ than the selected type of colorblindness is simulated. If the faktor is positiv then the colors are enhanced to try to correct the deficiency.
 
+Also you can enable a Scaler Test feature. When enabled then the screen is split.On the left half you will see the scaler defined by Scaler Test and on the right side you will see the scaler defined at the Resolution setting. There is as small black line between the halfs to remaind you that Scaler Test is activ.
 
+If your FFMEG supports it then you can enable YADIF in the Makefile and select btween the buildin NVIDIA CUDA deinterlacer and the YADIF cuda deinterlacer.
 
 Good luck
 jojo61
@@ -369,40 +376,5 @@ Requires:
     or
 	kernel support for oss/oss4 or alsa oss emulation
 
-	x11-libs/libva (deprecated)
-		Video Acceleration (VA) API for Linux
-		http://www.freedesktop.org/wiki/Software/vaapi
-	x11-libs/libva-intel-driver
-		HW video decode support for Intel integrated graphics
-		http://www.freedesktop.org/wiki/Software/vaapi
-    or
-	x11-libs/vdpau-video
-		VDPAU Backend for Video Acceleration (VA) API
-		http://www.freedesktop.org/wiki/Software/vaapi
-    or
-	x11-libs/xvba-video
-		XVBA Backend for Video Acceleration (VA) API
-		http://www.freedesktop.org/wiki/Software/vaapi
-
-	x11-libs/libvdpau
-		VDPAU wrapper and trace libraries
-		http://www.freedesktop.org/wiki/Software/VDPAU
-
-	x11-libs/libxcb,
-		X C-language Bindings library
-		http://xcb.freedesktop.org
-	x11-libs/xcb-util,
-	x11-libs/xcb-util-wm,
-	x11-libs/xcb-util-keysyms
-		X C-language Bindings library
-		http://xcb.freedesktop.org
-		Only versions >= 0.3.8 are good supported
-
-	x11-libs/libX11
-		X.Org X11 library
-		http://xorg.freedesktop.org
-
-	GNU Make 3.xx
-		http://www.gnu.org/software/make/make.html
 
 Optional:

audio.h

@@ -1,67 +1,67 @@
 ///
-///	@file audio.h		@brief Audio module headerfile
+/// @file audio.h   @brief Audio module headerfile
 ///
-///	Copyright (c) 2009 - 2014 by Johns.  All Rights Reserved.
+/// Copyright (c) 2009 - 2014 by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: da055758af70cfdb9ab1989d5fcfb218c5d6a366 $
+/// $Id: da055758af70cfdb9ab1989d5fcfb218c5d6a366 $
 //////////////////////////////////////////////////////////////////////////////
 
 /// @addtogroup Audio
 /// @{
 
 //----------------------------------------------------------------------------
-//	Prototypes
+//  Prototypes
 //----------------------------------------------------------------------------
 
-extern void AudioEnqueue(const void *, int);	///< buffer audio samples
-extern void AudioFlushBuffers(void);	///< flush audio buffers
-extern void AudioPoller(void);		///< poll audio events/handling
-extern int AudioFreeBytes(void);	///< free bytes in audio output
-extern int AudioUsedBytes(void);	///< used bytes in audio output
-extern int64_t AudioGetDelay(void);	///< get current audio delay
-extern void AudioSetClock(int64_t);	///< set audio clock base
-extern int64_t AudioGetClock();		///< get current audio clock
-extern void AudioSetVolume(int);	///< set volume
-extern int AudioSetup(int *, int *, int);	///< setup audio output
+extern void AudioEnqueue(const void *, int);    ///< buffer audio samples
+extern void AudioFlushBuffers(void);    ///< flush audio buffers
+extern void AudioPoller(void);          ///< poll audio events/handling
+extern int AudioFreeBytes(void);        ///< free bytes in audio output
+extern int AudioUsedBytes(void);        ///< used bytes in audio output
+extern int64_t AudioGetDelay(void);     ///< get current audio delay
+extern void AudioSetClock(int64_t);     ///< set audio clock base
+extern int64_t AudioGetClock();         ///< get current audio clock
+extern void AudioSetVolume(int);        ///< set volume
+extern int AudioSetup(int *, int *, int);   ///< setup audio output
 
-extern void AudioPlay(void);		///< play audio
-extern void AudioPause(void);		///< pause audio
+extern void AudioPlay(void);            ///< play audio
+extern void AudioPause(void);           ///< pause audio
 
-extern void AudioSetBufferTime(int);	///< set audio buffer time
-extern void AudioSetSoftvol(int);	///< enable/disable softvol
-extern void AudioSetNormalize(int, int);	///< set normalize parameters
-extern void AudioSetCompression(int, int);	///< set compression parameters
-extern void AudioSetStereoDescent(int);	///< set stereo loudness descent
+extern void AudioSetBufferTime(int);    ///< set audio buffer time
+extern void AudioSetSoftvol(int);       ///< enable/disable softvol
+extern void AudioSetNormalize(int, int);    ///< set normalize parameters
+extern void AudioSetCompression(int, int);  ///< set compression parameters
+extern void AudioSetStereoDescent(int); ///< set stereo loudness descent
 
-extern void AudioSetDevice(const char *);	///< set PCM audio device
+extern void AudioSetDevice(const char *);   ///< set PCM audio device
 
     /// set pass-through device
 extern void AudioSetPassthroughDevice(const char *);
-extern void AudioSetChannel(const char *);	///< set mixer channel
-extern void AudioSetAutoAES(int);	///< set automatic AES flag handling
-extern void AudioInit(void);		///< setup audio module
-extern void AudioExit(void);		///< cleanup and exit audio module
+extern void AudioSetChannel(const char *);  ///< set mixer channel
+extern void AudioSetAutoAES(int);       ///< set automatic AES flag handling
+extern void AudioInit(void);            ///< setup audio module
+extern void AudioExit(void);            ///< cleanup and exit audio module
 
 //----------------------------------------------------------------------------
-//	Variables
+//  Variables
 //----------------------------------------------------------------------------
 
-extern char AudioAlsaDriverBroken;	///< disable broken driver message
-extern char AudioAlsaNoCloseOpen;	///< disable alsa close/open fix
-extern char AudioAlsaCloseOpenDelay;	///< enable alsa close/open delay fix
+extern char AudioAlsaDriverBroken;      ///< disable broken driver message
+extern char AudioAlsaNoCloseOpen;       ///< disable alsa close/open fix
+extern char AudioAlsaCloseOpenDelay;    ///< enable alsa close/open delay fix
 
 /// @}

codec.h

@@ -1,173 +1,175 @@
 ///
-///	@file codec.h	@brief Codec module headerfile
+/// @file codec.h   @brief Codec module headerfile
 ///
-///	Copyright (c) 2009 - 2013, 2015 by Johns.  All Rights Reserved.
+/// Copyright (c) 2009 - 2013, 2015 by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: bdb4d18dbe371e497d039e45faa7c134b019860a $
+/// $Id: bdb4d18dbe371e497d039e45faa7c134b019860a $
 //////////////////////////////////////////////////////////////////////////////
 
 /// @addtogroup Codec
 /// @{
 
 //----------------------------------------------------------------------------
-//	Defines
+//  Defines
 //----------------------------------------------------------------------------
 
-#define CodecPCM 0x01			///< PCM bit mask
-#define CodecMPA 0x02			///< MPA bit mask (planned)
-#define CodecAC3 0x04			///< AC-3 bit mask
-#define CodecEAC3 0x08			///< E-AC-3 bit mask
-#define CodecDTS 0x10			///< DTS bit mask (planned)
+#define CodecPCM 0x01                   ///< PCM bit mask
+#define CodecMPA 0x02                   ///< MPA bit mask (planned)
+#define CodecAC3 0x04                   ///< AC-3 bit mask
+#define CodecEAC3 0x08                  ///< E-AC-3 bit mask
+#define CodecDTS 0x10                   ///< DTS bit mask (planned)
 
 #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
 
-enum HWAccelID {
-     HWACCEL_NONE = 0,
-     HWACCEL_AUTO,
-     HWACCEL_VDPAU,
-     HWACCEL_DXVA2,
-     HWACCEL_VDA,
-     HWACCEL_VIDEOTOOLBOX,
-     HWACCEL_QSV,
-     HWACCEL_VAAPI,
-     HWACCEL_CUVID,
+enum HWAccelID
+{
+    HWACCEL_NONE = 0,
+    HWACCEL_AUTO,
+    HWACCEL_VDPAU,
+    HWACCEL_DXVA2,
+    HWACCEL_VDA,
+    HWACCEL_VIDEOTOOLBOX,
+    HWACCEL_QSV,
+    HWACCEL_VAAPI,
+    HWACCEL_CUVID,
 };
- 
+
 extern AVBufferRef *hw_device_ctx;
+
 ///
-///     Video decoder structure.
+/// Video decoder structure.
 ///
 struct _video_decoder_
 {
-     VideoHwDecoder *HwDecoder;          ///< video hardware decoder
- 
-     int GetFormatDone;                  ///< flag get format called!
-     AVCodec *VideoCodec;                ///< video codec
-     AVCodecContext *VideoCtx;           ///< video codec context
- //#ifdef FFMPEG_WORKAROUND_ARTIFACTS
-     int FirstKeyFrame;                  ///< flag first frame
- //#endif
-     AVFrame *Frame;                     ///< decoded video frame
- 
-     /* hwaccel options */
-     enum HWAccelID hwaccel_id;
-     char  *hwaccel_device;
-     enum AVPixelFormat hwaccel_output_format;
- 
-     /* hwaccel context */
-     enum HWAccelID active_hwaccel_id;
-     void  *hwaccel_ctx;
-     void (*hwaccel_uninit)(AVCodecContext *s);
-     int  (*hwaccel_get_buffer)(AVCodecContext *s, AVFrame *frame, int flags);
-     int  (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame);
-     enum AVPixelFormat hwaccel_pix_fmt;
-     enum AVPixelFormat hwaccel_retrieved_pix_fmt;
-     AVBufferRef *hw_frames_ctx;
+    VideoHwDecoder *HwDecoder;          ///< video hardware decoder
 
-     void *hwdec_priv;
-     // For HDR side-data caching
-     double cached_hdr_peak;
-     // From VO
-     struct mp_hwdec_devices *hwdec_devs;
+    int GetFormatDone;                  ///< flag get format called!
+    AVCodec *VideoCodec;                ///< video codec
+    AVCodecContext *VideoCtx;           ///< video codec context
+    // #ifdef FFMPEG_WORKAROUND_ARTIFACTS
+    int FirstKeyFrame;                  ///< flag first frame
+    // #endif
+    // AVFrame *Frame;             ///< decoded video frame
 
+    int filter;                         // flag for deint filter
+
+    /* hwaccel options */
+    enum HWAccelID hwaccel_id;
+    char *hwaccel_device;
+    enum AVPixelFormat hwaccel_output_format;
+
+    /* hwaccel context */
+    enum HWAccelID active_hwaccel_id;
+    void *hwaccel_ctx;
+    void (*hwaccel_uninit)(AVCodecContext * s);
+    int (*hwaccel_get_buffer)(AVCodecContext * s, AVFrame * frame, int flags);
+    int (*hwaccel_retrieve_data)(AVCodecContext * s, AVFrame * frame);
+    enum AVPixelFormat hwaccel_pix_fmt;
+    enum AVPixelFormat hwaccel_retrieved_pix_fmt;
+    AVBufferRef *hw_frames_ctx;
+
+    void *hwdec_priv;
+    // For HDR side-data caching
+    double cached_hdr_peak;
+    // From VO
+    struct mp_hwdec_devices *hwdec_devs;
 
- 
 };
 
 //----------------------------------------------------------------------------
-//	Typedefs
+//  Typedefs
 //----------------------------------------------------------------------------
 
-    /// Video decoder typedef.
+/// Video decoder typedef.
 typedef struct _video_decoder_ VideoDecoder;
 
-    /// Audio decoder typedef.
+/// Audio decoder typedef.
 typedef struct _audio_decoder_ AudioDecoder;
 
 //----------------------------------------------------------------------------
 //  Variables
 //----------------------------------------------------------------------------
 
-    /// x11 display name
+/// x11 display name
 extern const char *X11DisplayName;
 
-    /// HW device context from video module
+/// HW device context from video module
 extern AVBufferRef *HwDeviceContext;
 
 //----------------------------------------------------------------------------
-//	Variables
+//  Variables
 //----------------------------------------------------------------------------
 
-    /// Flag prefer fast xhannel switch
+/// Flag prefer fast xhannel switch
 extern char CodecUsePossibleDefectFrames;
 
 //----------------------------------------------------------------------------
-//	Prototypes
+//  Prototypes
 //----------------------------------------------------------------------------
 
-    /// Allocate a new video decoder context.
+/// Allocate a new video decoder context.
 extern VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder *);
 
-    /// Deallocate a video decoder context.
+/// Deallocate a video decoder context.
 extern void CodecVideoDelDecoder(VideoDecoder *);
 
-    /// Open video codec.
+/// Open video codec.
 extern void CodecVideoOpen(VideoDecoder *, int);
 
-    /// Close video codec.
+/// Close video codec.
 extern void CodecVideoClose(VideoDecoder *);
 
-    /// Decode a video packet.
+/// Decode a video packet.
 extern void CodecVideoDecode(VideoDecoder *, const AVPacket *);
 
-    /// Flush video buffers.
+/// Flush video buffers.
 extern void CodecVideoFlushBuffers(VideoDecoder *);
 
-    /// Allocate a new audio decoder context.
+/// Allocate a new audio decoder context.
 extern AudioDecoder *CodecAudioNewDecoder(void);
 
-    /// Deallocate an audio decoder context.
+/// Deallocate an audio decoder context.
 extern void CodecAudioDelDecoder(AudioDecoder *);
 
-    /// Open audio codec.
+/// Open audio codec.
 extern void CodecAudioOpen(AudioDecoder *, int);
 
-    /// Close audio codec.
+/// Close audio codec.
 extern void CodecAudioClose(AudioDecoder *);
 
-    /// Set audio drift correction.
+/// Set audio drift correction.
 extern void CodecSetAudioDrift(int);
 
-    /// Set audio pass-through.
+/// Set audio pass-through.
 extern void CodecSetAudioPassthrough(int);
 
-    /// Set audio downmix.
+/// Set audio downmix.
 extern void CodecSetAudioDownmix(int);
 
-    /// Decode an audio packet.
+/// Decode an audio packet.
 extern void CodecAudioDecode(AudioDecoder *, const AVPacket *);
 
-    /// Flush audio buffers.
+/// Flush audio buffers.
 extern void CodecAudioFlushBuffers(AudioDecoder *);
 
-    /// Setup and initialize codec module.
+/// Setup and initialize codec module.
 extern void CodecInit(void);
 
-    /// Cleanup and exit codec module.
+/// Cleanup and exit codec module.
 extern void CodecExit(void);
 
 /// @}

common.h

@@ -1,3 +1,4 @@
+
 /*
  * This file is part of mpv.
  *
@@ -8,7 +9,7 @@
  *
  * mpv 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
+ * 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
@@ -52,22 +53,23 @@
 struct GL;
 typedef struct GL GL;
 
-enum {
-    MPGL_CAP_ROW_LENGTH         = (1 << 4),     // GL_[UN]PACK_ROW_LENGTH
-    MPGL_CAP_FB                 = (1 << 5),
-    MPGL_CAP_VAO                = (1 << 6),
-    MPGL_CAP_TEX_RG             = (1 << 10),    // GL_ARB_texture_rg / GL 3.x
-    MPGL_CAP_VDPAU              = (1 << 11),    // GL_NV_vdpau_interop
-    MPGL_CAP_APPLE_RGB_422      = (1 << 12),    // GL_APPLE_rgb_422
-    MPGL_CAP_1D_TEX             = (1 << 14),
-    MPGL_CAP_3D_TEX             = (1 << 15),
-    MPGL_CAP_DEBUG              = (1 << 16),
-    MPGL_CAP_DXINTEROP          = (1 << 17),    // WGL_NV_DX_interop
-    MPGL_CAP_EXT16              = (1 << 18),    // GL_EXT_texture_norm16
-    MPGL_CAP_ARB_FLOAT          = (1 << 19),    // GL_ARB_texture_float
-    MPGL_CAP_EXT_CR_HFLOAT      = (1 << 20),    // GL_EXT_color_buffer_half_float
+enum
+{
+    MPGL_CAP_ROW_LENGTH = (1 << 4),     // GL_[UN]PACK_ROW_LENGTH
+    MPGL_CAP_FB = (1 << 5),
+    MPGL_CAP_VAO = (1 << 6),
+    MPGL_CAP_TEX_RG = (1 << 10),        // GL_ARB_texture_rg / GL 3.x
+    MPGL_CAP_VDPAU = (1 << 11),         // GL_NV_vdpau_interop
+    MPGL_CAP_APPLE_RGB_422 = (1 << 12), // GL_APPLE_rgb_422
+    MPGL_CAP_1D_TEX = (1 << 14),
+    MPGL_CAP_3D_TEX = (1 << 15),
+    MPGL_CAP_DEBUG = (1 << 16),
+    MPGL_CAP_DXINTEROP = (1 << 17),     // WGL_NV_DX_interop
+    MPGL_CAP_EXT16 = (1 << 18),         // GL_EXT_texture_norm16
+    MPGL_CAP_ARB_FLOAT = (1 << 19),     // GL_ARB_texture_float
+    MPGL_CAP_EXT_CR_HFLOAT = (1 << 20), // GL_EXT_color_buffer_half_float
 
-    MPGL_CAP_SW                 = (1 << 30),    // indirect or sw renderer
+    MPGL_CAP_SW = (1 << 30),            // indirect or sw renderer
 };
 
 // E.g. 310 means 3.1
@@ -78,167 +80,146 @@ enum {
 
 #define MPGL_VER_P(ver) MPGL_VER_GET_MAJOR(ver), MPGL_VER_GET_MINOR(ver)
 
-void mpgl_load_functions(GL *gl, void *(*getProcAddress)(const GLubyte *),
-                         const char *ext2, struct mp_log *log);
-void mpgl_load_functions2(GL *gl, void *(*get_fn)(void *ctx, const char *n),
-                          void *fn_ctx, const char *ext2, struct mp_log *log);
+void mpgl_load_functions(GL * gl, void *(*getProcAddress)(const GLubyte *), const char *ext2, struct mp_log *log);
+void mpgl_load_functions2(GL * gl, void *(*get_fn)(void *ctx, const char *n), void *fn_ctx, const char *ext2,
+    struct mp_log *log);
 
-typedef void (GLAPIENTRY *MP_GLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum,
-                                          GLsizei, const GLchar *,const void *);
+typedef void (GLAPIENTRY * MP_GLDEBUGPROC) (GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *, const void *);
 
-//function pointers loaded from the OpenGL library
-struct GL {
-    int version;                // MPGL_VER() mangled (e.g. 210 for 2.1)
-    int es;                     // es version (e.g. 300), 0 for desktop GL
-    int glsl_version;           // e.g. 130 for GLSL 1.30
-    char *extensions;           // Equivalent to GL_EXTENSIONS
-    int mpgl_caps;              // Bitfield of MPGL_CAP_* constants
-    bool debug_context;         // use of e.g. GLX_CONTEXT_DEBUG_BIT_ARB
-    GLuint main_fb;             // framebuffer to render to (normally 0)
+// function pointers loaded from the OpenGL library
+struct GL
+{
+    int version;                        // MPGL_VER() mangled (e.g. 210 for 2.1)
+    int es;                             // es version (e.g. 300), 0 for desktop GL
+    int glsl_version;                   // e.g. 130 for GLSL 1.30
+    char *extensions;                   // Equivalent to GL_EXTENSIONS
+    int mpgl_caps;                      // Bitfield of MPGL_CAP_* constants
+    bool debug_context;                 // use of e.g. GLX_CONTEXT_DEBUG_BIT_ARB
+    GLuint main_fb;                     // framebuffer to render to (normally 0)
 
-    void (GLAPIENTRY *Viewport)(GLint, GLint, GLsizei, GLsizei);
-    void (GLAPIENTRY *Clear)(GLbitfield);
-    void (GLAPIENTRY *GenTextures)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeleteTextures)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
-    void (GLAPIENTRY *Enable)(GLenum);
-    void (GLAPIENTRY *Disable)(GLenum);
-    const GLubyte *(GLAPIENTRY * GetString)(GLenum);
-    void (GLAPIENTRY *BlendFuncSeparate)(GLenum, GLenum, GLenum, GLenum);
-    void (GLAPIENTRY *Flush)(void);
-    void (GLAPIENTRY *Finish)(void);
-    void (GLAPIENTRY *PixelStorei)(GLenum, GLint);
-    void (GLAPIENTRY *TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint,
-                                  GLenum, GLenum, const GLvoid *);
-    void (GLAPIENTRY *TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei,
-                                  GLint, GLenum, GLenum, const GLvoid *);
-    void (GLAPIENTRY *TexSubImage2D)(GLenum, GLint, GLint, GLint,
-                                     GLsizei, GLsizei, GLenum, GLenum,
-                                     const GLvoid *);
-    void (GLAPIENTRY *TexParameteri)(GLenum, GLenum, GLint);
-    void (GLAPIENTRY *GetIntegerv)(GLenum, GLint *);
-    void (GLAPIENTRY *ReadPixels)(GLint, GLint, GLsizei, GLsizei, GLenum,
-                                  GLenum, GLvoid *);
-    void (GLAPIENTRY *ReadBuffer)(GLenum);
-    void (GLAPIENTRY *DrawArrays)(GLenum, GLint, GLsizei);
-    GLenum (GLAPIENTRY *GetError)(void);
-    void (GLAPIENTRY *GetTexLevelParameteriv)(GLenum, GLint, GLenum, GLint *);
-    void (GLAPIENTRY *Scissor)(GLint, GLint, GLsizei, GLsizei);
+    void (GLAPIENTRY * Viewport) (GLint, GLint, GLsizei, GLsizei);
+    void (GLAPIENTRY * Clear) (GLbitfield);
+    void (GLAPIENTRY * GenTextures) (GLsizei, GLuint *);
+    void (GLAPIENTRY * DeleteTextures) (GLsizei, const GLuint *);
+    void (GLAPIENTRY * ClearColor) (GLclampf, GLclampf, GLclampf, GLclampf);
+    void (GLAPIENTRY * Enable) (GLenum);
+    void (GLAPIENTRY * Disable) (GLenum);
+    const GLubyte *(GLAPIENTRY * GetString) (GLenum);
+    void (GLAPIENTRY * BlendFuncSeparate) (GLenum, GLenum, GLenum, GLenum);
+    void (GLAPIENTRY * Flush) (void);
+    void (GLAPIENTRY * Finish) (void);
+    void (GLAPIENTRY * PixelStorei) (GLenum, GLint);
+    void (GLAPIENTRY * TexImage1D) (GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+    void (GLAPIENTRY * TexImage2D) (GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+    void (GLAPIENTRY * TexSubImage2D) (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+    void (GLAPIENTRY * TexParameteri) (GLenum, GLenum, GLint);
+    void (GLAPIENTRY * GetIntegerv) (GLenum, GLint *);
+    void (GLAPIENTRY * ReadPixels) (GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *);
+    void (GLAPIENTRY * ReadBuffer) (GLenum);
+    void (GLAPIENTRY * DrawArrays) (GLenum, GLint, GLsizei);
+     GLenum(GLAPIENTRY * GetError) (void);
+    void (GLAPIENTRY * GetTexLevelParameteriv) (GLenum, GLint, GLenum, GLint *);
+    void (GLAPIENTRY * Scissor) (GLint, GLint, GLsizei, GLsizei);
 
-    void (GLAPIENTRY *GenBuffers)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *BindBuffer)(GLenum, GLuint);
-    void (GLAPIENTRY *BindBufferBase)(GLenum, GLuint, GLuint);
-    GLvoid * (GLAPIENTRY *MapBufferRange)(GLenum, GLintptr, GLsizeiptr,
-                                          GLbitfield);
-    GLboolean (GLAPIENTRY *UnmapBuffer)(GLenum);
-    void (GLAPIENTRY *BufferData)(GLenum, intptr_t, const GLvoid *, GLenum);
-    void (GLAPIENTRY *ActiveTexture)(GLenum);
-    void (GLAPIENTRY *BindTexture)(GLenum, GLuint);
-    int (GLAPIENTRY *SwapInterval)(int);
-    void (GLAPIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei,
-                                  GLsizei, GLint, GLenum, GLenum,
-                                  const GLvoid *);
+    void (GLAPIENTRY * GenBuffers) (GLsizei, GLuint *);
+    void (GLAPIENTRY * DeleteBuffers) (GLsizei, const GLuint *);
+    void (GLAPIENTRY * BindBuffer) (GLenum, GLuint);
+    void (GLAPIENTRY * BindBufferBase) (GLenum, GLuint, GLuint);
+    GLvoid *(GLAPIENTRY * MapBufferRange) (GLenum, GLintptr, GLsizeiptr, GLbitfield);
+     GLboolean(GLAPIENTRY * UnmapBuffer) (GLenum);
+    void (GLAPIENTRY * BufferData) (GLenum, intptr_t, const GLvoid *, GLenum);
+    void (GLAPIENTRY * ActiveTexture) (GLenum);
+    void (GLAPIENTRY * BindTexture) (GLenum, GLuint);
+    int (GLAPIENTRY * SwapInterval) (int);
+    void (GLAPIENTRY * TexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum,
+        const GLvoid *);
 
-    void (GLAPIENTRY *GenVertexArrays)(GLsizei, GLuint *);
-    void (GLAPIENTRY *BindVertexArray)(GLuint);
-    GLint (GLAPIENTRY *GetAttribLocation)(GLuint, const GLchar *);
-    void (GLAPIENTRY *EnableVertexAttribArray)(GLuint);
-    void (GLAPIENTRY *DisableVertexAttribArray)(GLuint);
-    void (GLAPIENTRY *VertexAttribPointer)(GLuint, GLint, GLenum, GLboolean,
-                                           GLsizei, const GLvoid *);
-    void (GLAPIENTRY *DeleteVertexArrays)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *UseProgram)(GLuint);
-    GLint (GLAPIENTRY *GetUniformLocation)(GLuint, const GLchar *);
-    void (GLAPIENTRY *CompileShader)(GLuint);
-    GLuint (GLAPIENTRY *CreateProgram)(void);
-    GLuint (GLAPIENTRY *CreateShader)(GLenum);
-    void (GLAPIENTRY *ShaderSource)(GLuint, GLsizei, const GLchar **,
-                                    const GLint *);
-    void (GLAPIENTRY *LinkProgram)(GLuint);
-    void (GLAPIENTRY *AttachShader)(GLuint, GLuint);
-    void (GLAPIENTRY *DeleteShader)(GLuint);
-    void (GLAPIENTRY *DeleteProgram)(GLuint);
-    void (GLAPIENTRY *GetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
-    void (GLAPIENTRY *GetShaderiv)(GLuint, GLenum, GLint *);
-    void (GLAPIENTRY *GetProgramInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
-    void (GLAPIENTRY *GetProgramiv)(GLenum, GLenum, GLint *);
-    const GLubyte* (GLAPIENTRY *GetStringi)(GLenum, GLuint);
-    void (GLAPIENTRY *BindAttribLocation)(GLuint, GLuint, const GLchar *);
-    void (GLAPIENTRY *BindFramebuffer)(GLenum, GLuint);
-    void (GLAPIENTRY *GenFramebuffers)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeleteFramebuffers)(GLsizei, const GLuint *);
-    GLenum (GLAPIENTRY *CheckFramebufferStatus)(GLenum);
-    void (GLAPIENTRY *FramebufferTexture2D)(GLenum, GLenum, GLenum, GLuint,
-                                            GLint);
-    void (GLAPIENTRY *BlitFramebuffer)(GLint, GLint, GLint, GLint, GLint, GLint,
-                                       GLint, GLint, GLbitfield, GLenum);
-    void (GLAPIENTRY *GetFramebufferAttachmentParameteriv)(GLenum, GLenum,
-                                                           GLenum, GLint *);
+    void (GLAPIENTRY * GenVertexArrays) (GLsizei, GLuint *);
+    void (GLAPIENTRY * BindVertexArray) (GLuint);
+     GLint(GLAPIENTRY * GetAttribLocation) (GLuint, const GLchar *);
+    void (GLAPIENTRY * EnableVertexAttribArray) (GLuint);
+    void (GLAPIENTRY * DisableVertexAttribArray) (GLuint);
+    void (GLAPIENTRY * VertexAttribPointer) (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+    void (GLAPIENTRY * DeleteVertexArrays) (GLsizei, const GLuint *);
+    void (GLAPIENTRY * UseProgram) (GLuint);
+     GLint(GLAPIENTRY * GetUniformLocation) (GLuint, const GLchar *);
+    void (GLAPIENTRY * CompileShader) (GLuint);
+     GLuint(GLAPIENTRY * CreateProgram) (void);
+     GLuint(GLAPIENTRY * CreateShader) (GLenum);
+    void (GLAPIENTRY * ShaderSource) (GLuint, GLsizei, const GLchar **, const GLint *);
+    void (GLAPIENTRY * LinkProgram) (GLuint);
+    void (GLAPIENTRY * AttachShader) (GLuint, GLuint);
+    void (GLAPIENTRY * DeleteShader) (GLuint);
+    void (GLAPIENTRY * DeleteProgram) (GLuint);
+    void (GLAPIENTRY * GetShaderInfoLog) (GLuint, GLsizei, GLsizei *, GLchar *);
+    void (GLAPIENTRY * GetShaderiv) (GLuint, GLenum, GLint *);
+    void (GLAPIENTRY * GetProgramInfoLog) (GLuint, GLsizei, GLsizei *, GLchar *);
+    void (GLAPIENTRY * GetProgramiv) (GLenum, GLenum, GLint *);
+    const GLubyte *(GLAPIENTRY * GetStringi) (GLenum, GLuint);
+    void (GLAPIENTRY * BindAttribLocation) (GLuint, GLuint, const GLchar *);
+    void (GLAPIENTRY * BindFramebuffer) (GLenum, GLuint);
+    void (GLAPIENTRY * GenFramebuffers) (GLsizei, GLuint *);
+    void (GLAPIENTRY * DeleteFramebuffers) (GLsizei, const GLuint *);
+     GLenum(GLAPIENTRY * CheckFramebufferStatus) (GLenum);
+    void (GLAPIENTRY * FramebufferTexture2D) (GLenum, GLenum, GLenum, GLuint, GLint);
+    void (GLAPIENTRY * BlitFramebuffer) (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+    void (GLAPIENTRY * GetFramebufferAttachmentParameteriv) (GLenum, GLenum, GLenum, GLint *);
 
-    void (GLAPIENTRY *Uniform1f)(GLint, GLfloat);
-    void (GLAPIENTRY *Uniform2f)(GLint, GLfloat, GLfloat);
-    void (GLAPIENTRY *Uniform3f)(GLint, GLfloat, GLfloat, GLfloat);
-    void (GLAPIENTRY *Uniform4f)(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-    void (GLAPIENTRY *Uniform1i)(GLint, GLint);
-    void (GLAPIENTRY *UniformMatrix2fv)(GLint, GLsizei, GLboolean,
-                                        const GLfloat *);
-    void (GLAPIENTRY *UniformMatrix3fv)(GLint, GLsizei, GLboolean,
-                                        const GLfloat *);
+    void (GLAPIENTRY * Uniform1f) (GLint, GLfloat);
+    void (GLAPIENTRY * Uniform2f) (GLint, GLfloat, GLfloat);
+    void (GLAPIENTRY * Uniform3f) (GLint, GLfloat, GLfloat, GLfloat);
+    void (GLAPIENTRY * Uniform4f) (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+    void (GLAPIENTRY * Uniform1i) (GLint, GLint);
+    void (GLAPIENTRY * UniformMatrix2fv) (GLint, GLsizei, GLboolean, const GLfloat *);
+    void (GLAPIENTRY * UniformMatrix3fv) (GLint, GLsizei, GLboolean, const GLfloat *);
 
-    void (GLAPIENTRY *InvalidateFramebuffer)(GLenum, GLsizei, const GLenum *);
+    void (GLAPIENTRY * InvalidateFramebuffer) (GLenum, GLsizei, const GLenum *);
 
-    GLsync (GLAPIENTRY *FenceSync)(GLenum, GLbitfield);
-    GLenum (GLAPIENTRY *ClientWaitSync)(GLsync, GLbitfield, GLuint64);
-    void (GLAPIENTRY *DeleteSync)(GLsync sync);
+     GLsync(GLAPIENTRY * FenceSync) (GLenum, GLbitfield);
+     GLenum(GLAPIENTRY * ClientWaitSync) (GLsync, GLbitfield, GLuint64);
+    void (GLAPIENTRY * DeleteSync) (GLsync sync);
 
-    void (GLAPIENTRY *GenQueries)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeleteQueries)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *BeginQuery)(GLenum,  GLuint);
-    void (GLAPIENTRY *EndQuery)(GLenum);
-    void (GLAPIENTRY *QueryCounter)(GLuint, GLenum);
-    GLboolean (GLAPIENTRY *IsQuery)(GLuint);
-    void (GLAPIENTRY *GetQueryObjectiv)(GLuint, GLenum, GLint *);
-    void (GLAPIENTRY *GetQueryObjecti64v)(GLuint, GLenum, GLint64 *);
-    void (GLAPIENTRY *GetQueryObjectuiv)(GLuint, GLenum, GLuint *);
-    void (GLAPIENTRY *GetQueryObjectui64v)(GLuint, GLenum, GLuint64 *);
+    void (GLAPIENTRY * GenQueries) (GLsizei, GLuint *);
+    void (GLAPIENTRY * DeleteQueries) (GLsizei, const GLuint *);
+    void (GLAPIENTRY * BeginQuery) (GLenum, GLuint);
+    void (GLAPIENTRY * EndQuery) (GLenum);
+    void (GLAPIENTRY * QueryCounter) (GLuint, GLenum);
+     GLboolean(GLAPIENTRY * IsQuery) (GLuint);
+    void (GLAPIENTRY * GetQueryObjectiv) (GLuint, GLenum, GLint *);
+    void (GLAPIENTRY * GetQueryObjecti64v) (GLuint, GLenum, GLint64 *);
+    void (GLAPIENTRY * GetQueryObjectuiv) (GLuint, GLenum, GLuint *);
+    void (GLAPIENTRY * GetQueryObjectui64v) (GLuint, GLenum, GLuint64 *);
 
-    void (GLAPIENTRY *VDPAUInitNV)(const GLvoid *, const GLvoid *);
-    void (GLAPIENTRY *VDPAUFiniNV)(void);
-    GLvdpauSurfaceNV (GLAPIENTRY *VDPAURegisterOutputSurfaceNV)
-        (GLvoid *, GLenum, GLsizei, const GLuint *);
-    GLvdpauSurfaceNV (GLAPIENTRY *VDPAURegisterVideoSurfaceNV)
-        (GLvoid *, GLenum, GLsizei, const GLuint *);
-    void (GLAPIENTRY *VDPAUUnregisterSurfaceNV)(GLvdpauSurfaceNV);
-    void (GLAPIENTRY *VDPAUSurfaceAccessNV)(GLvdpauSurfaceNV, GLenum);
-    void (GLAPIENTRY *VDPAUMapSurfacesNV)(GLsizei, const GLvdpauSurfaceNV *);
-    void (GLAPIENTRY *VDPAUUnmapSurfacesNV)(GLsizei, const GLvdpauSurfaceNV *);
+    void (GLAPIENTRY * VDPAUInitNV) (const GLvoid *, const GLvoid *);
+    void (GLAPIENTRY * VDPAUFiniNV) (void);
+     GLvdpauSurfaceNV(GLAPIENTRY * VDPAURegisterOutputSurfaceNV)
+     (GLvoid *, GLenum, GLsizei, const GLuint *);
+     GLvdpauSurfaceNV(GLAPIENTRY * VDPAURegisterVideoSurfaceNV)
+     (GLvoid *, GLenum, GLsizei, const GLuint *);
+    void (GLAPIENTRY * VDPAUUnregisterSurfaceNV) (GLvdpauSurfaceNV);
+    void (GLAPIENTRY * VDPAUSurfaceAccessNV) (GLvdpauSurfaceNV, GLenum);
+    void (GLAPIENTRY * VDPAUMapSurfacesNV) (GLsizei, const GLvdpauSurfaceNV *);
+    void (GLAPIENTRY * VDPAUUnmapSurfacesNV) (GLsizei, const GLvdpauSurfaceNV *);
 
 #if HAVE_GL_WIN32
     // The HANDLE type might not be present on non-Win32
-    BOOL (GLAPIENTRY *DXSetResourceShareHandleNV)(void *dxObject,
-        HANDLE shareHandle);
-    HANDLE (GLAPIENTRY *DXOpenDeviceNV)(void *dxDevice);
-    BOOL (GLAPIENTRY *DXCloseDeviceNV)(HANDLE hDevice);
-    HANDLE (GLAPIENTRY *DXRegisterObjectNV)(HANDLE hDevice, void *dxObject,
-        GLuint name, GLenum type, GLenum access);
-    BOOL (GLAPIENTRY *DXUnregisterObjectNV)(HANDLE hDevice, HANDLE hObject);
-    BOOL (GLAPIENTRY *DXLockObjectsNV)(HANDLE hDevice, GLint count,
-        HANDLE *hObjects);
-    BOOL (GLAPIENTRY *DXUnlockObjectsNV)(HANDLE hDevice, GLint count,
-        HANDLE *hObjects);
+     BOOL(GLAPIENTRY * DXSetResourceShareHandleNV) (void *dxObject, HANDLE shareHandle);
+     HANDLE(GLAPIENTRY * DXOpenDeviceNV) (void *dxDevice);
+     BOOL(GLAPIENTRY * DXCloseDeviceNV) (HANDLE hDevice);
+     HANDLE(GLAPIENTRY * DXRegisterObjectNV) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access);
+     BOOL(GLAPIENTRY * DXUnregisterObjectNV) (HANDLE hDevice, HANDLE hObject);
+     BOOL(GLAPIENTRY * DXLockObjectsNV) (HANDLE hDevice, GLint count, HANDLE * hObjects);
+     BOOL(GLAPIENTRY * DXUnlockObjectsNV) (HANDLE hDevice, GLint count, HANDLE * hObjects);
 #endif
 
-    GLint (GLAPIENTRY *GetVideoSync)(GLuint *);
-    GLint (GLAPIENTRY *WaitVideoSync)(GLint, GLint, unsigned int *);
+     GLint(GLAPIENTRY * GetVideoSync) (GLuint *);
+     GLint(GLAPIENTRY * WaitVideoSync) (GLint, GLint, unsigned int *);
 
-    void (GLAPIENTRY *GetTranslatedShaderSourceANGLE)(GLuint, GLsizei,
-                                                      GLsizei*, GLchar* source);
+    void (GLAPIENTRY * GetTranslatedShaderSourceANGLE) (GLuint, GLsizei, GLsizei *, GLchar * source);
 
-    void (GLAPIENTRY *DebugMessageCallback)(MP_GLDEBUGPROC callback,
-                                            const void *userParam);
+    void (GLAPIENTRY * DebugMessageCallback) (MP_GLDEBUGPROC callback, const void *userParam);
 
-    void *(GLAPIENTRY *MPGetNativeDisplay)(const char *name);
+    void *(GLAPIENTRY * MPGetNativeDisplay) (const char *name);
 };
 
 #endif /* MPLAYER_GL_COMMON_H */

config.h

@@ -1,3 +1,4 @@
+
 /*
  * This file is part of libplacebo.
  *
@@ -8,7 +9,7 @@
  *
  * libplacebo 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
+ * 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
@@ -39,5 +40,4 @@
 #define PL_HAVE_SHADERC 0
 #define PL_HAVE_VULKAN 1
 
-
 #endif // LIBPLACEBO_CONTEXT_H_

drirc

@@ -0,0 +1,54 @@
+<driconf>
+    <device screen="0" driver="i965">
+        <application name="Default">
+            <option name="always_flush_cache" value="false" />
+            <option name="mesa_no_error" value="false" />
+            <option name="precise_trig" value="false" />
+            <option name="mesa_glthread" value="false" />
+            <option name="disable_glsl_line_continuations" value="false" />
+            <option name="disable_blend_func_extended" value="false" />
+            <option name="shader_precompile" value="true" />
+            <option name="clamp_max_samples" value="-1" />
+            <option name="allow_glsl_extension_directive_midshader" value="false" />
+            <option name="allow_rgb10_configs" value="true" />
+            <option name="allow_glsl_cross_stage_interpolation_mismatch" value="false" />
+            <option name="force_glsl_abs_sqrt" value="false" />
+            <option name="dual_color_blend_by_location" value="false" />
+            <option name="bo_reuse" value="1" />
+            <option name="always_flush_batch" value="false" />
+            <option name="allow_rgb565_configs" value="true" />
+            <option name="allow_glsl_builtin_variable_redeclaration" value="true" />
+            <option name="force_glsl_extensions_warn" value="false" />
+            <option name="disable_throttling" value="false" />
+            <option name="force_glsl_version" value="330" />
+            <option name="glsl_zero_init" value="false" />
+            <option name="allow_higher_compat_version" value="true" />
+        </application>
+    </device>
+    <device screen="0" driver="radeonsi">
+        <application name="Default">
+            <option name="always_flush_cache" value="false" />
+            <option name="mesa_no_error" value="false" />
+            <option name="precise_trig" value="false" />
+            <option name="mesa_glthread" value="false" />
+            <option name="disable_glsl_line_continuations" value="false" />
+            <option name="disable_blend_func_extended" value="false" />
+            <option name="shader_precompile" value="true" />
+            <option name="clamp_max_samples" value="-1" />
+            <option name="allow_glsl_extension_directive_midshader" value="false" />
+            <option name="allow_rgb10_configs" value="true" />
+            <option name="allow_glsl_cross_stage_interpolation_mismatch" value="false" />
+            <option name="force_glsl_abs_sqrt" value="false" />
+            <option name="dual_color_blend_by_location" value="false" />
+            <option name="bo_reuse" value="1" />
+            <option name="always_flush_batch" value="false" />
+            <option name="allow_rgb565_configs" value="true" />
+            <option name="allow_glsl_builtin_variable_redeclaration" value="true" />
+            <option name="force_glsl_extensions_warn" value="false" />
+            <option name="disable_throttling" value="false" />
+            <option name="force_glsl_version" value="330" />
+            <option name="glsl_zero_init" value="false" />
+            <option name="allow_higher_compat_version" value="true" />
+        </application>
+    </device>
+</driconf>

drm.c

@@ -0,0 +1,609 @@
+#include <unistd.h>
+#include <gbm.h>
+#include <sys/mman.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <drm_fourcc.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
+#define  DRM_DEBUG
+
+//----------------------------------------------------------------------------
+//  DRM
+//----------------------------------------------------------------------------
+
+struct _Drm_Render_
+{
+    int fd_drm;
+    drmModeModeInfo mode;
+    drmModeCrtc *saved_crtc;
+//    drmEventContext ev;   
+    int bpp;
+    uint32_t connector_id, crtc_id, video_plane;
+    uint32_t hdr_metadata;
+    uint32_t mmWidth,mmHeight;   // Size in mm
+	uint32_t hdr_blob_id;
+ 
+};
+typedef struct _Drm_Render_ VideoRender;
+
+struct {
+    struct gbm_device *dev;
+    struct gbm_surface *surface;
+} gbm;
+
+VideoRender *render;
+
+//----------------------------------------------------------------------------
+//  Helper functions
+//----------------------------------------------------------------------------
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#endif
+struct type_name {
+    unsigned int type;
+    const char *name;
+};
+
+static const char *util_lookup_type_name(unsigned int type,
+                     const struct type_name *table,
+                     unsigned int count)
+{
+    unsigned int i;
+
+    for (i = 0; i < count; i++)
+        if (table[i].type == type)
+            return table[i].name;
+
+    return NULL;
+}
+
+static const struct type_name connector_type_names[] = {
+    { DRM_MODE_CONNECTOR_Unknown, "unknown" },
+    { DRM_MODE_CONNECTOR_VGA, "VGA" },
+    { DRM_MODE_CONNECTOR_DVII, "DVI-I" },
+    { DRM_MODE_CONNECTOR_DVID, "DVI-D" },
+    { DRM_MODE_CONNECTOR_DVIA, "DVI-A" },
+    { DRM_MODE_CONNECTOR_Composite, "composite" },
+    { DRM_MODE_CONNECTOR_SVIDEO, "s-video" },
+    { DRM_MODE_CONNECTOR_LVDS, "LVDS" },
+    { DRM_MODE_CONNECTOR_Component, "component" },
+    { DRM_MODE_CONNECTOR_9PinDIN, "9-pin DIN" },
+    { DRM_MODE_CONNECTOR_DisplayPort, "DP" },
+    { DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
+    { DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
+    { DRM_MODE_CONNECTOR_TV, "TV" },
+    { DRM_MODE_CONNECTOR_eDP, "eDP" },
+    { DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" },
+    { DRM_MODE_CONNECTOR_DSI, "DSI" },
+    { DRM_MODE_CONNECTOR_DPI, "DPI" },
+};
+
+const char *util_lookup_connector_type_name(unsigned int type)
+{
+    return util_lookup_type_name(type, connector_type_names,
+                     ARRAY_SIZE(connector_type_names));
+}
+
+static uint64_t GetPropertyValue(int fd_drm, uint32_t objectID,
+                        uint32_t objectType, const char *propName)
+{
+    uint32_t i;
+    int found = 0;
+    uint64_t value = 0;
+    drmModePropertyPtr Prop;
+    drmModeObjectPropertiesPtr objectProps =
+        drmModeObjectGetProperties(fd_drm, objectID, objectType);
+
+    for (i = 0; i < objectProps->count_props; i++) {
+        if ((Prop = drmModeGetProperty(fd_drm, objectProps->props[i])) == NULL)
+            fprintf(stderr, "GetPropertyValue: Unable to query property.\n");
+
+        if (strcmp(propName, Prop->name) == 0) {
+            value = objectProps->prop_values[i];
+            found = 1;
+        }
+
+        drmModeFreeProperty(Prop);
+
+        if (found)
+            break;
+    }
+
+    drmModeFreeObjectProperties(objectProps);
+
+#ifdef DRM_DEBUG
+    if (!found)
+        fprintf(stderr, "GetPropertyValue: Unable to find value for property \'%s\'.\n",
+            propName);
+#endif
+    return value;
+}
+static uint32_t GetPropertyID(int fd_drm, uint32_t objectID,
+                        uint32_t objectType, const char *propName)
+{
+    uint32_t i;
+    int found = 0;
+    uint32_t value = -1;
+    drmModePropertyPtr Prop;
+    drmModeObjectPropertiesPtr objectProps =
+        drmModeObjectGetProperties(fd_drm, objectID, objectType);
+
+    for (i = 0; i < objectProps->count_props; i++) {
+        if ((Prop = drmModeGetProperty(fd_drm, objectProps->props[i])) == NULL)
+            fprintf(stderr, "GetPropertyValue: Unable to query property.\n");
+
+        if (strcmp(propName, Prop->name) == 0) {
+            value = objectProps->props[i];
+            found = 1;
+        }
+        drmModeFreeProperty(Prop);
+        if (found)
+            break;
+    }
+    drmModeFreeObjectProperties(objectProps);
+
+#ifdef DRM_DEBUG
+    if (!found)
+        Debug(3,"GetPropertyValue: Unable to find ID for property \'%s\'.\n",propName);
+#endif
+    return value;
+}
+
+static int SetPropertyRequest(drmModeAtomicReqPtr ModeReq, int fd_drm,
+                    uint32_t objectID, uint32_t objectType,
+                    const char *propName, uint64_t value)
+{
+    uint32_t i;
+    uint64_t id = 0;
+    drmModePropertyPtr Prop;
+    drmModeObjectPropertiesPtr objectProps =
+        drmModeObjectGetProperties(fd_drm, objectID, objectType);
+
+    for (i = 0; i < objectProps->count_props; i++) {
+        if ((Prop = drmModeGetProperty(fd_drm, objectProps->props[i])) == NULL)
+            printf( "SetPropertyRequest: Unable to query property.\n");
+
+        if (strcmp(propName, Prop->name) == 0) {
+            id = Prop->prop_id;
+            drmModeFreeProperty(Prop);
+            break;
+        }
+
+        drmModeFreeProperty(Prop);
+    }
+
+    drmModeFreeObjectProperties(objectProps);
+
+    if (id == 0)
+        printf( "SetPropertyRequest: Unable to find value for property \'%s\'.\n",
+            propName);
+
+    return drmModeAtomicAddProperty(ModeReq, objectID, id, value);
+}
+
+static void CuvidSetVideoMode(void);
+void set_video_mode(int width, int height)
+{
+	drmModeConnector *connector;
+	drmModeModeInfo *mode;
+	int ii;
+	if (height != 1080 && height != 2160)
+		return;
+	connector = drmModeGetConnector(render->fd_drm, render->connector_id);
+	for (ii = 0; ii < connector->count_modes; ii++) {
+		mode = &connector->modes[ii];              
+		printf("Mode %d %dx%d Rate %d\n",ii,mode->hdisplay,mode->vdisplay,mode->vrefresh);
+		if (width == mode->hdisplay && 
+				height == mode->vdisplay && 
+				mode->vrefresh == DRMRefresh &&
+				render->mode.hdisplay != width && 
+		        render->mode.vdisplay != height &&
+				!(mode->flags & DRM_MODE_FLAG_INTERLACE)) {
+			memcpy(&render->mode, mode, sizeof(drmModeModeInfo));
+			VideoWindowWidth = mode->hdisplay;
+            VideoWindowHeight = mode->vdisplay;
+			eglDestroySurface (eglDisplay, eglSurface);
+			EglCheck();
+    		gbm_surface_destroy (gbm.surface);
+			InitBo(render->bpp);
+			CuvidSetVideoMode();
+			Debug(3,"Set new mode %d:%d\n",mode->hdisplay,mode->vdisplay);
+			break;
+		}            
+	}
+}
+
+static int FindDevice(VideoRender * render)
+{
+    drmVersion *version;
+    drmModeRes *resources;
+    drmModeConnector *connector;
+    drmModeEncoder *encoder = 0;
+    drmModeModeInfo *mode;
+    drmModePlane *plane;
+    drmModePlaneRes *plane_res;
+    drmModeObjectPropertiesPtr props;
+    uint32_t j, k;
+    uint64_t has_dumb;
+    uint64_t has_prime;
+    int i,ii=0;
+    char connectorstr[10];
+    int found = 0;
+#ifdef RASPI
+    render->fd_drm = open("/dev/dri/card1", O_RDWR);
+#else
+	render->fd_drm = open("/dev/dri/card0", O_RDWR);
+#endif
+    if (render->fd_drm < 0) {
+        fprintf(stderr, "FindDevice: cannot open /dev/dri/card0: %m\n");
+        return -errno;
+    }
+	drmSetMaster(render->fd_drm);
+    
+    version = drmGetVersion(render->fd_drm);
+    fprintf(stderr, "FindDevice: open /dev/dri/card0:  %s\n",  version->name);
+    
+    // check capability
+    if (drmGetCap(render->fd_drm, DRM_CAP_DUMB_BUFFER, &has_dumb) < 0 || has_dumb == 0)
+        fprintf(stderr, "FindDevice: drmGetCap DRM_CAP_DUMB_BUFFER failed or doesn't have dumb buffer\n");
+
+    if (drmSetClientCap(render->fd_drm, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) != 0)
+        fprintf(stderr, "FindDevice: DRM_CLIENT_CAP_UNIVERSAL_PLANES not available.\n");
+
+    if (drmSetClientCap(render->fd_drm, DRM_CLIENT_CAP_ATOMIC, 1) != 0)
+        fprintf(stderr, "FindDevice: DRM_CLIENT_CAP_ATOMIC not available.\n");
+
+    if (drmGetCap(render->fd_drm, DRM_CAP_PRIME, &has_prime) < 0)
+        fprintf(stderr, "FindDevice: DRM_CAP_PRIME not available.\n");
+
+    if (drmGetCap(render->fd_drm, DRM_PRIME_CAP_EXPORT, &has_prime) < 0)
+        fprintf(stderr, "FindDevice: DRM_PRIME_CAP_EXPORT not available.\n");
+
+    if (drmGetCap(render->fd_drm, DRM_PRIME_CAP_IMPORT, &has_prime) < 0)
+        fprintf(stderr, "FindDevice: DRM_PRIME_CAP_IMPORT not available.\n");
+    
+    if ((resources = drmModeGetResources(render->fd_drm)) == NULL){
+        fprintf(stderr, "FindDevice: cannot retrieve DRM resources (%d): %m\n", errno);
+        return -errno;
+    }
+
+#ifdef DEBUG
+    Debug(3,"[FindDevice] DRM have %i connectors, %i crtcs, %i encoders\n",
+        resources->count_connectors, resources->count_crtcs,
+        resources->count_encoders);
+#endif
+
+    // find all available connectors
+    for (i = 0; i < resources->count_connectors; i++) {
+        connector = drmModeGetConnector(render->fd_drm, resources->connectors[i]);
+        if (!connector) {
+            fprintf(stderr, "FindDevice: cannot retrieve DRM connector (%d): %m\n", errno);
+            return -errno;
+        }
+        
+        sprintf(connectorstr,"%s-%u",util_lookup_connector_type_name(connector->connector_type),connector->connector_type_id);
+        printf("Connector >%s< is %sconnected\n",connectorstr,connector->connection == DRM_MODE_CONNECTED?"":"not ");
+        if (DRMConnector && strcmp(DRMConnector,connectorstr))
+            continue;
+        
+        if (connector->connection == DRM_MODE_CONNECTED && connector->count_modes > 0) {
+			float aspect = (float)connector->mmWidth / (float)connector->mmHeight;
+			if ((aspect > 1.70) && (aspect < 1.85)) {
+				render->mmHeight     = 90;
+            	render->mmWidth      = 160;
+			} else {            
+            	render->mmHeight     = connector->mmHeight;
+            	render->mmWidth      = connector->mmWidth;
+			}
+			render->connector_id = connector->connector_id;
+            // FIXME: use default encoder/crtc pair
+            if ((encoder = drmModeGetEncoder(render->fd_drm, connector->encoder_id)) == NULL){
+                fprintf(stderr, "FindDevice: cannot retrieve encoder (%d): %m\n", errno);
+                return -errno;
+            }
+            render->crtc_id = encoder->crtc_id;
+            
+            render->hdr_metadata = GetPropertyID(render->fd_drm, connector->connector_id,
+                            DRM_MODE_OBJECT_CONNECTOR, "HDR_OUTPUT_METADATA");      
+            printf("ID %d of METADATA in Connector %d connected %d\n",render->hdr_metadata,connector->connector_id,connector->connection);
+                
+            memcpy(&render->mode, &connector->modes[0], sizeof(drmModeModeInfo));  // set fallback
+            // search Modes for Connector
+            for (ii = 0; ii < connector->count_modes; ii++) {
+                mode = &connector->modes[ii];
+                
+                printf("Mode %d %dx%d Rate %d\n",ii,mode->hdisplay,mode->vdisplay,mode->vrefresh);
+                
+                if (VideoWindowWidth && VideoWindowHeight) { // preset by command line 
+                    if (VideoWindowWidth == mode->hdisplay && 
+                            VideoWindowHeight == mode->vdisplay && 
+                            mode->vrefresh == DRMRefresh &&
+                            !(mode->flags & DRM_MODE_FLAG_INTERLACE)) {
+                        memcpy(&render->mode, mode, sizeof(drmModeModeInfo));
+                        break;
+                    }
+                } 
+                else {
+                    if (!(mode->flags & DRM_MODE_FLAG_INTERLACE)) {
+                        memcpy(&render->mode, mode, sizeof(drmModeModeInfo));
+                        VideoWindowWidth = mode->hdisplay;
+                        VideoWindowHeight = mode->vdisplay;
+                        break;
+                    }
+                }
+            }
+            found = 1;
+            i = resources->count_connectors;   // uuuuhh 
+        }
+        VideoWindowWidth = render->mode.hdisplay;
+        VideoWindowHeight = render->mode.vdisplay;
+        if (found)
+            printf("Use Mode %d %dx%d Rate %d\n",ii,render->mode.hdisplay,render->mode.vdisplay,render->mode.vrefresh);
+        drmModeFreeConnector(connector);
+    }
+    if (!found) {
+        Debug(3,"Requested Connector not found or not connected\n");
+        printf("Requested Connector not found or not connected\n");
+        return -1;
+    }
+    
+    // find first plane
+    if ((plane_res = drmModeGetPlaneResources(render->fd_drm)) == NULL)
+        fprintf(stderr, "FindDevice: cannot retrieve PlaneResources (%d): %m\n", errno);
+
+    for (j = 0; j < plane_res->count_planes; j++) {
+        plane = drmModeGetPlane(render->fd_drm, plane_res->planes[j]);
+
+        if (plane == NULL)
+            fprintf(stderr, "FindDevice: cannot query DRM-KMS plane %d\n", j);
+
+        for (i = 0; i < resources->count_crtcs; i++) {
+            if (plane->possible_crtcs & (1 << i))
+                break;
+        }
+
+        uint64_t type = GetPropertyValue(render->fd_drm, plane_res->planes[j],
+                            DRM_MODE_OBJECT_PLANE, "type");
+        uint64_t zpos = 0;  
+
+#ifdef DRM_DEBUG // If more then 2 crtcs this must rewriten!!!
+        printf("[FindDevice] Plane id %i crtc_id %i possible_crtcs %i possible CRTC %i type %s\n",
+            plane->plane_id, plane->crtc_id, plane->possible_crtcs, resources->crtcs[i],
+            (type == DRM_PLANE_TYPE_PRIMARY) ? "primary plane" :
+            (type == DRM_PLANE_TYPE_OVERLAY) ? "overlay plane" :
+            (type == DRM_PLANE_TYPE_CURSOR) ? "cursor plane" : "No plane type");
+#endif
+
+        // test pixel format and plane caps
+        for (k = 0; k < plane->count_formats; k++) {
+            if (encoder->possible_crtcs & plane->possible_crtcs) {
+                switch (plane->formats[k]) {
+#ifdef RASPI
+                    case DRM_FORMAT_ARGB8888:
+#else
+					case DRM_FORMAT_XRGB2101010:
+#endif	
+                        if (!render->video_plane) {
+                            render->video_plane = plane->plane_id;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        drmModeFreePlane(plane);
+    }
+
+    drmModeFreePlaneResources(plane_res);
+
+    drmModeFreeEncoder(encoder);
+    drmModeFreeResources(resources);
+
+#ifdef DRM_DEBUG
+    printf("[FindDevice] DRM setup CRTC: %i video_plane: %i \n",
+        render->crtc_id, render->video_plane);
+#endif
+
+    // save actual modesetting
+    render->saved_crtc = drmModeGetCrtc(render->fd_drm, render->crtc_id);
+
+    return 0;
+}
+
+///
+/// Initialize video output module.
+///
+void VideoInitDrm()
+{
+    int i;
+    
+	
+    if (!(render = calloc(1, sizeof(*render)))) {
+        Fatal(_("video/DRM: out of memory\n"));
+        return;
+    }
+    
+    if (FindDevice(render)){
+        Fatal(_( "VideoInit: FindDevice() failed\n"));
+    }
+	
+    gbm.dev = gbm_create_device (render->fd_drm);
+    assert (gbm.dev != NULL);
+    
+    PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = NULL;
+    get_platform_display =
+        (void *) eglGetProcAddress("eglGetPlatformDisplay");
+    assert(get_platform_display != NULL);
+    
+    eglDisplay = get_platform_display(EGL_PLATFORM_GBM_KHR, gbm.dev, NULL);
+
+    assert (eglDisplay != NULL);
+//    return;
+
+    drmModeAtomicReqPtr ModeReq;
+    const uint32_t flags = DRM_MODE_ATOMIC_ALLOW_MODESET;
+    uint32_t modeID = 0;
+
+    if (drmModeCreatePropertyBlob(render->fd_drm, &render->mode, sizeof(render->mode), &modeID) != 0) {
+        fprintf(stderr, "Failed to create mode property.\n");
+        return;
+    }
+    if (!(ModeReq = drmModeAtomicAlloc())) {
+        fprintf(stderr, "cannot allocate atomic request (%d): %m\n", errno);
+        return;
+    }
+	printf("set CRTC %d of Connector %d aktiv\n",render->crtc_id,render->connector_id);
+    SetPropertyRequest(ModeReq, render->fd_drm, render->crtc_id,
+                        DRM_MODE_OBJECT_CRTC, "MODE_ID", modeID);
+    SetPropertyRequest(ModeReq, render->fd_drm, render->connector_id,
+                        DRM_MODE_OBJECT_CONNECTOR, "CRTC_ID", render->crtc_id);
+    SetPropertyRequest(ModeReq, render->fd_drm, render->crtc_id,
+                        DRM_MODE_OBJECT_CRTC, "ACTIVE", 1);
+   
+    if (drmModeAtomicCommit(render->fd_drm, ModeReq, flags, NULL) != 0)
+        fprintf(stderr, "cannot set atomic mode (%d): %m\n", errno);
+    
+    if (drmModeDestroyPropertyBlob(render->fd_drm, modeID) != 0)
+        fprintf(stderr, "cannot destroy property blob (%d): %m\n", errno);
+    
+    drmModeAtomicFree(ModeReq);
+
+}
+
+void get_drm_aspect(int *num,int *den)
+{
+	Debug(3,"mmHeight %d mmWidth %d  VideoHeight %d VideoWidth %d\n",render->mmHeight,render->mmWidth,VideoWindowHeight,VideoWindowWidth);
+    *num = VideoWindowWidth * render->mmHeight;
+    *den = VideoWindowHeight * render->mmWidth;
+}
+
+struct gbm_bo *bo = NULL, *next_bo=NULL;
+struct drm_fb *fb;
+static int m_need_modeset = 0;
+static int old_color=-1,old_trc=-1;
+
+void InitBo(int bpp) {
+    // create the GBM and EGL surface
+    render->bpp = bpp;
+    gbm.surface = gbm_surface_create (gbm.dev, VideoWindowWidth,VideoWindowHeight, 
+                                      bpp==10?GBM_FORMAT_XRGB2101010:GBM_FORMAT_ARGB8888, 
+                                      GBM_BO_USE_SCANOUT|GBM_BO_USE_RENDERING);
+    assert(gbm.surface != NULL);
+    eglSurface = eglCreateWindowSurface (eglDisplay, eglConfig, gbm.surface, NULL);
+    assert(eglSurface != NULL);
+
+}
+
+static struct gbm_bo *previous_bo = NULL;
+static uint32_t previous_fb;
+
+static void drm_swap_buffers () {
+    
+    uint32_t fb;
+    
+    eglSwapBuffers (eglDisplay, eglSurface);	
+    struct gbm_bo *bo = gbm_surface_lock_front_buffer (gbm.surface);
+#if 1
+    if (bo == NULL)
+        bo = gbm_surface_lock_front_buffer (gbm.surface);
+#endif
+    assert (bo != NULL);
+    uint32_t handle = gbm_bo_get_handle (bo).u32;
+    uint32_t pitch = gbm_bo_get_stride (bo);
+
+
+    drmModeAddFB (render->fd_drm, VideoWindowWidth,VideoWindowHeight,render->bpp==10? 30:24, 32, pitch, handle, &fb);
+//  drmModeSetCrtc (render->fd_drm, render->crtc_id, fb, 0, 0, &render->connector_id, 1, &render->mode);
+   
+    if (m_need_modeset) {
+        drmModeAtomicReqPtr ModeReq;
+        const uint32_t flags = DRM_MODE_ATOMIC_ALLOW_MODESET;
+        uint32_t modeID = 0;
+
+        if (drmModeCreatePropertyBlob(render->fd_drm, &render->mode, sizeof(render->mode), &modeID) != 0) {
+            fprintf(stderr, "Failed to create mode property.\n");
+            return;
+        }
+        if (!(ModeReq = drmModeAtomicAlloc())) {
+            fprintf(stderr, "cannot allocate atomic request (%d): %m\n", errno);
+            return;
+        }
+        
+        // Need to disable the CRTC in order to submit the HDR data.... 
+        SetPropertyRequest(ModeReq, render->fd_drm, render->crtc_id,
+                            DRM_MODE_OBJECT_CRTC, "ACTIVE", 0);     
+        if (drmModeAtomicCommit(render->fd_drm, ModeReq, flags, NULL) != 0)
+            fprintf(stderr, "cannot set atomic mode (%d): %m\n", errno);
+        sleep(2);
+        
+        SetPropertyRequest(ModeReq, render->fd_drm, render->connector_id,
+                            DRM_MODE_OBJECT_CONNECTOR, "Colorspace",old_color==AVCOL_PRI_BT2020?9:2 );
+        SetPropertyRequest(ModeReq, render->fd_drm, render->crtc_id,
+                            DRM_MODE_OBJECT_CRTC, "MODE_ID", modeID);
+        SetPropertyRequest(ModeReq, render->fd_drm, render->connector_id,
+                            DRM_MODE_OBJECT_CONNECTOR, "CRTC_ID", render->crtc_id);
+        SetPropertyRequest(ModeReq, render->fd_drm, render->crtc_id,
+                            DRM_MODE_OBJECT_CRTC, "ACTIVE", 1);
+        
+        if (drmModeAtomicCommit(render->fd_drm, ModeReq, flags, NULL) != 0)
+            fprintf(stderr, "cannot set atomic mode (%d): %m\n", errno);
+
+        if (drmModeDestroyPropertyBlob(render->fd_drm, modeID) != 0)
+            fprintf(stderr, "cannot destroy prperty blob (%d): %m\n", errno);
+
+        drmModeAtomicFree(ModeReq);
+        m_need_modeset = 0;
+    }
+    drmModeSetCrtc (render->fd_drm, render->crtc_id, fb, 0, 0, &render->connector_id, 1, &render->mode);
+    
+    if (previous_bo) {
+        drmModeRmFB (render->fd_drm, previous_fb);
+        gbm_surface_release_buffer (gbm.surface, previous_bo);
+    }
+    previous_bo = bo;
+    previous_fb = fb;
+
+}
+
+static void drm_clean_up () {
+    // set the previous crtc
+
+    if (!render)
+        return;
+    Debug(3,"drm clean up\n");
+
+	if (previous_bo) {
+        drmModeRmFB (render->fd_drm, previous_fb);
+        gbm_surface_release_buffer (gbm.surface, previous_bo);
+    }
+	
+    drmModeSetCrtc (render->fd_drm, render->saved_crtc->crtc_id, render->saved_crtc->buffer_id,
+                    render->saved_crtc->x, render->saved_crtc->y, &render->connector_id, 1, &render->saved_crtc->mode);
+    drmModeFreeCrtc (render->saved_crtc);
+	
+    if (render->hdr_blob_id)
+        drmModeDestroyPropertyBlob(render->fd_drm, render->hdr_blob_id);
+	render->hdr_blob_id = 0;
+	
+    eglDestroySurface (eglDisplay, eglSurface);
+	EglCheck();
+    gbm_surface_destroy (gbm.surface);
+    eglDestroyContext (eglDisplay, eglContext);
+	EglCheck();
+	eglDestroyContext (eglDisplay, eglSharedContext);
+	EglCheck();
+	eglSharedContext = NULL;
+
+    eglTerminate (eglDisplay);	
+	EglCheck();
+	
+    gbm_device_destroy (gbm.dev);
+	drmDropMaster(render->fd_drm);
+    close (render->fd_drm);
+	eglDisplay = NULL;
+	free(render);
+
+}

drvapi_error_string.h

@@ -1,3 +1,4 @@
+
 /*
  * Copyright 1993-2013 NVIDIA Corporation.  All rights reserved.
  *
@@ -16,88 +17,91 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef  __cuda_cuda_h__ // check to see if CUDA_H is included above
+#ifdef	__cuda_cuda_h__                 // check to see if CUDA_H is included above
 
 // Error Code string definitions here
 typedef struct
 {
     char const *error_string;
-    unsigned int  error_id;
+    unsigned int error_id;
 } s_CudaErrorStr;
 
 /**
  * Error codes
  */
-s_CudaErrorStr sCudaDrvErrorString[] =
-{
+s_CudaErrorStr sCudaDrvErrorString[] = {
+
     /**
      * The API call returned with no errors. In the case of query calls, this
      * can also mean that the operation being queried is complete (see
      * ::cuEventQuery() and ::cuStreamQuery()).
      */
-    { "CUDA_SUCCESS", 0 },
+    {"CUDA_SUCCESS", 0},
 
     /**
      * This indicates that one or more of the parameters passed to the API call
      * is not within an acceptable range of values.
      */
-    { "CUDA_ERROR_INVALID_VALUE", 1 },
+    {"CUDA_ERROR_INVALID_VALUE", 1},
 
     /**
      * The API call failed because it was unable to allocate enough memory to
      * perform the requested operation.
      */
-    { "CUDA_ERROR_OUT_OF_MEMORY", 2 },
+    {"CUDA_ERROR_OUT_OF_MEMORY", 2},
 
     /**
      * This indicates that the CUDA driver has not been initialized with
      * ::cuInit() or that initialization has failed.
      */
-    { "CUDA_ERROR_NOT_INITIALIZED", 3 },
+    {"CUDA_ERROR_NOT_INITIALIZED", 3},
 
     /**
      * This indicates that the CUDA driver is in the process of shutting down.
      */
-    { "CUDA_ERROR_DEINITIALIZED", 4 },
+    {"CUDA_ERROR_DEINITIALIZED", 4},
 
     /**
      * This indicates profiling APIs are called while application is running
      * in visual profiler mode.
     */
-    { "CUDA_ERROR_PROFILER_DISABLED", 5 },
+    {"CUDA_ERROR_PROFILER_DISABLED", 5},
+
     /**
      * This indicates profiling has not been initialized for this context.
      * Call cuProfilerInitialize() to resolve this.
     */
-    { "CUDA_ERROR_PROFILER_NOT_INITIALIZED", 6 },
+    {"CUDA_ERROR_PROFILER_NOT_INITIALIZED", 6},
+
     /**
      * This indicates profiler has already been started and probably
      * cuProfilerStart() is incorrectly called.
     */
-    { "CUDA_ERROR_PROFILER_ALREADY_STARTED", 7 },
+    {"CUDA_ERROR_PROFILER_ALREADY_STARTED", 7},
+
     /**
      * This indicates profiler has already been stopped and probably
      * cuProfilerStop() is incorrectly called.
     */
-    { "CUDA_ERROR_PROFILER_ALREADY_STOPPED", 8 },
+    {"CUDA_ERROR_PROFILER_ALREADY_STOPPED", 8},
+
     /**
      * This indicates that no CUDA-capable devices were detected by the installed
      * CUDA driver.
      */
-    { "CUDA_ERROR_NO_DEVICE (no CUDA-capable devices were detected)", 100 },
+    {"CUDA_ERROR_NO_DEVICE (no CUDA-capable devices were detected)", 100},
 
     /**
      * This indicates that the device ordinal supplied by the user does not
      * correspond to a valid CUDA device.
      */
-    { "CUDA_ERROR_INVALID_DEVICE (device specified is not a valid CUDA device)", 101 },
-
+    {"CUDA_ERROR_INVALID_DEVICE (device specified is not a valid CUDA device)", 101},
 
     /**
      * This indicates that the device kernel image is invalid. This can also
      * indicate an invalid CUDA module.
      */
-    { "CUDA_ERROR_INVALID_IMAGE", 200 },
+    {"CUDA_ERROR_INVALID_IMAGE", 200},
 
     /**
      * This most frequently indicates that there is no context bound to the
@@ -107,7 +111,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * mixes different API versions (i.e. 3010 context with 3020 API calls).
      * See ::cuCtxGetApiVersion() for more details.
      */
-    { "CUDA_ERROR_INVALID_CONTEXT", 201 },
+    {"CUDA_ERROR_INVALID_CONTEXT", 201},
 
     /**
      * This indicated that the context being supplied as a parameter to the
@@ -116,28 +120,28 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * This error return is deprecated as of CUDA 3.2. It is no longer an
      * error to attempt to push the active context via ::cuCtxPushCurrent().
      */
-    { "CUDA_ERROR_CONTEXT_ALREADY_CURRENT", 202 },
+    {"CUDA_ERROR_CONTEXT_ALREADY_CURRENT", 202},
 
     /**
      * This indicates that a map or register operation has failed.
      */
-    { "CUDA_ERROR_MAP_FAILED", 205 },
+    {"CUDA_ERROR_MAP_FAILED", 205},
 
     /**
      * This indicates that an unmap or unregister operation has failed.
      */
-    { "CUDA_ERROR_UNMAP_FAILED", 206 },
+    {"CUDA_ERROR_UNMAP_FAILED", 206},
 
     /**
      * This indicates that the specified array is currently mapped and thus
      * cannot be destroyed.
      */
-    { "CUDA_ERROR_ARRAY_IS_MAPPED", 207 },
+    {"CUDA_ERROR_ARRAY_IS_MAPPED", 207},
 
     /**
      * This indicates that the resource is already mapped.
      */
-    { "CUDA_ERROR_ALREADY_MAPPED", 208 },
+    {"CUDA_ERROR_ALREADY_MAPPED", 208},
 
     /**
      * This indicates that there is no kernel image available that is suitable
@@ -145,115 +149,112 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * options for a particular CUDA source file that do not include the
      * corresponding device configuration.
      */
-    { "CUDA_ERROR_NO_BINARY_FOR_GPU", 209 },
+    {"CUDA_ERROR_NO_BINARY_FOR_GPU", 209},
 
     /**
      * This indicates that a resource has already been acquired.
      */
-    { "CUDA_ERROR_ALREADY_ACQUIRED", 210 },
+    {"CUDA_ERROR_ALREADY_ACQUIRED", 210},
 
     /**
      * This indicates that a resource is not mapped.
      */
-    { "CUDA_ERROR_NOT_MAPPED", 211 },
+    {"CUDA_ERROR_NOT_MAPPED", 211},
 
     /**
      * This indicates that a mapped resource is not available for access as an
      * array.
      */
-    { "CUDA_ERROR_NOT_MAPPED_AS_ARRAY", 212 },
+    {"CUDA_ERROR_NOT_MAPPED_AS_ARRAY", 212},
 
     /**
      * This indicates that a mapped resource is not available for access as a
      * pointer.
      */
-    { "CUDA_ERROR_NOT_MAPPED_AS_POINTER", 213 },
+    {"CUDA_ERROR_NOT_MAPPED_AS_POINTER", 213},
 
     /**
      * This indicates that an uncorrectable ECC error was detected during
      * execution.
      */
-    { "CUDA_ERROR_ECC_UNCORRECTABLE", 214 },
+    {"CUDA_ERROR_ECC_UNCORRECTABLE", 214},
 
     /**
      * This indicates that the ::CUlimit passed to the API call is not
      * supported by the active device.
      */
-    { "CUDA_ERROR_UNSUPPORTED_LIMIT", 215 },
+    {"CUDA_ERROR_UNSUPPORTED_LIMIT", 215},
 
     /**
      * This indicates that the ::CUcontext passed to the API call can
      * only be bound to a single CPU thread at a time but is already
      * bound to a CPU thread.
      */
-    { "CUDA_ERROR_CONTEXT_ALREADY_IN_USE", 216 },
+    {"CUDA_ERROR_CONTEXT_ALREADY_IN_USE", 216},
 
     /**
      * This indicates that peer access is not supported across the given
      * devices.
      */
-    { "CUDA_ERROR_PEER_ACCESS_UNSUPPORTED", 217 },
+    {"CUDA_ERROR_PEER_ACCESS_UNSUPPORTED", 217},
 
     /**
      * This indicates that a PTX JIT compilation failed.
      */
-    { "CUDA_ERROR_INVALID_PTX", 218 },
+    {"CUDA_ERROR_INVALID_PTX", 218},
 
     /**
      * This indicates an error with OpenGL or DirectX context.
      */
-    { "CUDA_ERROR_INVALID_GRAPHICS_CONTEXT", 219 },
+    {"CUDA_ERROR_INVALID_GRAPHICS_CONTEXT", 219},
 
     /**
     * This indicates that an uncorrectable NVLink error was detected during the
     * execution.
     */
-    { "CUDA_ERROR_NVLINK_UNCORRECTABLE", 220 },
+    {"CUDA_ERROR_NVLINK_UNCORRECTABLE", 220},
 
     /**
      * This indicates that the PTX JIT compiler library was not found.
      */
-    { "CUDA_ERROR_JIT_COMPILER_NOT_FOUND", 221 },
+    {"CUDA_ERROR_JIT_COMPILER_NOT_FOUND", 221},
 
     /**
      * This indicates that the device kernel source is invalid.
      */
-    { "CUDA_ERROR_INVALID_SOURCE", 300 },
+    {"CUDA_ERROR_INVALID_SOURCE", 300},
 
     /**
      * This indicates that the file specified was not found.
      */
-    { "CUDA_ERROR_FILE_NOT_FOUND", 301 },
+    {"CUDA_ERROR_FILE_NOT_FOUND", 301},
 
     /**
      * This indicates that a link to a shared object failed to resolve.
      */
-    { "CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND", 302 },
+    {"CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND", 302},
 
     /**
      * This indicates that initialization of a shared object failed.
      */
-    { "CUDA_ERROR_SHARED_OBJECT_INIT_FAILED", 303 },
+    {"CUDA_ERROR_SHARED_OBJECT_INIT_FAILED", 303},
 
     /**
      * This indicates that an OS call failed.
      */
-    { "CUDA_ERROR_OPERATING_SYSTEM", 304 },
-
+    {"CUDA_ERROR_OPERATING_SYSTEM", 304},
 
     /**
      * This indicates that a resource handle passed to the API call was not
      * valid. Resource handles are opaque types like ::CUstream and ::CUevent.
      */
-    { "CUDA_ERROR_INVALID_HANDLE", 400 },
-
+    {"CUDA_ERROR_INVALID_HANDLE", 400},
 
     /**
      * This indicates that a named symbol was not found. Examples of symbols
      * are global/constant variable names, texture names }, and surface names.
      */
-    { "CUDA_ERROR_NOT_FOUND", 500 },
-
+    {"CUDA_ERROR_NOT_FOUND", 500},
 
     /**
      * This indicates that asynchronous operations issued previously have not
@@ -261,8 +262,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * differently than ::CUDA_SUCCESS (which indicates completion). Calls that
      * may return this value include ::cuEventQuery() and ::cuStreamQuery().
      */
-    { "CUDA_ERROR_NOT_READY", 600 },
-
+    {"CUDA_ERROR_NOT_READY", 600},
 
     /**
      * While executing a kernel, the device encountered a
@@ -271,7 +271,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * will return the same error. To continue using CUDA, the process must be terminated
      * and relaunched.
      */
-    { "CUDA_ERROR_ILLEGAL_ADDRESS", 700 },
+    {"CUDA_ERROR_ILLEGAL_ADDRESS", 700},
 
     /**
      * This indicates that a launch did not occur because it did not have
@@ -282,7 +282,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * when a 32-bit int is expected) is equivalent to passing too many
      * arguments and can also result in this error.
      */
-    { "CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES", 701 },
+    {"CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES", 701},
 
     /**
      * This indicates that the device kernel took too long to execute. This can
@@ -293,40 +293,40 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * this context are invalid and must be reconstructed if the program is to
      * continue using CUDA.
      */
-    { "CUDA_ERROR_LAUNCH_TIMEOUT", 702 },
+    {"CUDA_ERROR_LAUNCH_TIMEOUT", 702},
 
     /**
      * This error indicates a kernel launch that uses an incompatible texturing
      * mode.
      */
-    { "CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING", 703 },
+    {"CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING", 703},
 
     /**
      * This error indicates that a call to ::cuCtxEnablePeerAccess() is
      * trying to re-enable peer access to a context which has already
      * had peer access to it enabled.
      */
-    { "CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED", 704 },
+    {"CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED", 704},
 
     /**
      * This error indicates that ::cuCtxDisablePeerAccess() is
      * trying to disable peer access which has not been enabled yet
      * via ::cuCtxEnablePeerAccess().
      */
-    { "CUDA_ERROR_PEER_ACCESS_NOT_ENABLED", 705 },
+    {"CUDA_ERROR_PEER_ACCESS_NOT_ENABLED", 705},
 
     /**
      * This error indicates that the primary context for the specified device
      * has already been initialized.
      */
-    { "CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE", 708 },
+    {"CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE", 708},
 
     /**
      * This error indicates that the context current to the calling thread
      * has been destroyed using ::cuCtxDestroy }, or is a primary context which
      * has not yet been initialized.
      */
-    { "CUDA_ERROR_CONTEXT_IS_DESTROYED", 709 },
+    {"CUDA_ERROR_CONTEXT_IS_DESTROYED", 709},
 
     /**
      * A device-side assert triggered during kernel execution. The context
@@ -334,26 +334,26 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * memory allocations from this context are invalid and must be
      * reconstructed if the program is to continue using CUDA.
      */
-    { "CUDA_ERROR_ASSERT", 710 },
+    {"CUDA_ERROR_ASSERT", 710},
 
     /**
      * This error indicates that the hardware resources required to enable
      * peer access have been exhausted for one or more of the devices
      * passed to ::cuCtxEnablePeerAccess().
      */
-    { "CUDA_ERROR_TOO_MANY_PEERS", 711 },
+    {"CUDA_ERROR_TOO_MANY_PEERS", 711},
 
     /**
      * This error indicates that the memory range passed to ::cuMemHostRegister()
      * has already been registered.
      */
-    { "CUDA_ERROR_HOST_MEMORY_ALREADY_REGISTERED", 712 },
+    {"CUDA_ERROR_HOST_MEMORY_ALREADY_REGISTERED", 712},
 
     /**
      * This error indicates that the pointer passed to ::cuMemHostUnregister()
      * does not correspond to any currently registered memory region.
      */
-    { "CUDA_ERROR_HOST_MEMORY_NOT_REGISTERED", 713 },
+    {"CUDA_ERROR_HOST_MEMORY_NOT_REGISTERED", 713},
 
     /**
      * While executing a kernel, the device encountered a stack error.
@@ -362,7 +362,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * will return the same error. To continue using CUDA, the process must be terminated
      * and relaunched.
      */
-    { "CUDA_ERROR_HARDWARE_STACK_ERROR", 714 },
+    {"CUDA_ERROR_HARDWARE_STACK_ERROR", 714},
 
     /**
      * While executing a kernel, the device encountered an illegal instruction.
@@ -370,7 +370,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * will return the same error. To continue using CUDA, the process must be terminated
      * and relaunched.
      */
-    { "CUDA_ERROR_ILLEGAL_INSTRUCTION", 715 },
+    {"CUDA_ERROR_ILLEGAL_INSTRUCTION", 715},
 
     /**
      * While executing a kernel, the device encountered a load or store instruction
@@ -379,7 +379,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * will return the same error. To continue using CUDA, the process must be terminated
      * and relaunched.
      */
-    { "CUDA_ERROR_MISALIGNED_ADDRESS", 716 },
+    {"CUDA_ERROR_MISALIGNED_ADDRESS", 716},
 
     /**
      * While executing a kernel, the device encountered an instruction
@@ -390,7 +390,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * will return the same error. To continue using CUDA, the process must be terminated
      * and relaunched.
      */
-    { "CUDA_ERROR_INVALID_ADDRESS_SPACE", 717 },
+    {"CUDA_ERROR_INVALID_ADDRESS_SPACE", 717},
 
     /**
      * While executing a kernel, the device program counter wrapped its address space.
@@ -398,7 +398,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * will return the same error. To continue using CUDA, the process must be terminated
      * and relaunched.
      */
-    { "CUDA_ERROR_INVALID_PC", 718 },
+    {"CUDA_ERROR_INVALID_PC", 718},
 
     /**
      * An exception occurred on the device while executing a kernel. Common
@@ -408,7 +408,7 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * memory allocations from this context are invalid and must be
      * reconstructed if the program is to continue using CUDA.
      */
-    { "CUDA_ERROR_LAUNCH_FAILED", 719 },
+    {"CUDA_ERROR_LAUNCH_FAILED", 719},
 
     /**
      * This error indicates that the number of blocks launched per grid for a kernel that was
@@ -417,37 +417,33 @@ s_CudaErrorStr sCudaDrvErrorString[] =
      * or ::cuOccupancyMaxActiveBlocksPerMultiprocessorWithFlags times the number of multiprocessors
      * as specified by the device attribute ::CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT.
      */
-    { "CUDA_ERROR_COOPERATIVE_LAUNCH_TOO_LARGE", 720 },
-
+    {"CUDA_ERROR_COOPERATIVE_LAUNCH_TOO_LARGE", 720},
 
     /**
      * This error indicates that the attempted operation is not permitted.
      */
-    { "CUDA_ERROR_NOT_PERMITTED", 800 },
+    {"CUDA_ERROR_NOT_PERMITTED", 800},
 
     /**
      * This error indicates that the attempted operation is not supported
      * on the current system or device.
      */
-    { "CUDA_ERROR_NOT_SUPPORTED", 801 },
-
+    {"CUDA_ERROR_NOT_SUPPORTED", 801},
 
     /**
      * This indicates that an unknown internal error has occurred.
      */
-    { "CUDA_ERROR_UNKNOWN", 999 },
-    { NULL, -1 }
+    {"CUDA_ERROR_UNKNOWN", 999},
+    {NULL, -1}
 };
 
 // This is just a linear search through the array, since the error_id's are not
 // always ocurring consecutively
-inline const char *getCudaDrvErrorString(CUresult error_id)
+static inline const char *getCudaDrvErrorString(CUresult error_id)
 {
     int index = 0;
 
-    while (sCudaDrvErrorString[index].error_id != error_id &&
-           (int)sCudaDrvErrorString[index].error_id != -1)
-    {
+    while (sCudaDrvErrorString[index].error_id != error_id && (int)sCudaDrvErrorString[index].error_id != -1) {
         index++;
     }
 
@@ -459,5 +455,4 @@ inline const char *getCudaDrvErrorString(CUresult error_id)
 
 #endif // __cuda_cuda_h__
 
-
 #endif

hdr.c

@@ -0,0 +1,492 @@
+#include <libavutil/mastering_display_metadata.h>
+
+/**
+ * struct hdr_metadata_infoframe - HDR Metadata Infoframe Data.
+ *
+ * HDR Metadata Infoframe as per CTA 861.G spec. This is expected
+ * to match exactly with the spec.
+ *
+ * Userspace is expected to pass the metadata information as per
+ * the format described in this structure.
+ */
+struct hdr_metadata_infoframe {
+    /**
+     * @eotf: Electro-Optical Transfer Function (EOTF)
+     * used in the stream.
+     */
+    __u8 eotf;
+    /**
+     * @metadata_type: Static_Metadata_Descriptor_ID.
+     */
+    __u8 metadata_type;
+    /**
+     * @display_primaries: Color Primaries of the Data.
+     * These are coded as unsigned 16-bit values in units of
+     * 0.00002, where 0x0000 represents zero and 0xC350
+     * represents 1.0000.
+     * @display_primaries.x: X cordinate of color primary.
+     * @display_primaries.y: Y cordinate of color primary.
+     */
+    struct {
+        __u16 x, y;
+        } display_primaries[3];
+    /**
+     * @white_point: White Point of Colorspace Data.
+     * These are coded as unsigned 16-bit values in units of
+     * 0.00002, where 0x0000 represents zero and 0xC350
+     * represents 1.0000.
+     * @white_point.x: X cordinate of whitepoint of color primary.
+     * @white_point.y: Y cordinate of whitepoint of color primary.
+     */
+    struct {
+        __u16 x, y;
+        } white_point;
+    /**
+     * @max_display_mastering_luminance: Max Mastering Display Luminance.
+     * This value is coded as an unsigned 16-bit value in units of 1 cd/m2,
+     * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2.
+     */
+    __u16 max_display_mastering_luminance;
+    /**
+     * @min_display_mastering_luminance: Min Mastering Display Luminance.
+     * This value is coded as an unsigned 16-bit value in units of
+     * 0.0001 cd/m2, where 0x0001 represents 0.0001 cd/m2 and 0xFFFF
+     * represents 6.5535 cd/m2.
+     */
+    __u16 min_display_mastering_luminance;
+    /**
+     * @max_cll: Max Content Light Level.
+     * This value is coded as an unsigned 16-bit value in units of 1 cd/m2,
+     * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2.
+     */
+    __u16 max_cll;
+    /**
+     * @max_fall: Max Frame Average Light Level.
+     * This value is coded as an unsigned 16-bit value in units of 1 cd/m2,
+     * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2.
+     */
+    __u16 max_fall;
+};
+
+/**
+ * struct hdr_output_metadata - HDR output metadata
+ *
+ * Metadata Information to be passed from userspace
+ */
+struct hdr_output_metadata {
+    /**
+     * @metadata_type: Static_Metadata_Descriptor_ID.
+     */
+    __u32 metadata_type;
+    /**
+     * @hdmi_metadata_type1: HDR Metadata Infoframe.
+     */
+    union {
+        struct hdr_metadata_infoframe hdmi_metadata_type1;
+    };
+};
+
+
+
+enum hdr_metadata_eotf {
+    EOTF_TRADITIONAL_GAMMA_SDR,
+    EOTF_TRADITIONAL_GAMMA_HDR,
+    EOTF_ST2084,
+    EOTF_HLG,
+};
+
+
+enum metadata_id {
+    METADATA_TYPE1,
+};
+
+void
+weston_hdr_metadata(void *data,
+            uint16_t display_primary_r_x,
+            uint16_t display_primary_r_y,
+            uint16_t display_primary_g_x,
+            uint16_t display_primary_g_y,
+            uint16_t display_primary_b_x,
+            uint16_t display_primary_b_y,
+            uint16_t white_point_x,
+            uint16_t white_point_y,
+            uint16_t min_luminance,
+            uint16_t max_luminance,
+            uint16_t max_cll,
+            uint16_t max_fall,
+            enum hdr_metadata_eotf eotf)
+{
+    uint8_t *data8;
+    uint16_t *data16;
+
+    data8 = data;
+
+    *data8++ = eotf;
+    *data8++ = METADATA_TYPE1;
+
+    data16 = (void*)data8;
+
+    *data16++ = display_primary_r_x;
+    *data16++ = display_primary_r_y;
+    *data16++ = display_primary_g_x;
+    *data16++ = display_primary_g_y;
+    *data16++ = display_primary_b_x;
+    *data16++ = display_primary_b_y;
+    *data16++ = white_point_x;
+    *data16++ = white_point_y;
+
+    *data16++ = max_luminance;
+    *data16++ = min_luminance;
+    *data16++ = max_cll;
+    *data16++ = max_fall;
+}
+
+struct weston_vector {
+    float f[4];
+};
+
+struct weston_colorspace {
+    struct weston_vector r, g, b;
+    struct weston_vector whitepoint;
+    const char *name;
+    const char *whitepoint_name;
+};
+
+struct weston_colorspace hdr10;
+
+static const struct weston_colorspace bt470m = {
+    .r = {{ 0.670f, 0.330f, }},
+    .g = {{ 0.210f, 0.710f, }},
+    .b = {{ 0.140f, 0.080f, }},
+    .whitepoint = {{ 0.3101f, 0.3162f, }},
+    .name = "BT.470 M",
+    .whitepoint_name = "C",
+};
+
+static const struct weston_colorspace bt470bg = {
+    .r = {{ 0.640f, 0.330f, }},
+    .g = {{ 0.290f, 0.600f, }},
+    .b = {{ 0.150f, 0.060f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "BT.470 B/G",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace smpte170m = {
+    .r = {{ 0.630f, 0.340f, }},
+    .g = {{ 0.310f, 0.595f, }},
+    .b = {{ 0.155f, 0.070f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "SMPTE 170M",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace smpte240m = {
+    .r = {{ 0.630f, 0.340f, }},
+    .g = {{ 0.310f, 0.595f, }},
+    .b = {{ 0.155f, 0.070f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "SMPTE 240M",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace bt709 = {
+    .r = {{ 0.640f, 0.330f, }},
+    .g = {{ 0.300f, 0.600f, }},
+    .b = {{ 0.150f, 0.060f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "BT.709",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace bt2020 = {
+    .r = {{ 0.708f, 0.292f, }},
+    .g = {{ 0.170f, 0.797f, }},
+    .b = {{ 0.131f, 0.046f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "BT.2020",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace srgb = {
+    .r = {{ 0.640f, 0.330f, }},
+    .g = {{ 0.300f, 0.600f, }},
+    .b = {{ 0.150f, 0.060f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "sRGB",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace adobergb = {
+    .r = {{ 0.640f, 0.330f, }},
+    .g = {{ 0.210f, 0.710f, }},
+    .b = {{ 0.150f, 0.060f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "AdobeRGB",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace dci_p3 = {
+    .r = {{ 0.680f, 0.320f, }},
+    .g = {{ 0.265f, 0.690f, }},
+    .b = {{ 0.150f, 0.060f, }},
+    .whitepoint = {{ 0.3127f, 0.3290f, }},
+    .name = "DCI-P3 D65",
+    .whitepoint_name = "D65",
+};
+
+static const struct weston_colorspace prophotorgb = {
+    .r = {{ 0.7347f, 0.2653f, }},
+    .g = {{ 0.1596f, 0.8404f, }},
+    .b = {{ 0.0366f, 0.0001f, }},
+    .whitepoint = {{ .3457, .3585 }},
+    .name = "ProPhoto RGB",
+    .whitepoint_name = "D50",
+};
+
+static const struct weston_colorspace ciergb = {
+    .r = {{ 0.7347f, 0.2653f, }},
+    .g = {{ 0.2738f, 0.7174f, }},
+    .b = {{ 0.1666f, 0.0089f, }},
+    .whitepoint = {{ 1.0f / 3.0f, 1.0f / 3.0f, }},
+    .name = "CIE RGB",
+    .whitepoint_name = "E",
+};
+
+static const struct weston_colorspace ciexyz = {
+    .r = {{ 1.0f, 0.0f, }},
+    .g = {{ 0.0f, 1.0f, }},
+    .b = {{ 0.0f, 0.0f, }},
+    .whitepoint = {{ 1.0f / 3.0f, 1.0f / 3.0f, }},
+    .name = "CIE XYZ",
+    .whitepoint_name = "E",
+};
+
+const struct weston_colorspace ap0 = {
+    .r = {{ 0.7347f,  0.2653f, }},
+    .g = {{ 0.0000f,  1.0000f, }},
+    .b = {{ 0.0001f, -0.0770f, }},
+    .whitepoint = {{ .32168f, .33767f, }},
+    .name = "ACES primaries #0",
+    .whitepoint_name = "D60",
+};
+
+const struct weston_colorspace ap1 = {
+    .r = {{ 0.713f, 0.393f, }},
+    .g = {{ 0.165f, 0.830f, }},
+    .b = {{ 0.128f, 0.044f, }},
+    .whitepoint = {{ 0.32168f, 0.33767f, }},
+    .name = "ACES primaries #1",
+    .whitepoint_name = "D60",
+};
+
+static const struct weston_colorspace * const colorspaces[] = {
+    &bt470m,
+    &bt470bg,
+    &smpte170m,
+    &smpte240m,
+    &bt709,
+    &bt2020,
+    &srgb,
+    &adobergb,
+    &dci_p3,
+    &prophotorgb,
+    &ciergb,
+    &ciexyz,
+    &ap0,
+    &ap1,
+};
+#define ARRAY_LENGTH(a) (sizeof(a) / sizeof(a)[0])
+const struct weston_colorspace *
+weston_colorspace_lookup(const char *name)
+{
+    unsigned i;
+
+    if (!name)
+        return NULL;
+
+    for (i = 0; i < ARRAY_LENGTH(colorspaces); i++) {
+        const struct weston_colorspace *c = colorspaces[i];
+
+        if (!strcmp(c->name, name))
+            return c;
+    }
+
+    return NULL;
+}
+
+static int cleanup=0;
+
+
+static uint16_t encode_xyy(float xyy)
+{
+    return xyy * 50000;
+}
+static AVMasteringDisplayMetadata md_save = {0};
+static AVContentLightMetadata ld_save = {0};
+static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSideData *sd2)
+{
+  drmModeAtomicReqPtr ModeReq;
+    struct weston_colorspace *cs;
+    enum hdr_metadata_eotf eotf;
+    struct hdr_output_metadata data;
+    int ret,MaxCLL=1500,MaxFALL=400;
+    int max_lum=4000,min_lum=0050;
+    struct AVMasteringDisplayMetadata *md = NULL;
+    struct AVContentLightMetadata *ld = NULL;
+	
+    if (render->hdr_metadata == -1) { // Metadata not supported
+		return;
+	}
+    
+    // clean up FFMEPG stuff
+    if (trc == AVCOL_TRC_BT2020_10)
+        trc = AVCOL_TRC_ARIB_STD_B67;
+    if (trc == AVCOL_TRC_UNSPECIFIED)
+        trc = AVCOL_TRC_BT709;
+    if (color == AVCOL_PRI_UNSPECIFIED)
+        color = AVCOL_PRI_BT709;
+    
+    if ((old_color == color && old_trc == trc && !sd1 && !sd2) || !render->hdr_metadata)
+        return;  // nothing to do
+    
+    if (sd1)
+        md = sd1->data;
+        
+    if (sd2)
+        ld = sd2->data;
+    
+    if (md && !memcmp(md,&md_save,sizeof(md_save)))
+        if (ld && !memcmp(ld,&ld_save,sizeof(ld_save))) {
+            return;
+        }
+    else if (ld && !memcmp(ld,&ld_save,sizeof(ld_save))) {
+        return;
+    }
+        
+    if (ld)
+        memcpy(&ld_save,ld,sizeof(ld_save));
+    if (md)
+        memcpy(&md_save,md,sizeof(md_save));
+        
+    Debug(3,"Update HDR to TRC %d color %d\n",trc,color);
+
+    if (trc == AVCOL_TRC_BT2020_10)
+        trc = AVCOL_TRC_ARIB_STD_B67;
+    
+    old_color = color;
+    old_trc = trc;
+    
+    if (render->hdr_blob_id)
+        drmModeDestroyPropertyBlob(render->fd_drm, render->hdr_blob_id);
+    
+    switch(trc) {
+        case AVCOL_TRC_BT709:                                   // 1
+        case AVCOL_TRC_UNSPECIFIED:                             // 2
+            eotf = EOTF_TRADITIONAL_GAMMA_SDR;
+            break;
+        case AVCOL_TRC_BT2020_10:                               // 14
+        case AVCOL_TRC_BT2020_12:
+        case AVCOL_TRC_ARIB_STD_B67:                            // 18 HLG           
+            eotf = EOTF_HLG;
+            break;
+        case AVCOL_TRC_SMPTE2084:                               // 16
+            eotf = EOTF_ST2084;
+        default:
+            eotf = EOTF_TRADITIONAL_GAMMA_SDR;
+            break;
+    }
+            
+    switch (color) {
+        case AVCOL_PRI_BT709:                                   // 1
+        case AVCOL_PRI_UNSPECIFIED:                             // 2
+            cs = weston_colorspace_lookup("BT.709");
+            break;
+        case AVCOL_PRI_BT2020:                                  // 9
+            cs = weston_colorspace_lookup("BT.2020");
+            break;
+        case AVCOL_PRI_BT470BG:                                 // 5
+            cs = weston_colorspace_lookup("BT.470 B/G");        // BT.601
+            break;
+        default:
+            cs = weston_colorspace_lookup("BT.709");
+            break;
+    }
+    
+    if (md) {       // we got Metadata
+        if (md->has_primaries) {
+            Debug(3,"Mastering Display Metadata,\n has_primaries:%d has_luminance:%d \n"
+                   "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f) \n"
+                   "min_luminance=%f, max_luminance=%f\n",
+              md->has_primaries, md->has_luminance,
+              av_q2d(md->display_primaries[0][0]),
+              av_q2d(md->display_primaries[0][1]),
+              av_q2d(md->display_primaries[1][0]),
+              av_q2d(md->display_primaries[1][1]),
+              av_q2d(md->display_primaries[2][0]),
+              av_q2d(md->display_primaries[2][1]),
+              av_q2d(md->white_point[0]), av_q2d(md->white_point[1]),
+              av_q2d(md->min_luminance), av_q2d(md->max_luminance));
+
+            cs = &hdr10;
+            cs->r.f[0] = (float)md->display_primaries[0][0].num / (float)md->display_primaries[0][0].den;
+            cs->r.f[1] = (float)md->display_primaries[0][1].num / (float)md->display_primaries[0][1].den;
+            cs->g.f[0] = (float)md->display_primaries[1][0].num / (float)md->display_primaries[1][0].den;
+            cs->g.f[1] = (float)md->display_primaries[1][1].num / (float)md->display_primaries[1][1].den;
+            cs->b.f[0] = (float)md->display_primaries[2][0].num / (float)md->display_primaries[2][0].den;
+            cs->b.f[1] = (float)md->display_primaries[2][1].num / (float)md->display_primaries[2][1].den;
+            cs->whitepoint.f[0] = (float)md->white_point[0].num / (float)md->white_point[0].den;
+            cs->whitepoint.f[1] = (float)md->white_point[1].num / (float)md->white_point[1].den;
+        }
+        if (md->has_luminance) {
+            max_lum = av_q2d(md->max_luminance);
+            min_lum = av_q2d(md->min_luminance) * 10000 ;
+            printf("max_lum %d min_lum %d\n",max_lum,min_lum);
+        }
+    }
+    if (ld) {
+        Debug(3,"Has MaxCLL %d MaxFALL %d\n",ld->MaxCLL,ld->MaxFALL);
+        MaxCLL = ld->MaxCLL;
+        MaxFALL = ld->MaxFALL;
+    }
+    data.metadata_type = 7;   // ????????????????????????
+    weston_hdr_metadata(&data.hdmi_metadata_type1,
+                encode_xyy(cs->r.f[0]),
+                encode_xyy(cs->r.f[1]),
+                encode_xyy(cs->g.f[0]),
+                encode_xyy(cs->g.f[1]),
+                encode_xyy(cs->b.f[0]),
+                encode_xyy(cs->b.f[1]),
+                encode_xyy(cs->whitepoint.f[0]),
+                encode_xyy(cs->whitepoint.f[1]),
+                max_lum,        // max_display_mastering_luminance
+                min_lum,        // min_display_mastering_luminance
+                MaxCLL,         // Maximum Content Light Level (MaxCLL)
+                MaxFALL,        // Maximum Frame-Average Light Level (MaxFALL)
+                eotf);
+    
+
+    
+    ret = drmModeCreatePropertyBlob(render->fd_drm, &data, sizeof(data), &render->hdr_blob_id);
+    if (ret) {
+        printf("DRM: HDR metadata: failed blob create \n");
+		render->hdr_blob_id = 0;
+        return;
+    }
+
+    ret = drmModeConnectorSetProperty(render->fd_drm, render->connector_id,
+                      render->hdr_metadata, render->hdr_blob_id);
+    if (ret) {
+        printf("DRM: HDR metadata: failed property set %d\n",ret);
+             
+        if (render->hdr_blob_id)
+            drmModeDestroyPropertyBlob(render->fd_drm, render->hdr_blob_id);
+		render->hdr_blob_id = 0;
+        return;
+    }
+    m_need_modeset = 1;
+        
+    Debug(3,"DRM: HDR metadata: prop set\n");
+           
+}
+

iatomic.h

@@ -1,23 +1,23 @@
 ///
-///	@file iatomic.h @brief Misc function header file
+/// @file iatomic.h @brief Misc function header file
 ///
-///	Copyright (c) 2014 by Johns.  All Rights Reserved.
+/// Copyright (c) 2014 by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: 59e1684aaa6678ecdebb6ce0df6ce5b5f461dd6e $
+/// $Id: 59e1684aaa6678ecdebb6ce0df6ce5b5f461dd6e $
 //////////////////////////////////////////////////////////////////////////////
 
 /// @addtogroup iatomic
@@ -27,8 +27,8 @@
 	+ __GNUC_MINOR__ * 100 \
 	+ __GNUC_PATCHLEVEL__)
 
-//	gcc before 4.7 didn't support atomic builtins,
-//	use alsa atomic functions.
+//  gcc before 4.7 didn't support atomic builtins,
+//  use alsa atomic functions.
 #if GCC_VERSION < 40700
 
 #include <alsa/iatomic.h>
@@ -36,58 +36,58 @@
 #else
 
 //////////////////////////////////////////////////////////////////////////////
-//	Defines
+//  Defines
 //////////////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////
-//	Declares
+//  Declares
 //////////////////////////////////////////////////////////////////////////////
 
 ///
-///	atomic type, 24 bit useable,
+/// atomic type, 24 bit useable,
 ///
 typedef volatile int atomic_t;
 
 //////////////////////////////////////////////////////////////////////////////
-//	Prototypes
+//  Prototypes
 //////////////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////
-//	Inlines
+//  Inlines
 //////////////////////////////////////////////////////////////////////////////
 
 ///
-///	Set atomic value.
+/// Set atomic value.
 ///
 #define atomic_set(ptr, val) \
     __atomic_store_n(ptr, val, __ATOMIC_SEQ_CST)
 
 ///
-///	Read atomic value.
+/// Read atomic value.
 ///
 #define atomic_read(ptr) \
     __atomic_load_n(ptr, __ATOMIC_SEQ_CST)
 
 ///
-///	Increment atomic value.
+/// Increment atomic value.
 ///
 #define atomic_inc(ptr) \
     __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST)
 
 ///
-///	Decrement atomic value.
+/// Decrement atomic value.
 ///
 #define atomic_dec(ptr) \
     __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST)
 
 ///
-///	Add to atomic value.
+/// Add to atomic value.
 ///
 #define atomic_add(val, ptr) \
     __atomic_add_fetch(ptr, val, __ATOMIC_SEQ_CST)
 
 ///
-///	Subtract from atomic value.
+/// Subtract from atomic value.
 ///
 #define atomic_sub(val, ptr) \
     __atomic_sub_fetch(ptr, val, __ATOMIC_SEQ_CST)

misc.h

@@ -1,24 +1,24 @@
 ///
-///	@file misc.h	@brief Misc function header file
+/// @file misc.h    @brief Misc function header file
 ///
-///	Copyright (c) 2009 - 2012 by Lutz Sammer.  All Rights Reserved.
+/// Copyright (c) 2009 - 2012 by Lutz Sammer.  All Rights Reserved.
 ///
-///	Contributor(s):
-///		Copied from uwm.
+/// Contributor(s):
+/// Copied from uwm.
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: f5ff4b300aa33eb721d658c0c9374c8499b67318 $
+/// $Id: f5ff4b300aa33eb721d658c0c9374c8499b67318 $
 //////////////////////////////////////////////////////////////////////////////
 
 /// @addtogroup misc
@@ -26,37 +26,37 @@
 
 #include <syslog.h>
 #include <stdarg.h>
-#include <time.h>			// clock_gettime
+#include <time.h>                       // clock_gettime
 
 //////////////////////////////////////////////////////////////////////////////
-//	Defines
+//  Defines
 //////////////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////
-//	Declares
+//  Declares
 //////////////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////
-//	Variables
+//  Variables
 //////////////////////////////////////////////////////////////////////////////
 
-extern int SysLogLevel;			///< how much information wanted
+extern int SysLogLevel;                 ///< how much information wanted
 
 //////////////////////////////////////////////////////////////////////////////
-//	Prototypes
+//  Prototypes
 //////////////////////////////////////////////////////////////////////////////
 
 static inline void Syslog(const int, const char *format, ...)
-    __attribute__ ((format(printf, 2, 3)));
+    __attribute__((format(printf, 2, 3)));
 
 //////////////////////////////////////////////////////////////////////////////
-//	Inlines
+//  Inlines
 //////////////////////////////////////////////////////////////////////////////
 
 #ifdef DEBUG
-#define DebugLevel 4			/// private debug level
+#define DebugLevel 4                    /// private debug level
 #else
-#define DebugLevel 0			/// private debug level
+#define DebugLevel 0                    /// private debug level
 #endif
 
 /**
@@ -70,18 +70,18 @@ static inline void Syslog(const int, const char *format, ...)
 static inline void Syslog(const int level, const char *format, ...)
 {
     if (SysLogLevel > level || DebugLevel > level) {
-	va_list ap;
+        va_list ap;
 
-	va_start(ap, format);
-	vsyslog(LOG_ERR, format, ap);
-	va_end(ap);
+        va_start(ap, format);
+        vsyslog(LOG_ERR, format, ap);
+        va_end(ap);
     }
 }
 
 /**
 **	Show error.
 */
-#define Error(fmt...)	Syslog(0, fmt)
+#define Error(fmt...)	Syslog(LOG_ERR, fmt)
 
 /**
 **	Show fatal error.
@@ -91,12 +91,12 @@ static inline void Syslog(const int level, const char *format, ...)
 /**
 **	Show warning.
 */
-#define Warning(fmt...)	Syslog(1, fmt)
+#define Warning(fmt...)	Syslog(LOG_WARNING, fmt)
 
 /**
 **	Show info.
 */
-#define Info(fmt...)	Syslog(2, fmt)
+#define Info(fmt...)	Syslog(LOG_INFO, fmt)
 
 /**
 **	Show debug.
@@ -104,7 +104,7 @@ static inline void Syslog(const int level, const char *format, ...)
 #ifdef DEBUG
 #define Debug(level, fmt...)	Syslog(level, fmt)
 #else
-#define Debug(level, fmt...)		/* disabled */
+#define Debug(level, fmt...)            /* disabled */
 #endif
 
 #ifndef AV_NOPTS_VALUE
@@ -122,12 +122,11 @@ static inline const char *Timestamp2String(int64_t ts)
     static int idx;
 
     if (ts == (int64_t) AV_NOPTS_VALUE) {
-	return "--:--:--.---";
+        return "--:--:--.---";
     }
     idx = (idx + 1) % 3;
-    snprintf(buf[idx], sizeof(buf[idx]), "%2d:%02d:%02d.%03d",
-	(int)(ts / (90 * 3600000)), (int)((ts / (90 * 60000)) % 60),
-	(int)((ts / (90 * 1000)) % 60), (int)((ts / 90) % 1000));
+    snprintf(buf[idx], sizeof(buf[idx]), "%2d:%02d:%02d.%03d", (int)(ts / (90 * 3600000)),
+        (int)((ts / (90 * 60000)) % 60), (int)((ts / (90 * 1000)) % 60), (int)((ts / 90) % 1000));
 
     return buf[idx];
 }
@@ -148,24 +147,25 @@ static inline uint32_t GetMsTicks(void)
     struct timeval tval;
 
     if (gettimeofday(&tval, NULL) < 0) {
-	return 0;
+        return 0;
     }
     return (tval.tv_sec * 1000) + (tval.tv_usec / 1000);
 #endif
 }
+
 static inline uint64_t GetusTicks(void)
 {
-	
+
 #ifdef CLOCK_MONOTONIC
     struct timespec tspec;
 
     clock_gettime(CLOCK_MONOTONIC, &tspec);
-    return (tspec.tv_sec * 1000000) + (tspec.tv_nsec) ;
+    return (uint64_t) (tspec.tv_sec * 1000000) + (tspec.tv_nsec);
 #else
     struct timeval tval;
 
     if (gettimeofday(&tval, NULL) < 0) {
-	return 0;
+        return 0;
     }
     return (tval.tv_sec * 1000) + (tval.tv_usec / 1000);
 #endif

openglosd.cpp

@@ -14,13 +14,24 @@ void ConvertColor(const GLint &colARGB, glm::vec4 &col) {
     col.b = ((colARGB & 0x000000FF)      ) / 255.0;
 }
 
+
+
 /****************************************************************************************
 * cShader
 ****************************************************************************************/
 
+#ifdef CUVID
+const char *glversion = "#version 330 core ";
+#else
+#ifdef RASPI
+const char *glversion = "#version 300 es";
+#else
+const char *glversion = "#version 300 es  ";
+#endif
+#endif
 
-const char *rectVertexShader = 
-"#version 330 core \n\
+const char *rectVertexShader =
+"%s\n \
 \
 layout (location = 0) in vec2 position; \
 out vec4 rectCol; \
@@ -34,9 +45,10 @@ void main() \
 } \
 ";
 
-const char *rectFragmentShader = 
-"#version 330 core \n\
+const char *rectFragmentShader =
+"%s\n \
 \
+precision mediump float; \
 in vec4 rectCol; \
 out vec4 color; \
 \
@@ -46,8 +58,8 @@ void main() \
 } \
 ";
 
-const char *textureVertexShader = 
-"#version 330 core \n\
+const char *textureVertexShader =
+"%s\n \
 \
 layout (location = 0) in vec2 position; \
 layout (location = 1) in vec2 texCoords; \
@@ -66,8 +78,9 @@ void main() \
 } \
 ";
 
-const char *textureFragmentShader = 
-"#version 330 core \n\
+const char *textureFragmentShader =
+"%s\n \
+precision mediump float; \
 in vec2 TexCoords; \
 in vec4 alphaValue; \
 out vec4 color; \
@@ -80,8 +93,8 @@ void main() \
 } \
 ";
 
-const char *textVertexShader = 
-"#version 330 core \n\
+const char *textVertexShader =
+"%s\n \
 \
 layout (location = 0) in vec2 position; \
 layout (location = 1) in vec2 texCoords; \
@@ -100,8 +113,9 @@ void main() \
 } \
 ";
 
-const char *textFragmentShader = 
-"#version 330 core \n\
+const char *textFragmentShader =
+"%s\n \
+precision mediump float; \
 in vec2 TexCoords; \
 in vec4 textColor; \
 \
@@ -116,7 +130,19 @@ void main() \
 } \
 ";
 
-static cShader *Shaders[stCount]; 
+///
+/// GLX check error.
+///
+#define GlxCheck(void)\
+{\
+    GLenum err;\
+\
+    if ((err = glGetError()) != GL_NO_ERROR) {\
+        esyslog( "video/glx: error %s:%d %d '%s'\n",__FILE__,__LINE__, err, gluErrorString(err));\
+    }\
+}
+
+static cShader *Shaders[stCount];
 
 void cShader::Use(void) {
     glUseProgram(id);
@@ -184,18 +210,27 @@ void cShader::SetMatrix4(const GLchar *name, const glm::mat4 &matrix) {
 
 bool cShader::Compile(const char *vertexCode, const char *fragmentCode) {
     GLuint sVertex, sFragment;
+	char *buffer = (char *)malloc(1000);
     // Vertex Shader
     sVertex = glCreateShader(GL_VERTEX_SHADER);
-    glShaderSource(sVertex, 1, &vertexCode, NULL);
+	sprintf(buffer,vertexCode,glversion);
+    glShaderSource(sVertex, 1, (const GLchar**) &buffer, NULL);
     glCompileShader(sVertex);
-    if (!CheckCompileErrors(sVertex))
+    // esyslog("[softhddev]:SHADER:VERTEX %s\n",vertexCode);
+    if (!CheckCompileErrors(sVertex)) {
+		free(buffer);
         return false;
+	}
     // Fragment Shader
     sFragment = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderSource(sFragment, 1, &fragmentCode, NULL);
+	sprintf(buffer,fragmentCode,glversion);
+    glShaderSource(sFragment, 1, (const GLchar**)&buffer, NULL);
     glCompileShader(sFragment);
-    if (!CheckCompileErrors(sFragment))
+    // esyslog("[softhddev]:SHADER:FRAGMENT %s\n",fragmentCode);
+    if (!CheckCompileErrors(sFragment)) {
+		free(buffer);
         return false;
+	}	
     // link Program
     id = glCreateProgram();
     glAttachShader(id, sVertex);
@@ -206,6 +241,7 @@ bool cShader::Compile(const char *vertexCode, const char *fragmentCode) {
     // Delete the shaders as they're linked into our program now and no longer necessery
     glDeleteShader(sVertex);
     glDeleteShader(sFragment);
+	free(buffer);
     return true;
 }
 
@@ -216,14 +252,14 @@ bool cShader::CheckCompileErrors(GLuint object, bool program) {
         glGetShaderiv(object, GL_COMPILE_STATUS, &success);
         if (!success) {
             glGetShaderInfoLog(object, 1024, NULL, infoLog);
-            esyslog("[softhddev]:SHADER: Compile-time error: Type: %d - %s", type, infoLog);
+            esyslog("\n[softhddev]:SHADER: Compile-time error: Type: %d - \n>%s<\n", type, infoLog);
             return false;
         }
     } else {
         glGetProgramiv(object, GL_LINK_STATUS, &success);
         if (!success) {
             glGetProgramInfoLog(object, 1024, NULL, infoLog);
-            esyslog("[softhddev]:SHADER: Link-time error: Type: %d", type);
+            esyslog("[softhddev]:SHADER: Link-time error: Type: %d - \n>%s<\n", type, infoLog);
             return false;
         }
     }
@@ -266,6 +302,7 @@ void cOglGlyph::BindTexture(void) {
 
 void cOglGlyph::LoadTexture(FT_BitmapGlyph ftGlyph) {
     // Disable byte-alignment restriction
+
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     glGenTextures(1, &texture);
     glBindTexture(GL_TEXTURE_2D, texture);
@@ -287,9 +324,13 @@ void cOglGlyph::LoadTexture(FT_BitmapGlyph ftGlyph) {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glBindTexture(GL_TEXTURE_2D, 0);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+
+
 }
 
-
+extern "C" void GlxInitopengl();
+extern "C" void GlxDrawopengl();
+extern "C" void GlxDestroy();
 /****************************************************************************************
 * cOglFont
 ****************************************************************************************/
@@ -330,9 +371,12 @@ cOglFont *cOglFont::Get(const char *name, int charHeight) {
 }
 
 void cOglFont::Init(void) {
-    fonts = new cList<cOglFont>;
-    if (FT_Init_FreeType(&ftLib))
+   
+    if (FT_Init_FreeType(&ftLib)) {
         esyslog("[softhddev]failed to initialize FreeType library!");
+		return;
+	}
+	fonts = new cList<cOglFont>;
     initiated = true;
 }
 
@@ -372,7 +416,7 @@ cOglGlyph* cOglFont::Glyph(uint charCode) const {
     error = FT_Stroker_New( ftLib, &stroker );
     if (error) {
         esyslog("[softhddev]FT_Stroker_New FT_Error (0x%02x) : %s\n", FT_Errors[error].code, FT_Errors[error].message);
-        return NULL;        
+        return NULL;
     }
     float outlineWidth = 0.25f;
     FT_Stroker_Set(stroker,
@@ -381,11 +425,11 @@ cOglGlyph* cOglFont::Glyph(uint charCode) const {
                     FT_STROKER_LINEJOIN_ROUND,
                     0);
 
-    
+
     error = FT_Get_Glyph(face->glyph, &ftGlyph);
     if (error) {
         esyslog("[softhddev]FT_Get_Glyph FT_Error (0x%02x) : %s\n", FT_Errors[error].code, FT_Errors[error].message);
-        return NULL;        
+        return NULL;
     }
 
     error = FT_Glyph_StrokeBorder( &ftGlyph, stroker, 0, 1 );
@@ -398,9 +442,9 @@ cOglGlyph* cOglFont::Glyph(uint charCode) const {
     error = FT_Glyph_To_Bitmap( &ftGlyph, FT_RENDER_MODE_NORMAL, 0, 1);
     if (error) {
         esyslog("[softhddev]FT_Glyph_To_Bitmap FT_Error (0x%02x) : %s\n", FT_Errors[error].code, FT_Errors[error].message);
-        return NULL;        
+        return NULL;
     }
-    
+
     cOglGlyph *Glyph = new cOglGlyph(charCode, (FT_BitmapGlyph)ftGlyph);
     glyphCache.Add(Glyph);
     FT_Done_Glyph(ftGlyph);
@@ -442,13 +486,16 @@ cOglFb::cOglFb(GLint width, GLint height, GLint viewPortWidth, GLint viewPortHei
 }
 
 cOglFb::~cOglFb(void) {
-    glDeleteTextures(1, &texture);
-    glDeleteFramebuffers(1, &fb);
+    if (texture)
+        glDeleteTextures(1, &texture);
+    if (fb)
+        glDeleteFramebuffers(1, &fb);
 }
 
 
 bool cOglFb::Init(void) {
     initiated = true;
+
     glGenTextures(1, &texture);
     glBindTexture(GL_TEXTURE_2D, texture);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
@@ -459,12 +506,15 @@ bool cOglFb::Init(void) {
 
     glGenFramebuffers(1, &fb);
     glBindFramebuffer(GL_FRAMEBUFFER, fb);
-    
+
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
+
     if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-        esyslog("[softhddev]ERROR: Framebuffer is not complete!\n");
+        esyslog("[softhddev]ERROR: %d Framebuffer is not complete!\n",__LINE__);
+
         return false;
     }
+
     return true;
 }
 
@@ -484,7 +534,7 @@ void cOglFb::BindWrite(void) {
 }
 
 void cOglFb::Unbind(void) {
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);  
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
     glBindTexture(GL_TEXTURE_2D, 0);
 }
 
@@ -504,28 +554,29 @@ void cOglFb::Blit(GLint destX1, GLint destY1, GLint destX2, GLint destY2) {
 * cOglOutputFb
 ****************************************************************************************/
 cOglOutputFb::cOglOutputFb(GLint width, GLint height) : cOglFb(width, height, width, height) {
-//    surface = 0;
-	initiated = false;
+    // surface = 0;
+    initiated = false;
     fb = 0;
     texture = 0;
 }
 
 cOglOutputFb::~cOglOutputFb(void) {
-//    glVDPAUUnregisterSurfaceNV(surface);
-	glDeleteTextures(1, &texture);
+    // glVDPAUUnregisterSurfaceNV(surface);
+    glDeleteTextures(1, &texture);
     glDeleteFramebuffers(1, &fb);
 }
 
 bool cOglOutputFb::Init(void) {
-	initiated = true;
+    initiated = true;
+
     glGenTextures(1, &texture);
     glBindTexture(GL_TEXTURE_2D, texture);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-	
+
     glGenFramebuffers(1, &fb);
     glBindFramebuffer(GL_FRAMEBUFFER, fb);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
@@ -533,26 +584,23 @@ bool cOglOutputFb::Init(void) {
         esyslog("[softhddev]ERROR::cOglOutputFb: Framebuffer is not complete!");
         return false;
     }
-
     return true;
 }
 
 void cOglOutputFb::BindWrite(void) {
-//    glVDPAUMapSurfacesNV(1, &surface);
-	if (!initiated)
+    if (!initiated)
         Init();
     glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fb);
 }
 
 void cOglOutputFb::Unbind(void) {
-//    glVDPAUUnmapSurfacesNV(1, &surface);
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
 /****************************************************************************************
 * cOglVb
 ****************************************************************************************/
-static cOglVb *VertexBuffers[vbCount]; 
+static cOglVb *VertexBuffers[vbCount];
 
 cOglVb::cOglVb(int type) {
     this->type = (eVertexBufferType)type;
@@ -570,35 +618,35 @@ cOglVb::~cOglVb(void) {
 bool cOglVb::Init(void) {
 
     if (type == vbTexture) {
-        //Texture VBO definition
+        // Texture VBO definition
         sizeVertex1 = 2;
         sizeVertex2 = 2;
         numVertices = 6;
         drawMode = GL_TRIANGLES;
         shader = stTexture;
     } else if (type == vbRect) {
-        //Rectangle VBO definition
+        // Rectangle VBO definition
         sizeVertex1 = 2;
         sizeVertex2 = 0;
         numVertices = 4;
         drawMode = GL_TRIANGLE_FAN;
         shader = stRect;
     } else if (type == vbEllipse) {
-        //Ellipse VBO definition
+        // Ellipse VBO definition
         sizeVertex1 = 2;
         sizeVertex2 = 0;
         numVertices = 182;
         drawMode = GL_TRIANGLE_FAN;
         shader = stRect;
     } else if (type == vbSlope) {
-        //Slope VBO definition
+        // Slope VBO definition
         sizeVertex1 = 2;
         sizeVertex2 = 0;
         numVertices = 102;
         drawMode = GL_TRIANGLE_FAN;
         shader = stRect;
     } else if (type == vbText) {
-        //Text VBO definition
+        // Text VBO definition
         sizeVertex1 = 2;
         sizeVertex2 = 2;
         numVertices = 6;
@@ -616,9 +664,9 @@ bool cOglVb::Init(void) {
     glVertexAttribPointer(0, sizeVertex1, GL_FLOAT, GL_FALSE, (sizeVertex1 + sizeVertex2) * sizeof(GLfloat), (GLvoid*)0);
     if (sizeVertex2 > 0) {
         glEnableVertexAttribArray(1);
-        glVertexAttribPointer(1, sizeVertex2, GL_FLOAT, GL_FALSE, (sizeVertex1 + sizeVertex2) * sizeof(GLfloat), (GLvoid*)(sizeVertex1 * sizeof(GLfloat)));        
+        glVertexAttribPointer(1, sizeVertex2, GL_FLOAT, GL_FALSE, (sizeVertex1 + sizeVertex2) * sizeof(GLfloat), (GLvoid*)(sizeVertex1 * sizeof(GLfloat)));
     }
-    
+
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindVertexArray(0);
 
@@ -673,7 +721,7 @@ void cOglVb::DrawArrays(int count) {
     if (count == 0)
         count = numVertices;
     glDrawArrays(drawMode, 0, count);
-    glFlush();    
+    glFlush();
 }
 
 
@@ -709,7 +757,8 @@ cOglCmdDeleteFb::cOglCmdDeleteFb(cOglFb *fb) : cOglCmd(fb) {
 }
 
 bool cOglCmdDeleteFb::Execute(void) {
-	delete fb;
+    if (fb)
+        delete fb;
     return true;
 }
 
@@ -758,7 +807,7 @@ bool cOglCmdRenderFbToBufferFb::Execute(void) {
     buffer->Bind();
     if (!fb->BindTexture())
         return false;
-	VertexBuffers[vbTexture]->Bind();
+    VertexBuffers[vbTexture]->Bind();
     VertexBuffers[vbTexture]->SetVertexData(quadVertices);
     VertexBuffers[vbTexture]->DrawArrays();
     VertexBuffers[vbTexture]->Unbind();
@@ -774,36 +823,22 @@ cOglCmdCopyBufferToOutputFb::cOglCmdCopyBufferToOutputFb(cOglFb *fb, cOglOutputF
     this->y = y;
 }
 
-#ifdef PLACEBO
-//extern "C" { 
-extern 	unsigned char *posd;
-//}
-#endif
+extern  unsigned char *posd;
 
 bool cOglCmdCopyBufferToOutputFb::Execute(void) {
-	int i;
+    int i;
     pthread_mutex_lock(&OSDMutex);
     fb->BindRead();
     oFb->BindWrite();
-	glClear(GL_COLOR_BUFFER_BIT);
-
-#ifdef PLACEBO
-//	if (posd)
-//		free(posd);
-//	posd = MALLOC(unsigned char, (y+fb->Height()) * (x+fb->Width()) * 4);
-
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	glPixelStorei(GL_PACK_ALIGNMENT, 1);
-	if (posd) 
-		glReadPixels(0, 0 ,fb->Width(), fb->Height(),GL_BGRA,GL_UNSIGNED_BYTE,posd);
-#else
-	fb->Blit(x, y + fb->Height(), x + fb->Width(), y);
-#endif
-	ActivateOsd(oFb->texture,x, y, fb->Width() ,fb->Height());
-
-	oFb->Unbind();
-	pthread_mutex_unlock(&OSDMutex);
 
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    glPixelStorei(GL_PACK_ALIGNMENT, 1);
+    if (posd)
+        glReadPixels(0, 0 ,fb->Width(), fb->Height(),GL_RGBA,GL_UNSIGNED_BYTE,posd);
+    glFlush();    
+    oFb->Unbind();
+    pthread_mutex_unlock(&OSDMutex);
+    ActivateOsd(oFb->texture,x, y, fb->Width() ,fb->Height());
     return true;
 }
 
@@ -816,7 +851,7 @@ bool cOglCmdFill::Execute(void) {
     glm::vec4 col;
     ConvertColor(color, col);
     fb->Bind();
-	glClearColor(col.r, col.g, col.b, col.a);
+    glClearColor(col.r, col.g, col.b, col.a);
     glClear(GL_COLOR_BUFFER_BIT);
     fb->Unbind();
     return true;
@@ -847,7 +882,7 @@ bool cOglCmdDrawRectangle::Execute(void) {
     VertexBuffers[vbRect]->ActivateShader();
     VertexBuffers[vbRect]->SetShaderColor(color);
     VertexBuffers[vbRect]->SetShaderProjectionMatrix(fb->Width(), fb->Height());
-    
+
     fb->Bind();
     VertexBuffers[vbRect]->DisableBlending();
     VertexBuffers[vbRect]->Bind();
@@ -897,7 +932,7 @@ bool cOglCmdDrawEllipse::Execute(void) {
     VertexBuffers[vbEllipse]->SetShaderColor(color);
     VertexBuffers[vbEllipse]->SetShaderProjectionMatrix(fb->Width(), fb->Height());
 
-    //not antialiased
+    // not antialiased
     fb->Bind();
     VertexBuffers[vbEllipse]->DisableBlending();
     VertexBuffers[vbEllipse]->Bind();
@@ -981,7 +1016,7 @@ GLfloat *cOglCmdDrawEllipse::CreateVerticesQuadrant(int &numVertices) {
             vertices[0] = x + width;
             vertices[1] = y + height;
             startAngle = 270;
-            break;            
+            break;
         default:
             break;
     }
@@ -999,7 +1034,7 @@ GLfloat *cOglCmdDrawEllipse::CreateVerticesHalf(int &numVertices) {
     GLfloat radiusY = 0.0f;
     GLint transX = 0;
     GLint transY = 0;
-    GLint startAngle = 0;    
+    GLint startAngle = 0;
     GLfloat *vertices = new GLfloat[size];
     switch (quadrants) {
         case 5:
@@ -1115,7 +1150,7 @@ bool cOglCmdDrawSlope::Execute(void) {
     VertexBuffers[vbSlope]->SetShaderColor(color);
     VertexBuffers[vbSlope]->SetShaderProjectionMatrix(fb->Width(), fb->Height());
 
-    //not antialiased
+    // not antialiased
     fb->Bind();
     VertexBuffers[vbSlope]->DisableBlending();
     VertexBuffers[vbSlope]->Bind();
@@ -1130,7 +1165,7 @@ bool cOglCmdDrawSlope::Execute(void) {
 }
 
 //------------------ cOglCmdDrawText --------------------
-cOglCmdDrawText::cOglCmdDrawText( cOglFb *fb, GLint x, GLint y, unsigned int *symbols, GLint limitX, 
+cOglCmdDrawText::cOglCmdDrawText( cOglFb *fb, GLint x, GLint y, unsigned int *symbols, GLint limitX,
                                   const char *name, int fontSize, tColor colorText) : cOglCmd(fb), fontName(name)  {
     this->x = x;
     this->y = y;
@@ -1170,8 +1205,9 @@ bool cOglCmdDrawText::Execute(void) {
             esyslog("[softhddev]ERROR: could not load glyph %x", sym);
         }
 
-        if ( limitX && xGlyph + g->AdvanceX() > limitX )
+        if ( limitX && xGlyph + g->AdvanceX() > limitX )  {
             break;
+		}
 
         kerning = f->Kerning(g, prevSym);
         prevSym = sym;
@@ -1188,9 +1224,9 @@ bool cOglCmdDrawText::Execute(void) {
 
             x1, y2,   0.0, 1.0,     // left bottom
             x2, y1,   1.0, 0.0,     // right top
-            x2, y2,   1.0, 1.0      // right bottom     
+            x2, y2,   1.0, 1.0      // right bottom
         };
-    
+
         g->BindTexture();
         VertexBuffers[vbText]->SetVertexData(vertices);
         VertexBuffers[vbText]->DrawArrays();
@@ -1217,6 +1253,7 @@ cOglCmdDrawImage::cOglCmdDrawImage(cOglFb *fb, tColor *argb, GLint width, GLint
     this->overlay = overlay;
     this->scaleX = scaleX;
     this->scaleY = scaleY;
+
 }
 
 cOglCmdDrawImage::~cOglCmdDrawImage(void) {
@@ -1225,6 +1262,10 @@ cOglCmdDrawImage::~cOglCmdDrawImage(void) {
 
 bool cOglCmdDrawImage::Execute(void) {
     GLuint texture;
+#ifdef USE_DRM
+	GlxDrawopengl();  // here we need the Shared Context for upload
+	GlxCheck();
+#endif
     glGenTextures(1, &texture);
     glBindTexture(GL_TEXTURE_2D, texture);
     glTexImage2D(
@@ -1243,6 +1284,10 @@ bool cOglCmdDrawImage::Execute(void) {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glBindTexture(GL_TEXTURE_2D, 0);
+#ifdef USE_DRM
+	GlxInitopengl();  // Reset Context
+	GlxCheck();
+#endif
 
     GLfloat x1 = x;          //left
     GLfloat y1 = y;          //top
@@ -1256,7 +1301,7 @@ bool cOglCmdDrawImage::Execute(void) {
 
         x1, y2,   0.0, 1.0,     // left bottom
         x2, y1,   1.0, 0.0,     // right top
-        x2, y2,   1.0, 1.0      // right bottom     
+        x2, y2,   1.0, 1.0      // right bottom
     };
 
     VertexBuffers[vbTexture]->ActivateShader();
@@ -1324,7 +1369,7 @@ bool cOglCmdDrawTexture::Execute(void) {
 //------------------ cOglCmdStoreImage --------------------
 cOglCmdStoreImage::cOglCmdStoreImage(sOglImage *imageRef, tColor *argb) : cOglCmd(NULL) {
     this->imageRef = imageRef;
-    data = argb;    
+    data = argb;
 }
 
 cOglCmdStoreImage::~cOglCmdStoreImage(void) {
@@ -1332,6 +1377,10 @@ cOglCmdStoreImage::~cOglCmdStoreImage(void) {
 }
 
 bool cOglCmdStoreImage::Execute(void) {
+#ifdef USE_DRM
+	GlxDrawopengl();  // here we need the Shared Context for upload
+	GlxCheck();
+#endif
     glGenTextures(1, &imageRef->texture);
     glBindTexture(GL_TEXTURE_2D, imageRef->texture);
     glTexImage2D(
@@ -1350,6 +1399,10 @@ bool cOglCmdStoreImage::Execute(void) {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glBindTexture(GL_TEXTURE_2D, 0);
+#ifdef USE_DRM
+	GlxInitopengl();  // Reset Context
+	GlxCheck();
+#endif
     return true;
 }
 
@@ -1372,18 +1425,20 @@ bool cOglCmdDropImage::Execute(void) {
 cOglThread::cOglThread(cCondWait *startWait, int maxCacheSize) : cThread("oglThread") {
     stalled = false;
     memCached = 0;
+
     this->maxCacheSize = maxCacheSize * 1024 * 1024;
     this->startWait = startWait;
     wait = new cCondWait();
     maxTextureSize = 0;
     for (int i = 0; i < OGL_MAX_OSDIMAGES; i++) {
         imageCache[i].used = false;
-        imageCache[i].texture = GL_NONE;        
+        imageCache[i].texture = GL_NONE;
         imageCache[i].width = 0;
         imageCache[i].height = 0;
     }
 
     Start();
+
 }
 
 cOglThread::~cOglThread() {
@@ -1404,7 +1459,7 @@ void cOglThread::Stop(void) {
 void cOglThread::DoCmd(cOglCmd* cmd) {
     while (stalled)
         cCondWait::SleepMs(10);
-    
+
     bool doSignal = false;
     Lock();
     if (commands.size() == 0)
@@ -1421,6 +1476,7 @@ void cOglThread::DoCmd(cOglCmd* cmd) {
 }
 
 int cOglThread::StoreImage(const cImage &image) {
+
     if (image.Width() > maxTextureSize || image.Height() > maxTextureSize) {
         esyslog("[softhddev] cannot store image of %dpx x %dpx "
                 "(maximum size is %dpx x %dpx) - falling back to "
@@ -1438,14 +1494,14 @@ int cOglThread::StoreImage(const cImage &image) {
         esyslog("[softhddev]Maximum size for GPU cache reached. Used: %.2fMB Max: %.2fMB", cachedMB, maxMB);
         return 0;
     }
-    
+
     int slot = GetFreeSlot();
     if (!slot)
         return 0;
 
     tColor *argb = MALLOC(tColor, imgSize);
     if (!argb) {
-        esyslog("[softhddev]memory allocation of %d kb for OSD image failed", imgSize  * sizeof(tColor) / 1024);
+        esyslog("[softhddev]memory allocation of %ld kb for OSD image failed", (imgSize  * sizeof(tColor)) / 1024);
         ClearSlot(slot);
         slot = 0;
         return 0;
@@ -1489,7 +1545,7 @@ void cOglThread::ClearSlot(int slot) {
     int i = -slot - 1;
     if (i >= 0 && i < OGL_MAX_OSDIMAGES) {
         Lock();
-        imageCache[i].used = false;    
+        imageCache[i].used = false;
         imageCache[i].texture = GL_NONE;
         imageCache[i].width = 0;
         imageCache[i].height = 0;
@@ -1525,7 +1581,7 @@ void cOglThread::Action(void) {
         return;
     }
     dsyslog("[softhddev]OpenGL Context initialized");
-    
+
     if (!InitShaders()) {
         esyslog("[softhddev]Could not initiate Shaders");
         Cleanup();
@@ -1533,7 +1589,7 @@ void cOglThread::Action(void) {
         return;
     }
     dsyslog("[softhddev]Shaders initialized");
-    
+
     if (!InitVdpauInterop()) {
         esyslog("[softhddev]: vdpau interop NOT initialized");
         Cleanup();
@@ -1556,7 +1612,7 @@ void cOglThread::Action(void) {
     //now Thread is ready to do his job
     startWait->Signal();
     stalled = false;
-    
+
     while(Running()) {
 
         if (commands.empty()) {
@@ -1568,28 +1624,25 @@ void cOglThread::Action(void) {
         cOglCmd* cmd = commands.front();
         commands.pop();
         Unlock();
-        //uint64_t start = cTimeMs::Now();
+        // uint64_t start = cTimeMs::Now();
         cmd->Execute();
-        //esyslog("[softhddev]\"%s\", %dms, %d commands left, time %" PRIu64 "", cmd->Description(), (int)(cTimeMs::Now() - start), commands.size(), cTimeMs::Now());
+        // esyslog("[softhddev]\"%s\", %dms, %d commands left, time %" PRIu64 "", cmd->Description(), (int)(cTimeMs::Now() - start), commands.size(), cTimeMs::Now());
         delete cmd;
         if (stalled && commands.size() < OGL_CMDQUEUE_SIZE / 2)
             stalled = false;
     }
-   
+
     dsyslog("[softhddev]Cleaning up OpenGL stuff");
     Cleanup();
     dsyslog("[softhddev]OpenGL Worker Thread Ended");
 }
 
-extern "C" int GlxInitopengl();
-
-
 
 
 bool cOglThread::InitOpenGL(void) {
-	
-
-#ifdef PLACEBO	
+#ifdef USE_DRM
+	GlxInitopengl();
+#else
     const char *displayName = X11DisplayName;
     if (!displayName) {
         displayName = getenv("DISPLAY");
@@ -1605,6 +1658,7 @@ bool cOglThread::InitOpenGL(void) {
     buffer[0] = strdup("openglosd");
     buffer[1] = strdup("-display");
     buffer[2] = strdup(displayName);
+
     char **argv = buffer;
     glutInit(&argc, argv);
     glutInitDisplayMode (GLUT_SINGLE | GLUT_RGBA | GLUT_ALPHA);
@@ -1621,11 +1675,8 @@ bool cOglThread::InitOpenGL(void) {
         esyslog("[softhddev]glewInit failed, aborting\n");
         return false;
     }
-#else
-
-	if (!GlxInitopengl())
-		return false;
 #endif
+	
     VertexBuffers[vbText]->EnableBlending();
     glDisable(GL_DEPTH_TEST);
     return true;
@@ -1653,7 +1704,7 @@ bool cOglThread::InitVdpauInterop(void) {
     void *procAdress = GetVDPAUProcAdress();
     while (glGetError() != GL_NO_ERROR);
     glVDPAUInitNV(vdpDevice, procAdress);
-    if (glGetError() != GL_NO_ERROR)        
+    if (glGetError() != GL_NO_ERROR)
         return false;
 #endif
     return true;
@@ -1676,21 +1727,23 @@ void cOglThread::DeleteVertexBuffers(void) {
 }
 
 void cOglThread::Cleanup(void) {
-	esyslog("[softhddev]OglThread cleanup\n");
-	pthread_mutex_lock(&OSDMutex);
-	OsdClose();
+    esyslog("[softhddev]OglThread cleanup\n");
+    pthread_mutex_lock(&OSDMutex);
+    OsdClose();
 
     DeleteVertexBuffers();
     delete cOglOsd::oFb;
 
     cOglOsd::oFb = NULL;
     DeleteShaders();
-//    glVDPAUFiniNV();
+    // glVDPAUFiniNV();
     cOglFont::Cleanup();
-#ifdef PLACEBO
+#ifndef USE_DRM
     glutExit();
+#else
+	GlxDestroy();
 #endif
-	pthread_mutex_unlock(&OSDMutex);
+    pthread_mutex_unlock(&OSDMutex);
 }
 
 /****************************************************************************************
@@ -1702,7 +1755,7 @@ cOglPixmap::cOglPixmap(std::shared_ptr<cOglThread> oglThread, int Layer, const c
     int width = DrawPort.IsEmpty() ? ViewPort.Width() : DrawPort.Width();
     int height = DrawPort.IsEmpty() ? ViewPort.Height() : DrawPort.Height();
     fb = new cOglFb(width, height, ViewPort.Width(), ViewPort.Height());
-    dirty = true; 
+    dirty = true;
 }
 
 cOglPixmap::~cOglPixmap(void) {
@@ -1775,7 +1828,7 @@ void cOglPixmap::DrawImage(const cPoint &Point, int ImageHandle) {
             oglThread->DoCmd(new cOglCmdDrawTexture(fb, img, Point.X(), Point.Y()));
     }
     /*
-    Fallback to VDR implementation, needs to separate cSoftOsdProvider from softhddevice.cpp 
+    Fallback to VDR implementation, needs to separate cSoftOsdProvider from softhddevice.cpp
     else {
         if (cSoftOsdProvider::GetImageData(ImageHandle))
             DrawImage(Point, *cSoftOsdProvider::GetImageData(ImageHandle));
@@ -1786,7 +1839,11 @@ void cOglPixmap::DrawImage(const cPoint &Point, int ImageHandle) {
 }
 
 void cOglPixmap::DrawPixel(const cPoint &Point, tColor Color) {
-    esyslog("[softhddev] DrawPixel %d %d color %x not implemented in OpenGl OSD", Point.X(), Point.X(), Color);
+    cRect r(Point.X(), Point.Y(), 1, 1);
+    oglThread->DoCmd(new cOglCmdDrawRectangle(fb, r.X(), r.Y(), r.Width(), r.Height(), Color));
+
+    SetDirty();
+    MarkDrawPortDirty(r);
 }
 
 void cOglPixmap::DrawBitmap(const cPoint &Point, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool Overlay) {
@@ -1833,7 +1890,7 @@ void cOglPixmap::DrawText(const cPoint &Point, const char *s, tColor ColorFg, tC
     int cw = Width ? Width : w;
     int ch = Height ? Height : h;
     cRect r(x, y, cw, ch);
-    
+
     if (ColorBg != clrTransparent)
         oglThread->DoCmd(new cOglCmdDrawRectangle(fb, r.X(), r.Y(), r.Width(), r.Height(), ColorBg));
 
@@ -1927,31 +1984,34 @@ cOglOsd::cOglOsd(int Left, int Top, uint Level, std::shared_ptr<cOglThread> oglT
     int osdWidth = 0;
     int osdHeight = 0;
 
+    pthread_mutex_lock(&OSDMutex);
     VideoGetOsdSize(&osdWidth, &osdHeight);
-//	osdWidth = 1920;
-//	osdHeight = 1080;
-	
+    // osdWidth = 1920;
+    // osdHeight = 1080;
+
     dsyslog("[softhddev]cOglOsd osdLeft %d osdTop %d screenWidth %d screenHeight %d", Left, Top, osdWidth, osdHeight);
-#ifdef PLACEBO
-	if (posd)
-		free(posd);
-	posd = MALLOC(unsigned char, osdWidth * osdHeight * 4);
-#endif
-    //create  output framebuffer
+
+    if (posd)
+        free(posd);
+    posd = MALLOC(unsigned char, osdWidth * osdHeight * 4);
+
+    // create output framebuffer
+
     if (!oFb) {
         oFb = new cOglOutputFb(osdWidth, osdHeight);
         oglThread->DoCmd(new cOglCmdInitOutputFb(oFb));
     }
 
+    pthread_mutex_unlock(&OSDMutex);
 }
 
 cOglOsd::~cOglOsd() {
     OsdClose();
     SetActive(false);
-#ifdef PLACEBO
-	if (posd)
-		free(posd);
-	posd = 0;
+#if 0
+    if (posd)
+        free(posd);
+    posd = 0;
 #endif
     oglThread->DoCmd(new cOglCmdDeleteFb(bFb));
 }
@@ -1965,9 +2025,9 @@ eOsdError cOglOsd::SetAreas(const tArea *Areas, int NumAreas) {
 
     tArea area = { r.Left(), r.Top(), r.Right(), r.Bottom(), 32 };
 
-    //now we know the actuaL osd size, create double buffer frame buffer
+    // now we know the actuaL osd size, create double buffer frame buffer
     if (bFb) {
-        oglThread->DoCmd(new cOglCmdDeleteFb(bFb));		
+        oglThread->DoCmd(new cOglCmdDeleteFb(bFb));
         DestroyPixmap(oglPixmaps[0]);
     }
     bFb = new cOglFb(r.Width(), r.Height(), r.Width(), r.Height());
@@ -1986,7 +2046,7 @@ cPixmap *cOglOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &Dr
     int height = DrawPort.IsEmpty() ? ViewPort.Height() : DrawPort.Height();
 
     if (width > oglThread->MaxTextureSize() || height > oglThread->MaxTextureSize()) {
-        esyslog("[softhddev] cannot allocate pixmap of %dpx x %dpx, clipped to %dpx x %dpx!", 
+        esyslog("[softhddev] cannot allocate pixmap of %dpx x %dpx, clipped to %dpx x %dpx!",
                     width, height, std::min(width, oglThread->MaxTextureSize()), std::min(height, oglThread->MaxTextureSize()));
         width = std::min(width, oglThread->MaxTextureSize());
         height = std::min(height, oglThread->MaxTextureSize());
@@ -1995,11 +2055,11 @@ cPixmap *cOglOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &Dr
     cOglPixmap *p = new cOglPixmap(oglThread, Layer, ViewPort, DrawPort);
 
     if (cOsd::AddPixmap(p)) {
-        //find free slot
+        // find free slot
         for (int i = 0; i < oglPixmaps.Size(); i++)
             if (!oglPixmaps[i])
                 return oglPixmaps[i] = p;
-        //append at end
+        // append at end
         oglPixmaps.Append(p);
         return p;
     }
@@ -2031,28 +2091,28 @@ void cOglOsd::Flush(void) {
     if (!oglThread->Active())
         return;
     LOCK_PIXMAPS;
-    //check if any pixmap is dirty
+    // check if any pixmap is dirty
     bool dirty = false;
     for (int i = 0; i < oglPixmaps.Size() && !dirty; i++)
         if (oglPixmaps[i] && oglPixmaps[i]->Layer() >= 0 && oglPixmaps[i]->IsDirty())
             dirty = true;
     if (!dirty)
         return;
-    //clear buffer
-    //uint64_t start = cTimeMs::Now();
-    //dsyslog("[softhddev]Start Flush at %" PRIu64 "", cTimeMs::Now());
-	
+    // clear buffer
+    // uint64_t start = cTimeMs::Now();
+    // dsyslog("[softhddev]Start Flush at %" PRIu64 "", cTimeMs::Now());
+
 
     oglThread->DoCmd(new cOglCmdFill(bFb, clrTransparent));
 
-    //render pixmap textures blended to buffer
+    // render pixmap textures blended to buffer
     for (int layer = 0; layer < MAXPIXMAPLAYERS; layer++) {
         for (int i = 0; i < oglPixmaps.Size(); i++) {
             if (oglPixmaps[i]) {
                 if (oglPixmaps[i]->Layer() == layer) {
-                    oglThread->DoCmd(new cOglCmdRenderFbToBufferFb( oglPixmaps[i]->Fb(), 
-                                                                    bFb, 
-                                                                    oglPixmaps[i]->ViewPort().X(), 
+                    oglThread->DoCmd(new cOglCmdRenderFbToBufferFb( oglPixmaps[i]->Fb(),
+                                                                    bFb,
+                                                                    oglPixmaps[i]->ViewPort().X(),
                                                                     (!isSubtitleOsd) ? oglPixmaps[i]->ViewPort().Y() : 0,
                                                                     oglPixmaps[i]->Alpha(),
                                                                     oglPixmaps[i]->DrawPort().X(),
@@ -2064,7 +2124,7 @@ void cOglOsd::Flush(void) {
     }
     oglThread->DoCmd(new cOglCmdCopyBufferToOutputFb(bFb, oFb, Left(), Top()));
 
-    //dsyslog("[softhddev]End Flush at %" PRIu64 ", duration %d", cTimeMs::Now(), (int)(cTimeMs::Now()-start));
+    // dsyslog("[softhddev]End Flush at %" PRIu64 ", duration %d", cTimeMs::Now(), (int)(cTimeMs::Now()-start));
 }
 
 void cOglOsd::DrawScaledBitmap(int x, int y, const cBitmap &Bitmap, double FactorX, double FactorY, bool AntiAlias) {

openglosd.h

@@ -17,25 +17,21 @@
 #include FT_STROKER_H
 
 #undef __FTERRORS_H__
-#define FT_ERRORDEF( e, v, s )  { e, s },
-#define FT_ERROR_START_LIST     {
-#define FT_ERROR_END_LIST       { 0, 0 } };
-const struct {
-    int          code;
-    const char*  message;
+#define FT_ERRORDEF( e, v, s )	{ e, s },
+#define FT_ERROR_START_LIST	{
+#define FT_ERROR_END_LIST	{ 0, 0 } };
+const struct
+{
+    int code;
+    const char *message;
 } FT_Errors[] =
 #include FT_ERRORS_H
-
-
 #include <memory>
 #include <queue>
-
 #include <vdr/plugin.h>
 #include <vdr/osd.h>
 #include <vdr/thread.h>
-
 #include "softhddev.h"
-
 extern "C"
 {
 #include <stdint.h>
@@ -49,7 +45,8 @@ extern "C"
 
 extern "C" pthread_mutex_t OSDMutex;
 
-struct sOglImage {
+struct sOglImage
+{
     GLuint texture;
     GLint width;
     GLint height;
@@ -60,69 +57,97 @@ struct sOglImage {
 * Helpers
 ****************************************************************************************/
 
-void ConvertColor(const GLint &colARGB, glm::vec4 &col);
+void ConvertColor(const GLint & colARGB, glm::vec4 & col);
 
 /****************************************************************************************
 * cShader
 ****************************************************************************************/
-enum eShaderType {
+enum eShaderType
+{
     stRect,
     stTexture,
     stText,
     stCount
 };
 
-class cShader {
-private:
+class cShader
+{
+  private:
     eShaderType type;
     GLuint id;
     bool Compile(const char *vertexCode, const char *fragmentCode);
     bool CheckCompileErrors(GLuint object, bool program = false);
-public:
-    cShader(void) {};
-    virtual ~cShader(void) {};
+  public:
+     cShader(void)
+    {
+    };
+    virtual ~ cShader(void)
+    {
+    };
     bool Load(eShaderType type);
     void Use(void);
-    void SetFloat    (const GLchar *name, GLfloat value);
-    void SetInteger  (const GLchar *name, GLint value);
-    void SetVector2f (const GLchar *name, GLfloat x, GLfloat y);
-    void SetVector3f (const GLchar *name, GLfloat x, GLfloat y, GLfloat z);
-    void SetVector4f (const GLchar *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void SetMatrix4  (const GLchar *name, const glm::mat4 &matrix);
+    void SetFloat(const GLchar * name, GLfloat value);
+    void SetInteger(const GLchar * name, GLint value);
+    void SetVector2f(const GLchar * name, GLfloat x, GLfloat y);
+    void SetVector3f(const GLchar * name, GLfloat x, GLfloat y, GLfloat z);
+    void SetVector4f(const GLchar * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void SetMatrix4(const GLchar * name, const glm::mat4 & matrix);
 };
 
 /****************************************************************************************
 * cOglGlyph
 ****************************************************************************************/
-class cOglGlyph : public cListObject {
-private:
-    struct tKerning {
-        public:
-            tKerning(uint prevSym, GLfloat kerning = 0.0f)  {
-                this->prevSym = prevSym;
-                this->kerning = kerning;
-            }
-            uint prevSym;
-            GLfloat kerning;
+class cOglGlyph:public cListObject
+{
+  private:
+    struct tKerning
+    {
+      public:
+        tKerning(uint prevSym, GLfloat kerning = 0.0f) {
+            this->prevSym = prevSym;
+            this->kerning = kerning;
+        }
+        uint prevSym;
+        GLfloat kerning;
     };
     uint charCode;
     int bearingLeft;
     int bearingTop;
     int width;
     int height;
-    int advanceX;      
-    cVector<tKerning> kerningCache;
+    int advanceX;
+
+    cVector < tKerning > kerningCache;
     GLuint texture;
     void LoadTexture(FT_BitmapGlyph ftGlyph);
-public:
+
+  public:
     cOglGlyph(uint charCode, FT_BitmapGlyph ftGlyph);
-    virtual ~cOglGlyph();
-    uint CharCode(void) { return charCode; }
-    int AdvanceX(void) { return advanceX; }
-    int BearingLeft(void) const { return bearingLeft; }
-    int BearingTop(void) const { return bearingTop; }
-    int Width(void) const { return width; }
-    int Height(void) const { return height; }
+    virtual ~ cOglGlyph();
+    uint CharCode(void)
+    {
+        return charCode;
+    }
+    int AdvanceX(void)
+    {
+        return advanceX;
+    }
+    int BearingLeft(void) const
+    {
+        return bearingLeft;
+    }
+    int BearingTop(void) const
+    {
+        return bearingTop;
+    }
+    int Width(void) const
+    {
+        return width;
+    }
+    int Height(void) const
+    {
+        return height;
+    }
     int GetKerningCache(uint prevSym);
     void SetKerningCache(uint prevSym, int kerning);
     void BindTexture(void);
@@ -131,8 +156,9 @@ public:
 /****************************************************************************************
 * cOglFont
 ****************************************************************************************/
-class cOglFont : public cListObject {
-private:
+class cOglFont:public cListObject
+{
+  private:
     static bool initiated;
     cString name;
     int size;
@@ -140,41 +166,57 @@ private:
     int bottom;
     static FT_Library ftLib;
     FT_Face face;
-    static cList<cOglFont> *fonts;
-    mutable cList<cOglGlyph> glyphCache;
-    cOglFont(const char *fontName, int charHeight);
+    static cList < cOglFont > *fonts;
+    mutable cList < cOglGlyph > glyphCache;
+     cOglFont(const char *fontName, int charHeight);
     static void Init(void);
-public:
-    virtual ~cOglFont(void);
+  public:
+     virtual ~ cOglFont(void);
     static cOglFont *Get(const char *name, int charHeight);
     static void Cleanup(void);
-    const char *Name(void) { return *name; };
-    int Size(void) { return size; };
-    int Bottom(void) {return bottom; };
-    int Height(void) {return height; };
-    cOglGlyph* Glyph(uint charCode) const;
-    int Kerning(cOglGlyph *glyph, uint prevSym) const;
+    const char *Name(void)
+    {
+        return *name;
+    };
+    int Size(void)
+    {
+        return size;
+    };
+    int Bottom(void)
+    {
+        return bottom;
+    };
+    int Height(void)
+    {
+        return height;
+    };
+    cOglGlyph *Glyph(uint charCode) const;
+    int Kerning(cOglGlyph * glyph, uint prevSym) const;
 };
 
 /****************************************************************************************
 * cOglFb
 * Framebuffer Object - OpenGL part of a Pixmap
 ****************************************************************************************/
-class cOglFb {
-protected:
+class cOglFb
+{
+  protected:
     bool initiated;
-//    GLuint fb;
-//    GLuint texture;
+    // GLuint fb;
+    // GLuint texture;
     GLint width, height;
     GLint viewPortWidth, viewPortHeight;
     bool scrollable;
-public:
-	GLuint fb;
-	GLuint texture;
-	
-    cOglFb(GLint width, GLint height, GLint viewPortWidth, GLint viewPortHeight);
-    virtual ~cOglFb(void);
-    bool Initiated(void) { return initiated; }
+  public:
+     GLuint fb;
+    GLuint texture;
+
+     cOglFb(GLint width, GLint height, GLint viewPortWidth, GLint viewPortHeight);
+     virtual ~ cOglFb(void);
+    bool Initiated(void)
+    {
+        return initiated;
+    }
     virtual bool Init(void);
     void Bind(void);
     void BindRead(void);
@@ -182,27 +224,43 @@ public:
     virtual void Unbind(void);
     bool BindTexture(void);
     void Blit(GLint destX1, GLint destY1, GLint destX2, GLint destY2);
-    GLint Width(void) { return width; };
-    GLint Height(void) { return height; };
-    bool Scrollable(void) { return scrollable; };
-    GLint ViewportWidth(void) { return viewPortWidth; };
-    GLint ViewportHeight(void) { return viewPortHeight; };
+    GLint Width(void)
+    {
+        return width;
+    };
+    GLint Height(void)
+    {
+        return height;
+    };
+    bool Scrollable(void)
+    {
+        return scrollable;
+    };
+    GLint ViewportWidth(void)
+    {
+        return viewPortWidth;
+    };
+    GLint ViewportHeight(void)
+    {
+        return viewPortHeight;
+    };
 };
 
 /****************************************************************************************
 * cOglOutputFb
 * Output Framebuffer Object - holds Vdpau Output Surface which is our "output framebuffer"
 ****************************************************************************************/
-class cOglOutputFb : public cOglFb {
-protected:
+class cOglOutputFb:public cOglFb
+{
+  protected:
     bool initiated;
-private:
-    GLvdpauSurfaceNV surface;
-public:
-	GLuint fb;
-	GLuint texture;
-    cOglOutputFb(GLint width, GLint height);
-    virtual ~cOglOutputFb(void);
+  private:
+     GLvdpauSurfaceNV surface;
+  public:
+     GLuint fb;
+    GLuint texture;
+     cOglOutputFb(GLint width, GLint height);
+     virtual ~ cOglOutputFb(void);
     virtual bool Init(void);
     virtual void BindWrite(void);
     virtual void Unbind(void);
@@ -210,9 +268,10 @@ public:
 
 /****************************************************************************************
 * cOglVb
-* Vertex Buffer - OpenGl Vertices for the different drawing commands  
+* Vertex Buffer - OpenGl Vertices for the different drawing commands
 ****************************************************************************************/
-enum eVertexBufferType {
+enum eVertexBufferType
+{
     vbRect,
     vbEllipse,
     vbSlope,
@@ -221,8 +280,9 @@ enum eVertexBufferType {
     vbCount
 };
 
-class cOglVb {
-private:
+class cOglVb
+{
+  private:
     eVertexBufferType type;
     eShaderType shader;
     GLuint vao;
@@ -231,9 +291,9 @@ private:
     int sizeVertex2;
     int numVertices;
     GLuint drawMode;
-public:
-    cOglVb(int type);
-    virtual ~cOglVb(void);
+  public:
+     cOglVb(int type);
+     virtual ~ cOglVb(void);
     bool Init(void);
     void Bind(void);
     void Unbind(void);
@@ -243,184 +303,271 @@ public:
     void SetShaderColor(GLint color);
     void SetShaderAlpha(GLint alpha);
     void SetShaderProjectionMatrix(GLint width, GLint height);
-    void SetVertexData(GLfloat *vertices, int count = 0);
+    void SetVertexData(GLfloat * vertices, int count = 0);
     void DrawArrays(int count = 0);
 };
 
 /****************************************************************************************
 * cOpenGLCmd
 ****************************************************************************************/
-class cOglCmd {
-protected:
-    cOglFb *fb;
-public:
-    cOglCmd(cOglFb *fb) { this->fb = fb; };
-    virtual ~cOglCmd(void) {};
-    virtual const char* Description(void) = 0;
+class cOglCmd
+{
+  protected:
+    cOglFb * fb;
+  public:
+    cOglCmd(cOglFb * fb)
+    {
+        this->fb = fb;
+    };
+    virtual ~ cOglCmd(void)
+    {
+    };
+    virtual const char *Description(void) = 0;
     virtual bool Execute(void) = 0;
 };
 
-class cOglCmdInitOutputFb : public cOglCmd {
-private:
-    cOglOutputFb *oFb;
-public:
-    cOglCmdInitOutputFb(cOglOutputFb *oFb);
-    virtual ~cOglCmdInitOutputFb(void) {};
-    virtual const char* Description(void) { return "InitOutputFramebuffer"; }
+class cOglCmdInitOutputFb:public cOglCmd
+{
+  private:
+    cOglOutputFb * oFb;
+  public:
+    cOglCmdInitOutputFb(cOglOutputFb * oFb);
+    virtual ~ cOglCmdInitOutputFb(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "InitOutputFramebuffer";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdInitFb : public cOglCmd {
-private:
-    cCondWait *wait;
-public:
-    cOglCmdInitFb(cOglFb *fb, cCondWait *wait = NULL);
-    virtual ~cOglCmdInitFb(void) {};
-    virtual const char* Description(void) { return "InitFramebuffer"; }
+class cOglCmdInitFb:public cOglCmd
+{
+  private:
+    cCondWait * wait;
+  public:
+    cOglCmdInitFb(cOglFb * fb, cCondWait * wait = NULL);
+    virtual ~ cOglCmdInitFb(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "InitFramebuffer";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDeleteFb : public cOglCmd {
-public:
-    cOglCmdDeleteFb(cOglFb *fb);
-    virtual ~cOglCmdDeleteFb(void) {};
-    virtual const char* Description(void) { return "DeleteFramebuffer"; }
+class cOglCmdDeleteFb:public cOglCmd
+{
+  public:
+    cOglCmdDeleteFb(cOglFb * fb);
+    virtual ~ cOglCmdDeleteFb(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "DeleteFramebuffer";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdRenderFbToBufferFb : public cOglCmd {
-private:
-    cOglFb *buffer;
+class cOglCmdRenderFbToBufferFb:public cOglCmd
+{
+  private:
+    cOglFb * buffer;
     GLfloat x, y;
     GLfloat drawPortX, drawPortY;
     GLint transparency;
-public:
-    cOglCmdRenderFbToBufferFb(cOglFb *fb, cOglFb *buffer, GLint x, GLint y, GLint transparency, GLint drawPortX, GLint drawPortY);
-    virtual ~cOglCmdRenderFbToBufferFb(void) {};
-    virtual const char* Description(void) { return "Render Framebuffer to Buffer"; }
+  public:
+     cOglCmdRenderFbToBufferFb(cOglFb * fb, cOglFb * buffer, GLint x, GLint y, GLint transparency, GLint drawPortX,
+        GLint drawPortY);
+     virtual ~ cOglCmdRenderFbToBufferFb(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "Render Framebuffer to Buffer";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdCopyBufferToOutputFb : public cOglCmd {
-private:
-    cOglOutputFb *oFb;
+class cOglCmdCopyBufferToOutputFb:public cOglCmd
+{
+  private:
+    cOglOutputFb * oFb;
     GLint x, y;
-public:
-    cOglCmdCopyBufferToOutputFb(cOglFb *fb, cOglOutputFb *oFb, GLint x, GLint y);
-    virtual ~cOglCmdCopyBufferToOutputFb(void) {};
-    virtual const char* Description(void) { return "Copy buffer to OutputFramebuffer"; }
+  public:
+     cOglCmdCopyBufferToOutputFb(cOglFb * fb, cOglOutputFb * oFb, GLint x, GLint y);
+     virtual ~ cOglCmdCopyBufferToOutputFb(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "Copy buffer to OutputFramebuffer";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdFill : public cOglCmd {
-private:
+class cOglCmdFill:public cOglCmd
+{
+  private:
     GLint color;
-public:
-    cOglCmdFill(cOglFb *fb, GLint color);
-    virtual ~cOglCmdFill(void) {};
-    virtual const char* Description(void) { return "Fill"; }
+  public:
+    cOglCmdFill(cOglFb * fb, GLint color);
+    virtual ~ cOglCmdFill(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "Fill";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDrawRectangle : public cOglCmd {
-private:
+class cOglCmdDrawRectangle:public cOglCmd
+{
+  private:
     GLint x, y;
     GLint width, height;
     GLint color;
-public:
-    cOglCmdDrawRectangle(cOglFb *fb, GLint x, GLint y, GLint width, GLint height, GLint color);
-    virtual ~cOglCmdDrawRectangle(void) {};
-    virtual const char* Description(void) { return "DrawRectangle"; }
+  public:
+     cOglCmdDrawRectangle(cOglFb * fb, GLint x, GLint y, GLint width, GLint height, GLint color);
+     virtual ~ cOglCmdDrawRectangle(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "DrawRectangle";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDrawEllipse : public cOglCmd {
-private:
+class cOglCmdDrawEllipse:public cOglCmd
+{
+  private:
     GLint x, y;
     GLint width, height;
     GLint color;
     GLint quadrants;
     GLfloat *CreateVerticesFull(int &numVertices);
     GLfloat *CreateVerticesQuadrant(int &numVertices);
-    GLfloat *CreateVerticesHalf(int &numVertices); 
-public:
-    cOglCmdDrawEllipse(cOglFb *fb, GLint x, GLint y, GLint width, GLint height, GLint color, GLint quadrants);
-    virtual ~cOglCmdDrawEllipse(void) {};
-    virtual const char* Description(void) { return "DrawEllipse"; }
+    GLfloat *CreateVerticesHalf(int &numVertices);
+  public:
+     cOglCmdDrawEllipse(cOglFb * fb, GLint x, GLint y, GLint width, GLint height, GLint color, GLint quadrants);
+     virtual ~ cOglCmdDrawEllipse(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "DrawEllipse";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDrawSlope : public cOglCmd {
-private:
+class cOglCmdDrawSlope:public cOglCmd
+{
+  private:
     GLint x, y;
     GLint width, height;
     GLint color;
     GLint type;
-public:
-    cOglCmdDrawSlope(cOglFb *fb, GLint x, GLint y, GLint width, GLint height, GLint color, GLint type);
-    virtual ~cOglCmdDrawSlope(void) {};
-    virtual const char* Description(void) { return "DrawSlope"; }
+  public:
+     cOglCmdDrawSlope(cOglFb * fb, GLint x, GLint y, GLint width, GLint height, GLint color, GLint type);
+     virtual ~ cOglCmdDrawSlope(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "DrawSlope";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDrawText : public cOglCmd {
-private:
+class cOglCmdDrawText:public cOglCmd
+{
+  private:
     GLint x, y;
     GLint limitX;
     GLint colorText;
     cString fontName;
     int fontSize;
     unsigned int *symbols;
-public:
-    cOglCmdDrawText(cOglFb *fb, GLint x, GLint y, unsigned int *symbols, GLint limitX, const char *name, int fontSize, tColor colorText);
-    virtual ~cOglCmdDrawText(void);
-    virtual const char* Description(void) { return "DrawText"; }
+  public:
+     cOglCmdDrawText(cOglFb * fb, GLint x, GLint y, unsigned int *symbols, GLint limitX, const char *name,
+        int fontSize, tColor colorText);
+     virtual ~ cOglCmdDrawText(void);
+    virtual const char *Description(void)
+    {
+        return "DrawText";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDrawImage : public cOglCmd {
-private:
-    tColor *argb;
+class cOglCmdDrawImage:public cOglCmd
+{
+  private:
+    tColor * argb;
     GLint x, y, width, height;
     bool overlay;
     GLfloat scaleX, scaleY;
-public:
-    cOglCmdDrawImage(cOglFb *fb, tColor *argb, GLint width, GLint height, GLint x, GLint y, bool overlay = true, double scaleX = 1.0f, double scaleY = 1.0f);
-    virtual ~cOglCmdDrawImage(void);
-    virtual const char* Description(void) { return "Draw Image"; }
+  public:
+     cOglCmdDrawImage(cOglFb * fb, tColor * argb, GLint width, GLint height, GLint x, GLint y, bool overlay =
+        true, double scaleX = 1.0f, double scaleY = 1.0f);
+     virtual ~ cOglCmdDrawImage(void);
+    virtual const char *Description(void)
+    {
+        return "Draw Image";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDrawTexture : public cOglCmd {
-private:
-    sOglImage *imageRef;
+class cOglCmdDrawTexture:public cOglCmd
+{
+  private:
+    sOglImage * imageRef;
     GLint x, y;
-public:
-    cOglCmdDrawTexture(cOglFb *fb, sOglImage *imageRef, GLint x, GLint y);
-    virtual ~cOglCmdDrawTexture(void) {};
-    virtual const char* Description(void) { return "Draw Texture"; }
+  public:
+     cOglCmdDrawTexture(cOglFb * fb, sOglImage * imageRef, GLint x, GLint y);
+     virtual ~ cOglCmdDrawTexture(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "Draw Texture";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdStoreImage : public cOglCmd {
-private:
-    sOglImage *imageRef;
+class cOglCmdStoreImage:public cOglCmd
+{
+  private:
+    sOglImage * imageRef;
     tColor *data;
-public:
-    cOglCmdStoreImage(sOglImage *imageRef, tColor *argb);
-    virtual ~cOglCmdStoreImage(void);
-    virtual const char* Description(void) { return "Store Image"; }
+  public:
+     cOglCmdStoreImage(sOglImage * imageRef, tColor * argb);
+     virtual ~ cOglCmdStoreImage(void);
+    virtual const char *Description(void)
+    {
+        return "Store Image";
+    }
     virtual bool Execute(void);
 };
 
-class cOglCmdDropImage : public cOglCmd {
-private:
-    sOglImage *imageRef;
+class cOglCmdDropImage:public cOglCmd
+{
+  private:
+    sOglImage * imageRef;
     cCondWait *wait;
-public:
-    cOglCmdDropImage(sOglImage *imageRef, cCondWait *wait);
-    virtual ~cOglCmdDropImage(void) {};
-    virtual const char* Description(void) { return "Drop Image"; }
+  public:
+     cOglCmdDropImage(sOglImage * imageRef, cCondWait * wait);
+     virtual ~ cOglCmdDropImage(void)
+    {
+    };
+    virtual const char *Description(void)
+    {
+        return "Drop Image";
+    }
     virtual bool Execute(void);
 };
 
@@ -430,12 +577,13 @@ public:
 #define OGL_MAX_OSDIMAGES 256
 #define OGL_CMDQUEUE_SIZE 100
 
-class cOglThread : public cThread {
-private:
-    cCondWait *startWait;
+class cOglThread:public cThread
+{
+  private:
+    cCondWait * startWait;
     cCondWait *wait;
     bool stalled;
-    std::queue<cOglCmd*> commands;
+     std::queue < cOglCmd * >commands;
     GLint maxTextureSize;
     sOglImage imageCache[OGL_MAX_OSDIMAGES];
     long memCached;
@@ -449,73 +597,96 @@ private:
     void Cleanup(void);
     int GetFreeSlot(void);
     void ClearSlot(int slot);
-protected:
-    virtual void Action(void);
-public:
-    cOglThread(cCondWait *startWait, int maxCacheSize);
-    virtual ~cOglThread();
+  protected:
+     virtual void Action(void);
+  public:
+     cOglThread(cCondWait * startWait, int maxCacheSize);
+     virtual ~ cOglThread();
     void Stop(void);
-    void DoCmd(cOglCmd* cmd);
-    int StoreImage(const cImage &image);
+    void DoCmd(cOglCmd * cmd);
+    int StoreImage(const cImage & image);
     void DropImageData(int imageHandle);
     sOglImage *GetImageRef(int slot);
-    int MaxTextureSize(void) { return maxTextureSize; };
+    int MaxTextureSize(void)
+    {
+        return maxTextureSize;
+    };
 };
 
 /****************************************************************************************
 * cOglPixmap
 ****************************************************************************************/
-class cOglPixmap : public cPixmap {
-private:
-    cOglFb *fb;
-    std::shared_ptr<cOglThread> oglThread;
+class cOglPixmap:public cPixmap
+{
+  private:
+    cOglFb * fb;
+    std::shared_ptr < cOglThread > oglThread;
     bool dirty;
-public:
-    cOglPixmap(std::shared_ptr<cOglThread> oglThread, int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
-    virtual ~cOglPixmap(void);
-    cOglFb *Fb(void) { return fb; };
-    int X(void) { return ViewPort().X(); };
-    int Y(void) { return ViewPort().Y(); };
-    virtual bool IsDirty(void) { return dirty; }
-    virtual void SetDirty(bool dirty = true) { this->dirty = dirty; }
+  public:
+     cOglPixmap(std::shared_ptr < cOglThread > oglThread, int Layer, const cRect & ViewPort, const cRect & DrawPort =
+        cRect::Null);
+     virtual ~ cOglPixmap(void);
+    cOglFb *Fb(void)
+    {
+        return fb;
+    };
+    int X(void)
+    {
+        return ViewPort().X();
+    };
+    int Y(void)
+    {
+        return ViewPort().Y();
+    };
+    virtual bool IsDirty(void)
+    {
+        return dirty;
+    }
+    virtual void SetDirty(bool dirty = true) {
+        this->dirty = dirty;
+    }
     virtual void SetAlpha(int Alpha);
     virtual void SetTile(bool Tile);
-    virtual void SetViewPort(const cRect &Rect);
-    virtual void SetDrawPortPoint(const cPoint &Point, bool Dirty = true);
+    virtual void SetViewPort(const cRect & Rect);
+    virtual void SetDrawPortPoint(const cPoint & Point, bool Dirty = true);
     virtual void Clear(void);
     virtual void Fill(tColor Color);
-    virtual void DrawImage(const cPoint &Point, const cImage &Image);
-    virtual void DrawImage(const cPoint &Point, int ImageHandle);
-    virtual void DrawPixel(const cPoint &Point, tColor Color);
-    virtual void DrawBitmap(const cPoint &Point, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool Overlay = false);
-    virtual void DrawText(const cPoint &Point, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
-    virtual void DrawRectangle(const cRect &Rect, tColor Color);
-    virtual void DrawEllipse(const cRect &Rect, tColor Color, int Quadrants = 0);
-    virtual void DrawSlope(const cRect &Rect, tColor Color, int Type);
-    virtual void Render(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest);
-    virtual void Copy(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest);
-    virtual void Scroll(const cPoint &Dest, const cRect &Source = cRect::Null);
-    virtual void Pan(const cPoint &Dest, const cRect &Source = cRect::Null);
+    virtual void DrawImage(const cPoint & Point, const cImage & Image);
+    virtual void DrawImage(const cPoint & Point, int ImageHandle);
+    virtual void DrawPixel(const cPoint & Point, tColor Color);
+    virtual void DrawBitmap(const cPoint & Point, const cBitmap & Bitmap, tColor ColorFg = 0, tColor ColorBg =
+        0, bool Overlay = false);
+    virtual void DrawText(const cPoint & Point, const char *s, tColor ColorFg, tColor ColorBg, const cFont * Font,
+        int Width = 0, int Height = 0, int Alignment = taDefault);
+    virtual void DrawRectangle(const cRect & Rect, tColor Color);
+    virtual void DrawEllipse(const cRect & Rect, tColor Color, int Quadrants = 0);
+    virtual void DrawSlope(const cRect & Rect, tColor Color, int Type);
+    virtual void Render(const cPixmap * Pixmap, const cRect & Source, const cPoint & Dest);
+    virtual void Copy(const cPixmap * Pixmap, const cRect & Source, const cPoint & Dest);
+    virtual void Scroll(const cPoint & Dest, const cRect & Source = cRect::Null);
+    virtual void Pan(const cPoint & Dest, const cRect & Source = cRect::Null);
 };
 
 /******************************************************************************
 * cOglOsd
 ******************************************************************************/
-class cOglOsd : public cOsd {
-private:
-    cOglFb *bFb;
-    std::shared_ptr<cOglThread> oglThread;
-    cVector<cOglPixmap *> oglPixmaps;
+class cOglOsd:public cOsd
+{
+  private:
+    cOglFb * bFb;
+    std::shared_ptr < cOglThread > oglThread;
+    cVector < cOglPixmap * >oglPixmaps;
     bool isSubtitleOsd;
-protected:
-public:
-    cOglOsd(int Left, int Top, uint Level, std::shared_ptr<cOglThread> oglThread);
-    virtual ~cOglOsd();
-    virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
-    virtual cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
-    virtual void DestroyPixmap(cPixmap *Pixmap);
+  protected:
+  public:
+     cOglOsd(int Left, int Top, uint Level, std::shared_ptr < cOglThread > oglThread);
+     virtual ~ cOglOsd();
+    virtual eOsdError SetAreas(const tArea * Areas, int NumAreas);
+    virtual cPixmap *CreatePixmap(int Layer, const cRect & ViewPort, const cRect & DrawPort = cRect::Null);
+    virtual void DestroyPixmap(cPixmap * Pixmap);
     virtual void Flush(void);
-    virtual void DrawScaledBitmap(int x, int y, const cBitmap &Bitmap, double FactorX, double FactorY, bool AntiAlias = false);
+    virtual void DrawScaledBitmap(int x, int y, const cBitmap & Bitmap, double FactorX, double FactorY,
+        bool AntiAlias = false);
     static cOglOutputFb *oFb;
 };
 

patches/HDR-for-LSPCON.patch

@@ -0,0 +1,312 @@
+diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
+index 8358152e403e..573ab6ea1a6e 100644
+--- a/drivers/gpu/drm/i915/display/intel_display_types.h
++++ b/drivers/gpu/drm/i915/display/intel_display_types.h
+@@ -1274,6 +1274,7 @@ struct intel_lspcon {
+ 	bool active;
+ 	enum drm_lspcon_mode mode;
+ 	enum lspcon_vendor vendor;
++	bool hdr_supported;
+ };
+ 
+ struct intel_digital_port {
+diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
+index f8f1308643a9..a1d0127b7f57 100644
+--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
++++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
+@@ -35,6 +35,8 @@
+ #define LSPCON_VENDOR_PARADE_OUI 0x001CF8
+ #define LSPCON_VENDOR_MCA_OUI 0x0060AD
+ 
++#define DPCD_MCA_LSPCON_HDR_STATUS	0x70003
++
+ /* AUX addresses to write MCA AVI IF */
+ #define LSPCON_MCA_AVI_IF_WRITE_OFFSET 0x5C0
+ #define LSPCON_MCA_AVI_IF_CTRL 0x5DF
+@@ -104,6 +106,31 @@ static bool lspcon_detect_vendor(struct intel_lspcon *lspcon)
+ 	return true;
+ }
+ 
++static bool lspcon_detect_hdr_capability(struct intel_lspcon *lspcon)
++{
++	struct intel_dp *dp = lspcon_to_intel_dp(lspcon);
++	u8 hdr_caps;
++	int ret;
++
++	/* Enable HDR for MCA based LSPCON devices */
++	if (lspcon->vendor == LSPCON_VENDOR_MCA)
++		ret = drm_dp_dpcd_read(&dp->aux, DPCD_MCA_LSPCON_HDR_STATUS,
++				       &hdr_caps, 1);
++	else
++		return false;
++
++	if (ret < 0) {
++		DRM_DEBUG_KMS("hdr capability detection failed\n");
++		lspcon->hdr_supported = false;
++		return false;
++	} else if (hdr_caps & 0x1) {
++		DRM_DEBUG_KMS("lspcon capable of HDR\n");
++		lspcon->hdr_supported = true;
++	}
++
++	return true;
++}
++
+ static enum drm_lspcon_mode lspcon_get_current_mode(struct intel_lspcon *lspcon)
+ {
+ 	enum drm_lspcon_mode current_mode;
+@@ -581,6 +608,11 @@ bool lspcon_init(struct intel_digital_port *intel_dig_port)
+ 		return false;
+ 	}
+ 
++	if (!lspcon_detect_hdr_capability(lspcon)) {
++		DRM_ERROR("LSPCON hdr detection failed\n");
++		return false;
++	}
++
+ 	connector->ycbcr_420_allowed = true;
+ 	lspcon->active = true;
+ 	DRM_DEBUG_KMS("Success: LSPCON init\n");
+-- 
+diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
+index b54ccbb5aad5..051e30ad80e7 100644
+--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
++++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
+@@ -576,6 +576,16 @@ static u32 hsw_infoframes_enabled(struct intel_encoder *encoder,
+ 	return val & mask;
+ }
+ 
++void lspcon_drm_write_infoframe(struct intel_encoder *encoder,
++				const struct intel_crtc_state *crtc_state,
++				unsigned int type,
++				const void *frame, ssize_t len)
++{
++	DRM_DEBUG_KMS("Update HDR metadata for lspcon\n");
++	/* It uses the legacy hsw implementation for the same */
++	hsw_write_infoframe(encoder, crtc_state, type, frame, len);
++}
++
+ static const u8 infoframe_type_to_idx[] = {
+ 	HDMI_PACKET_TYPE_GENERAL_CONTROL,
+ 	HDMI_PACKET_TYPE_GAMUT_METADATA,
+diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
+index a1d0127b7f57..51ad5f02e700 100644
+--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
++++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
+@@ -460,27 +460,41 @@ void lspcon_write_infoframe(struct intel_encoder *encoder,
+ 			    unsigned int type,
+ 			    const void *frame, ssize_t len)
+ {
+-	bool ret;
++	bool ret = true;
+ 	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+ 	struct intel_lspcon *lspcon = enc_to_intel_lspcon(&encoder->base);
+ 
+-	/* LSPCON only needs AVI IF */
+-	if (type != HDMI_INFOFRAME_TYPE_AVI)
++	if (!(type == HDMI_INFOFRAME_TYPE_AVI ||
++	      type == HDMI_PACKET_TYPE_GAMUT_METADATA))
+ 		return;
+ 
+-	if (lspcon->vendor == LSPCON_VENDOR_MCA)
+-		ret = _lspcon_write_avi_infoframe_mca(&intel_dp->aux,
+-						      frame, len);
+-	else
+-		ret = _lspcon_write_avi_infoframe_parade(&intel_dp->aux,
+-							 frame, len);
++	/*
++	 * Supporting HDR on MCA LSPCON
++	 * Todo: Add support for Parade later
++	 */
++	if (type == HDMI_PACKET_TYPE_GAMUT_METADATA &&
++	    lspcon->vendor != LSPCON_VENDOR_MCA)
++		return;
++
++	if (lspcon->vendor == LSPCON_VENDOR_MCA) {
++		if (type == HDMI_INFOFRAME_TYPE_AVI)
++			ret = _lspcon_write_avi_infoframe_mca(&intel_dp->aux,
++							      frame, len);
++		else if (type == HDMI_PACKET_TYPE_GAMUT_METADATA)
++			lspcon_drm_write_infoframe(encoder, crtc_state,
++						   HDMI_PACKET_TYPE_GAMUT_METADATA,
++						   frame, VIDEO_DIP_DATA_SIZE);
++	} else {
++		ret = _lspcon_write_avi_infoframe_parade(&intel_dp->aux, frame,
++							 len);
++	}
+ 
+ 	if (!ret) {
+-		DRM_ERROR("Failed to write AVI infoframes\n");
++		DRM_ERROR("Failed to write infoframes\n");
+ 		return;
+ 	}
+ 
+-	DRM_DEBUG_DRIVER("AVI infoframes updated successfully\n");
++	DRM_DEBUG_DRIVER("Infoframes updated successfully\n");
+ }
+ 
+ void lspcon_read_infoframe(struct intel_encoder *encoder,
+diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.h b/drivers/gpu/drm/i915/display/intel_lspcon.h
+index 37cfddf8a9c5..65878904f672 100644
+--- a/drivers/gpu/drm/i915/display/intel_lspcon.h
++++ b/drivers/gpu/drm/i915/display/intel_lspcon.h
+@@ -35,4 +35,8 @@ u32 lspcon_infoframes_enabled(struct intel_encoder *encoder,
+ void lspcon_ycbcr420_config(struct drm_connector *connector,
+ 			    struct intel_crtc_state *crtc_state);
+ 
++void lspcon_drm_write_infoframe(struct intel_encoder *encoder,
++				const struct intel_crtc_state *crtc_state,
++				unsigned int type,
++				const void *frame, ssize_t len);
+ #endif /* __INTEL_LSPCON_H__ */
+-- 
+diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
+index 51ad5f02e700..c32452360eeb 100644
+--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
++++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
+@@ -627,6 +627,11 @@ bool lspcon_init(struct intel_digital_port *intel_dig_port)
+ 		return false;
+ 	}
+ 
++	if (lspcon->vendor == LSPCON_VENDOR_MCA && lspcon->hdr_supported)
++		drm_object_attach_property(&connector->base,
++					   connector->dev->mode_config.hdr_output_metadata_property,
++					   0);
++
+ 	connector->ycbcr_420_allowed = true;
+ 	lspcon->active = true;
+ 	DRM_DEBUG_KMS("Success: LSPCON init\n");
+-- 
+diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c
+index d0a937fb0c56..e78b3a1626fd 100644
+--- a/drivers/gpu/drm/drm_atomic_state_helper.c
++++ b/drivers/gpu/drm/drm_atomic_state_helper.c
+@@ -416,6 +416,7 @@ __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector,
+ 
+ 	if (state->hdr_output_metadata)
+ 		drm_property_blob_get(state->hdr_output_metadata);
++	state->hdr_metadata_changed = false;
+ 
+ 	/* Don't copy over a writeback job, they are used only once */
+ 	state->writeback_job = NULL;
+diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
+index 0d466d3b0809..5beabcd42d30 100644
+--- a/drivers/gpu/drm/drm_atomic_uapi.c
++++ b/drivers/gpu/drm/drm_atomic_uapi.c
+@@ -734,6 +734,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
+ 				val,
+ 				sizeof(struct hdr_output_metadata), -1,
+ 				&replaced);
++		state->hdr_metadata_changed |= replaced;
+ 		return ret;
+ 	} else if (property == config->aspect_ratio_property) {
+ 		state->picture_aspect_ratio = val;
+diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
+index 9ba794cb9b4f..dee3a593564c 100644
+--- a/drivers/gpu/drm/i915/display/intel_ddi.c
++++ b/drivers/gpu/drm/i915/display/intel_ddi.c
+@@ -3851,6 +3851,8 @@ static void intel_enable_ddi_dp(struct intel_encoder *encoder,
+ {
+ 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+ 	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
++	struct intel_lspcon *lspcon =
++				enc_to_intel_lspcon(&encoder->base);
+ 	enum port port = encoder->port;
+ 
+ 	if (port == PORT_A && INTEL_GEN(dev_priv) < 9)
+@@ -3860,6 +3862,12 @@ static void intel_enable_ddi_dp(struct intel_encoder *encoder,
+ 	intel_psr_enable(intel_dp, crtc_state);
+ 	intel_dp_vsc_enable(intel_dp, crtc_state, conn_state);
+ 	intel_dp_hdr_metadata_enable(intel_dp, crtc_state, conn_state);
++
++	/* Set the infoframe for NON modeset cases as well */
++	if (lspcon->active && lspcon->hdr_supported &&
++	    conn_state->hdr_metadata_changed)
++		intel_dp_setup_hdr_metadata_infoframe_sdp(intel_dp, crtc_state,
++							  conn_state);
+ 	intel_edp_drrs_enable(intel_dp, crtc_state);
+ 
+ 	if (crtc_state->has_audio)
+diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
+index 5eeafa45831a..cc616fd31d8b 100644
+--- a/drivers/gpu/drm/i915/display/intel_dp.c
++++ b/drivers/gpu/drm/i915/display/intel_dp.c
+@@ -4651,7 +4651,7 @@ intel_dp_setup_vsc_sdp(struct intel_dp *intel_dp,
+ 			crtc_state, DP_SDP_VSC, &vsc_sdp, sizeof(vsc_sdp));
+ }
+ 
+-static void
++void
+ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,
+ 					  const struct intel_crtc_state *crtc_state,
+ 					  const struct drm_connector_state *conn_state)
+diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.h b/drivers/gpu/drm/i915/display/intel_lspcon.h
+index 65878904f672..3404cff8c337 100644
+--- a/drivers/gpu/drm/i915/display/intel_lspcon.h
++++ b/drivers/gpu/drm/i915/display/intel_lspcon.h
+@@ -14,6 +14,7 @@ struct intel_crtc_state;
+ struct intel_digital_port;
+ struct intel_encoder;
+ struct intel_lspcon;
++struct intel_dp;
+ 
+ bool lspcon_init(struct intel_digital_port *intel_dig_port);
+ void lspcon_resume(struct intel_lspcon *lspcon);
+@@ -39,4 +40,7 @@ void lspcon_drm_write_infoframe(struct intel_encoder *encoder,
+ 				const struct intel_crtc_state *crtc_state,
+ 				unsigned int type,
+ 				const void *frame, ssize_t len);
++void intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,
++					       const struct intel_crtc_state *crtc_state,
++					       const struct drm_connector_state *conn_state);
+ #endif /* __INTEL_LSPCON_H__ */
+diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
+index 5f8c3389d46f..1f0b4fcf0bd3 100644
+--- a/include/drm/drm_connector.h
++++ b/include/drm/drm_connector.h
+@@ -661,6 +661,7 @@ struct drm_connector_state {
+ 	 * DRM blob property for HDR output metadata
+ 	 */
+ 	struct drm_property_blob *hdr_output_metadata;
++	u8 hdr_metadata_changed : 1;
+ };
+ 
+ /**
+-- 
+diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
+index c32452360eeb..8565bf73c4cd 100644
+--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
++++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
+@@ -505,6 +505,11 @@ void lspcon_read_infoframe(struct intel_encoder *encoder,
+ 	/* FIXME implement this */
+ }
+ 
++/* HDMI HDR Colorspace Spec Definitions */
++#define NORMAL_COLORIMETRY_MASK		0x3
++#define EXTENDED_COLORIMETRY_MASK	0x7
++#define HDMI_COLORIMETRY_BT2020_YCC	((3 << 0) | (6 << 2) | (0 << 5))
++
+ void lspcon_set_infoframes(struct intel_encoder *encoder,
+ 			   bool enable,
+ 			   const struct intel_crtc_state *crtc_state,
+@@ -549,6 +554,19 @@ void lspcon_set_infoframes(struct intel_encoder *encoder,
+ 					   HDMI_QUANTIZATION_RANGE_LIMITED :
+ 					   HDMI_QUANTIZATION_RANGE_FULL);
+ 
++	/*
++	 * Set BT2020 colorspace if driving HDR data
++	 * ToDo: Make this generic and expose all colorspaces for lspcon
++	 */
++	if (lspcon->active && conn_state->hdr_metadata_changed) {
++		frame.avi.colorimetry =
++				HDMI_COLORIMETRY_BT2020_YCC &
++				NORMAL_COLORIMETRY_MASK;
++		frame.avi.extended_colorimetry =
++				(HDMI_COLORIMETRY_BT2020_YCC >> 2) &
++				 EXTENDED_COLORIMETRY_MASK;
++	}
++
+ 	ret = hdmi_infoframe_pack(&frame, buf, sizeof(buf));
+ 	if (ret < 0) {
+ 		DRM_ERROR("Failed to pack AVI IF\n");
+-- 

patches/UHD-10Bit.patch

@@ -0,0 +1,38 @@
+diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
+index cc616fd31d8b..f2d1d7bd87d3 100644
+--- a/drivers/gpu/drm/i915/display/intel_dp.c
++++ b/drivers/gpu/drm/i915/display/intel_dp.c
+@@ -616,8 +616,10 @@ intel_dp_mode_valid(struct drm_connector *connector,
+ {
+ 	struct intel_dp *intel_dp = intel_attached_dp(connector);
+ 	struct intel_connector *intel_connector = to_intel_connector(connector);
++	struct intel_encoder *intel_encoder = intel_attached_encoder(connector);
+ 	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
+ 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
++	struct intel_lspcon *lspcon = enc_to_intel_lspcon(&intel_encoder->base);
+ 	int target_clock = mode->clock;
+ 	int max_rate, mode_rate, max_lanes, max_link_clock;
+ 	int max_dotclk;
+@@ -639,6 +641,21 @@ intel_dp_mode_valid(struct drm_connector *connector,
+ 		target_clock = fixed_mode->clock;
+ 	}
+ 
++	/*
++	 * Reducing Blanking to incorporate DP and HDMI timing/link bandwidth
++	 * limitations for CEA modes (4k@60 at 10 bpp). DP can drive 17.28Gbs
++	 * while 4k modes (VIC97 etc) at 10 bpp required 17.8 Gbps. This will
++	 * cause mode to blank out. Reduced Htotal by shortening the back porch
++	 * and front porch within permissible limits.
++	 */
++	if (lspcon->active && lspcon->hdr_supported &&
++	    mode->clock > 570000) {
++		mode->clock = 570000;
++		mode->htotal -= 180;
++		mode->hsync_start -= 72;
++		mode->hsync_end -= 72;
++	}
++
+ 	max_link_clock = intel_dp_max_link_rate(intel_dp);
+ 	max_lanes = intel_dp_max_lane_count(intel_dp);
+ 
+-- 

patches/skindesigner_patch.txt

@@ -0,0 +1,50 @@
+diff -Naur skindesignerold/coreengine/animation.c skindesigner/coreengine/animation.c
+--- skindesignerold/coreengine/animation.c	2018-03-03 09:03:00.000000000 +0100
++++ skindesigner/coreengine/animation.c	2018-11-18 14:56:31.147849032 +0100
+@@ -671,9 +671,9 @@
+         }
+         animLock.Unlock();
+         reactivate = false;
+-        osd->Flush();
+         if (!animActive)
+             break;
++        osd->Flush();
+         Sleep(start);
+     }
+ }
+diff -Naur skindesignerold/coreengine/view.c skindesigner/coreengine/view.c
+--- skindesignerold/coreengine/view.c	2018-03-03 09:03:00.000000000 +0100
++++ skindesigner/coreengine/view.c	2018-11-18 11:59:24.870281811 +0100
+@@ -279,7 +279,7 @@
+             continue;
+         viewElements[i]->Close();
+     }
+-    sdOsd.Flush();
++//    sdOsd.Flush();
+     sdOsd.DeleteOsd();
+ }
+ 
+diff -Naur skindesignerold/coreengine/viewdisplaychannel.c skindesigner/coreengine/viewdisplaychannel.c
+--- skindesignerold/coreengine/viewdisplaychannel.c	2018-03-03 09:03:00.000000000 +0100
++++ skindesigner/coreengine/viewdisplaychannel.c	2018-11-18 12:01:10.460722220 +0100
+@@ -396,7 +396,7 @@
+     if (groupChannelList)
+         groupChannelList->Close();
+ #endif
+-    sdOsd.Flush();
++//    sdOsd.Flush();
+     sdOsd.DeleteOsd();
+ }
+ 
+diff -Naur skindesignerold/coreengine/viewdisplaymenu.c skindesigner/coreengine/viewdisplaymenu.c
+--- skindesignerold/coreengine/viewdisplaymenu.c	2018-03-03 09:03:00.000000000 +0100
++++ skindesigner/coreengine/viewdisplaymenu.c	2018-11-18 12:00:20.301464616 +0100
+@@ -556,7 +556,7 @@
+     }
+     UnScaleTv();
+     ClearVariables();
+-    sdOsd.Flush();
++//    sdOsd.Flush();
+     sdOsd.DeleteOsd();
+ }
+ 

patches/vdr-plugin-skinnopacity-osd.diff.txt

@@ -0,0 +1,14 @@
+--- helpers.c.orig	2019-11-19 20:02:37.851039110 +0100
++++ helpers.c	2019-11-19 20:02:03.733164221 +0100
+@@ -5,9 +5,9 @@
+ #include <vdr/skins.h>
+ 
+ cOsd *CreateOsd(int Left, int Top, int Width, int Height) {
+-    cOsd *osd = cOsdProvider::NewOsd(Left, Top);
++    cOsd *osd = cOsdProvider::NewOsd(cOsd::OsdLeft() + Left,cOsd::OsdTop() + Top);
+     if (osd) {
+-        tArea Area = { 0, 0, Width, Height,  32 };
++        tArea Area = { 0, 0, Width - 1, Height - 1,  32 };
+         if (osd->SetAreas(&Area, 1) == oeOk) {
+             return osd;
+         }

po/de_DE.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR \n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-08-18 15:05+0200\n"
+"POT-Creation-Date: 2019-10-26 18:41+0200\n"
 "PO-Revision-Date: blabla\n"
 "Last-Translator: blabla\n"
 "Language-Team: blabla\n"
@@ -251,23 +251,31 @@ msgstr ""
 msgid "audio: %6dHz supports %d %d %d %d %d %d %d %d channels\n"
 msgstr ""
 
-msgid "codec: buggy libav, use ffmpeg\n"
-msgstr ""
-
 msgid "codec: can't allocate vodeo decoder\n"
 msgstr ""
 
 msgid "codec: missing close\n"
 msgstr ""
 
-#, c-format
-msgid "codec: codec ID %#06x not found\n"
+msgid " No decoder found"
 msgstr ""
 
 msgid "codec: can't allocate video codec context\n"
 msgstr ""
 
-msgid "codec: can't set options to video codec!\n"
+msgid "VAAPI Refcounts invalid\n"
+msgstr ""
+
+msgid "codec: can't set option deint to video codec!\n"
+msgstr ""
+
+msgid "codec: can't set option surfces to video codec!\n"
+msgstr ""
+
+msgid "codec: can't set option drop 2.field to video codec!\n"
+msgstr ""
+
+msgid "codec: can't set option drop 2.field  to video codec!\n"
 msgstr ""
 
 msgid "codec: can't open video codec!\n"
@@ -276,12 +284,19 @@ msgstr ""
 msgid "codec: can't allocate video decoder frame buffer\n"
 msgstr ""
 
+msgid "video: Init of YADIF Filter failed\n"
+msgstr ""
+
 msgid "codec: can't allocate audio decoder\n"
 msgstr ""
 
 msgid "codec: can't allocate audio decoder frame buffer\n"
 msgstr ""
 
+#, c-format
+msgid "codec: codec ID %#06x not found\n"
+msgstr ""
+
 msgid "codec: can't allocate audio codec context\n"
 msgstr ""
 
@@ -315,18 +330,6 @@ msgstr ""
 msgid "codec/audio: can't open resample\n"
 msgstr ""
 
-msgid "codec/audio: latm\n"
-msgstr ""
-
-msgid "codec/audio: bad audio frame\n"
-msgstr ""
-
-msgid "codec/audio: error more than one frame data\n"
-msgstr ""
-
-msgid "codec/audio: no frame\n"
-msgstr ""
-
 msgid "A software and GPU emulated UHD device"
 msgstr ""
 
@@ -360,6 +363,9 @@ msgstr "OSD Breite"
 msgid "Osd height"
 msgstr "OSD Höhe"
 
+msgid "GPU mem used for image caching (MB)"
+msgstr ""
+
 msgid "Suspend"
 msgstr "Unterbrechen"
 
@@ -384,8 +390,8 @@ msgstr "Video Hintergrundfrabe (RGB)"
 msgid "Video background color (Alpha)"
 msgstr "Video Hintergrundfarbe (Alpha)"
 
-msgid "Use studio levels (vdpau only)"
-msgstr "Benutze Studio Levels (nur vdpau)"
+msgid "Use studio levels"
+msgstr ""
 
 msgid "60hz display mode"
 msgstr "60Hz Anzeigemodus"
@@ -399,8 +405,11 @@ msgstr "Schwarz während Kanalwechsel"
 msgid "Clear decoder on channel switch"
 msgstr "Decoder bei Kanalwechsel leeren"
 
-msgid "Brightness (-1000..1000) (vdpau)"
-msgstr "Helligkeit (-1000..1000) (vdpau)"
+msgid "Scaler Test"
+msgstr ""
+
+msgid "Brightness (-100..100)"
+msgstr ""
 
 msgid "min"
 msgstr "min"
@@ -408,14 +417,26 @@ msgstr "min"
 msgid "max"
 msgstr "max"
 
-msgid "Contrast (0..10000) (vdpau)"
-msgstr "Kontrast (0..10000) (vdpau)"
+msgid "Contrast (0..100)"
+msgstr ""
 
-msgid "Saturation (0..10000) (vdpau)"
-msgstr "Sättigung (0..10000) (vdpau)"
+msgid "Saturation (0..100)"
+msgstr ""
 
-msgid "Hue (-3141..3141) (vdpau)"
-msgstr "Farbton (-3141..3141) (vdpau)"
+msgid "Gamma (0..100)"
+msgstr ""
+
+msgid "Hue (-314..314) "
+msgstr ""
+
+msgid "Monitor Colorspace"
+msgstr ""
+
+msgid "Color Blindness"
+msgstr ""
+
+msgid "Color Correction (-100..100) "
+msgstr ""
 
 msgid "Scaling"
 msgstr "Skalierung"
@@ -474,6 +495,15 @@ msgstr "Audio Driftkorrektur"
 msgid "Pass-through default"
 msgstr "Pass-Through-Standard"
 
+msgid "  PCM pass-through"
+msgstr ""
+
+msgid "  AC-3 pass-through"
+msgstr ""
+
+msgid "  E-AC-3 pass-through"
+msgstr ""
+
 msgid "Enable (E-)AC-3 (decoder) downmix"
 msgstr "Aktiviere (E-)AC-3 (decoder) downmix"
 
@@ -611,6 +641,10 @@ msgstr "PIP schließen"
 msgid " Frames missed(%d) duped(%d) dropped(%d) total(%d)"
 msgstr " Frames verloren(%d) verdoppelt(%d) übersprungen(%d) Gesamt(%d)"
 
+#, c-format
+msgid " Frame Process time %2.2fms"
+msgstr ""
+
 msgid "pass-through disabled"
 msgstr ""
 
@@ -690,10 +724,6 @@ msgstr ""
 msgid "[softhddev] out of memory\n"
 msgstr ""
 
-#, c-format
-msgid "video: packet buffer too small for %d\n"
-msgstr ""
-
 msgid "video: no empty slot in packet ringbuffer\n"
 msgstr ""
 
@@ -714,10 +744,6 @@ msgstr ""
 msgid "[softhddev] invalid video packet %d/%d bytes\n"
 msgstr ""
 
-#, c-format
-msgid "[softhddev] empty video packet %d bytes\n"
-msgstr ""
-
 #, c-format
 msgid "softhddev: %s called without hw decoder\n"
 msgstr ""
@@ -766,15 +792,18 @@ msgstr ""
 msgid "[softhddev] ready%s\n"
 msgstr ""
 
-msgid "video/glx: can't make glx context current\n"
+msgid "video: can't lock thread\n"
+msgstr ""
+
+msgid "video: can't unlock thread\n"
+msgstr ""
+
+msgid "video/egl: GlxSetupWindow can't make egl/glx context current\n"
 msgstr ""
 
 msgid "video/glx: no v-sync\n"
 msgstr ""
 
-msgid "glewinit failed\n"
-msgstr ""
-
 msgid "video/glx: no GLX support\n"
 msgstr ""
 
@@ -785,15 +814,6 @@ msgstr ""
 msgid "did not get FBconfig"
 msgstr ""
 
-msgid "video/glx: can't get a RGB visual\n"
-msgstr ""
-
-msgid "video/glx: no valid visual found\n"
-msgstr ""
-
-msgid "video/glx: need atleast 8-bits per RGB\n"
-msgstr ""
-
 msgid "video/glx: can't create glx context\n"
 msgstr ""
 
@@ -815,8 +835,7 @@ msgstr ""
 msgid "video/glx: SGI v-sync enabled\n"
 msgstr ""
 
-#, c-format
-msgid "checkCudaErrors() Driver API error = %04d"
+msgid "video/egl: can't create egl context\n"
 msgstr ""
 
 msgid "video/cuvid: surface needed not set\n"
@@ -826,69 +845,56 @@ msgstr ""
 msgid "video/cuvid: release surface %#08x, which is not in use\n"
 msgstr ""
 
+msgid "Wrong ES version \n"
+msgstr ""
+
+msgid " Could not bind API!\n"
+msgstr ""
+
+msgid "Can't get EGL Extentions\n"
+msgstr ""
+
+msgid "Could not initialize EGL.\n"
+msgstr ""
+
+msgid "Could not create EGL Context\n"
+msgstr ""
+
+msgid "Could not create EGL surface!\n"
+msgstr ""
+
+msgid "Could not make context current!\n"
+msgstr ""
+
 msgid "video/cuvid: out of decoders\n"
 msgstr ""
 
 msgid "video/cuvid: out of memory\n"
 msgstr ""
 
-msgid "video/cuvid: need 1 future, 1 current, 1 back and 1 work surface\n"
-msgstr ""
-
 msgid "video/cuvid: decoder not in decoder list.\n"
 msgstr ""
 
-msgid "video/glx: glx error\n"
+msgid "video/egl: egl init error\n"
 msgstr ""
 
 #, c-format
-msgid "video/cuvid: SDL error %d: %d\n"
+msgid "video/cuvid: SDL error %d\n"
 msgstr ""
 
-msgid "video/vdpau: no valid vdpau pixfmt found\n"
+msgid "Unable to create placebo textures"
 msgstr ""
 
-msgid "video/vdpau: no valid profile found\n"
+msgid "video: no valid pixfmt found\n"
 msgstr ""
 
-msgid "CUVID Init failed\n"
+msgid "video: no valid profile found\n"
 msgstr ""
 
-msgid "CUVID Not found\n"
+msgid "NO Format valid"
 msgstr ""
 
-#, c-format
-msgid "video/vdpau: can't get output surface parameters: %s\n"
-msgstr ""
-
-#, c-format
-msgid "video/vdpau: can't render output surface: %s\n"
-msgstr ""
-
-msgid "video/vdpau: video surface size mismatch\n"
-msgstr ""
-
-msgid "video/vdpau: out of memory\n"
-msgstr ""
-
-#, c-format
-msgid "video/vdpau: unsupported rgba format %d\n"
-msgstr ""
-
-#, c-format
-msgid "video/vdpau: can't get video surface bits native: %s\n"
-msgstr ""
-
-#, c-format
-msgid "video/vdpau: can't get video surface parameters: %s\n"
-msgstr ""
-
-#, c-format
-msgid "video/vdpau: unsupported chroma type %d\n"
-msgstr ""
-
-#, c-format
-msgid "video/vdpau: can't get video surface bits: %s\n"
+msgid "Failed rendering frame!\n"
 msgstr ""
 
 #, c-format
@@ -902,12 +908,7 @@ msgstr ""
 msgid "Kein Cuda device gefunden"
 msgstr ""
 
-#, c-format
-msgid "video/cuvid: can't block queue: %s\n"
-msgstr ""
-
-#, c-format
-msgid "video/cuvid: missed frame (%d/%d)\n"
+msgid "Failed to submit swapchain buffer\n"
 msgstr ""
 
 #, c-format
@@ -921,10 +922,25 @@ msgstr ""
 msgid "video/event: No symbol for %d\n"
 msgstr ""
 
-msgid "video: can't lock thread\n"
+msgid "Cant get memory for PLACEBO struct"
 msgstr ""
 
-msgid "video: can't unlock thread\n"
+msgid "Failed initializing libplacebo\n"
+msgstr ""
+
+msgid "Failed to create XCB Surface\n"
+msgstr ""
+
+msgid "Failed to create Vulkan Device"
+msgstr ""
+
+msgid "Failed creating vulkan swapchain!"
+msgstr ""
+
+msgid "Failed initializing libplacebo renderer\n"
+msgstr ""
+
+msgid "video/egl: can't create thread egl context\n"
 msgstr ""
 
 msgid "video: can't queue cancel video display thread\n"
@@ -944,11 +960,11 @@ msgid "softhddev: grab unsupported\n"
 msgstr ""
 
 #, c-format
-msgid "video: Can't connect to X11 server on '%s'\n"
+msgid "video: Can't initialize X11 thread support on '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "video: Can't initialize X11 thread support on '%s'\n"
+msgid "video: Can't connect to X11 server on '%s'\n"
 msgstr ""
 
 msgid "video: Can't convert XLIB display to XCB connection\n"
@@ -964,5 +980,20 @@ msgstr ""
 #~ msgid "A software and GPU emulated HD device"
 #~ msgstr "Ein Software und GPU emulieres HD-Gerät"
 
+#~ msgid "Use studio levels (vdpau only)"
+#~ msgstr "Benutze Studio Levels (nur vdpau)"
+
+#~ msgid "Brightness (-1000..1000) (vdpau)"
+#~ msgstr "Helligkeit (-1000..1000) (vdpau)"
+
+#~ msgid "Contrast (0..10000) (vdpau)"
+#~ msgstr "Kontrast (0..10000) (vdpau)"
+
+#~ msgid "Saturation (0..10000) (vdpau)"
+#~ msgstr "Sättigung (0..10000) (vdpau)"
+
+#~ msgid "Hue (-3141..3141) (vdpau)"
+#~ msgstr "Farbton (-3141..3141) (vdpau)"
+
 #~ msgid "SoftHdDevice"
 #~ msgstr "SoftHdDevice"

ringbuffer.c

@@ -1,29 +1,29 @@
 ///
-///	@file ringbuffer.c	@brief Ringbuffer module
+/// @file ringbuffer.c  @brief Ringbuffer module
 ///
-///	Copyright (c) 2009, 2011, 2014	by Johns.  All Rights Reserved.
+/// Copyright (c) 2009, 2011, 2014  by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: c9497b197ce7e7a6ba397944edc7ccb161152efd $
+/// $Id: c9497b197ce7e7a6ba397944edc7ccb161152efd $
 //////////////////////////////////////////////////////////////////////////////
 
 ///
-///	@defgroup Ringbuffer The ring buffer module.
+/// @defgroup Ringbuffer The ring buffer module.
 ///
-///	Lock free ring buffer with only one writer and one reader.
+/// Lock free ring buffer with only one writer and one reader.
 ///
 
 #include <stdio.h>
@@ -33,18 +33,18 @@
 #include "iatomic.h"
 #include "ringbuffer.h"
 
-    /// ring buffer structure
+/// ring buffer structure
 struct _ring_buffer_
 {
-    char *Buffer;			///< ring buffer data
-    const char *BufferEnd;		///< end of buffer
-    size_t Size;			///< bytes in buffer (for faster calc)
+    char *Buffer;                       ///< ring buffer data
+    const char *BufferEnd;              ///< end of buffer
+    size_t Size;                        ///< bytes in buffer (for faster calc)
 
-    const char *ReadPointer;		///< only used by reader
-    char *WritePointer;			///< only used by writer
+    const char *ReadPointer;            ///< only used by reader
+    char *WritePointer;                 ///< only used by writer
 
     /// The only thing modified by both
-    atomic_t Filled;			///< how many of the buffer is used
+    atomic_t Filled;                    ///< how many of the buffer is used
 };
 
 /**
@@ -71,12 +71,12 @@ RingBuffer *RingBufferNew(size_t size)
 {
     RingBuffer *rb;
 
-    if (!(rb = malloc(sizeof(*rb)))) {	// allocate structure
-	return rb;
+    if (!(rb = malloc(sizeof(*rb)))) {  // allocate structure
+        return rb;
     }
-    if (!(rb->Buffer = malloc(size))) {	// allocate buffer
-	free(rb);
-	return NULL;
+    if (!(rb->Buffer = malloc(size))) { // allocate buffer
+        free(rb);
+        return NULL;
     }
 
     rb->Size = size;
@@ -108,25 +108,25 @@ size_t RingBufferWriteAdvance(RingBuffer * rb, size_t cnt)
     size_t n;
 
     n = rb->Size - atomic_read(&rb->Filled);
-    if (cnt > n) {			// not enough space
-	cnt = n;
+    if (cnt > n) {                      // not enough space
+        cnt = n;
     }
     //
-    //	Hitting end of buffer?
+    //  Hitting end of buffer?
     //
     n = rb->BufferEnd - rb->WritePointer;
-    if (n > cnt) {			// don't cross the end
-	rb->WritePointer += cnt;
-    } else {				// reached or cross the end
-	rb->WritePointer = rb->Buffer;
-	if (n < cnt) {
-	    n = cnt - n;
-	    rb->WritePointer += n;
-	}
+    if (n > cnt) {                      // don't cross the end
+        rb->WritePointer += cnt;
+    } else {                            // reached or cross the end
+        rb->WritePointer = rb->Buffer;
+        if (n < cnt) {
+            n = cnt - n;
+            rb->WritePointer += n;
+        }
     }
 
     //
-    //	Only atomic modification!
+    //  Only atomic modification!
     //
     atomic_add(cnt, &rb->Filled);
     return cnt;
@@ -147,29 +147,29 @@ size_t RingBufferWrite(RingBuffer * rb, const void *buf, size_t cnt)
     size_t n;
 
     n = rb->Size - atomic_read(&rb->Filled);
-    if (cnt > n) {			// not enough space
-	cnt = n;
+    if (cnt > n) {                      // not enough space
+        cnt = n;
     }
     //
-    //	Hitting end of buffer?
+    //  Hitting end of buffer?
     //
     n = rb->BufferEnd - rb->WritePointer;
-    if (n > cnt) {			// don't cross the end
-	memcpy(rb->WritePointer, buf, cnt);
-	rb->WritePointer += cnt;
-    } else {				// reached or cross the end
-	memcpy(rb->WritePointer, buf, n);
-	rb->WritePointer = rb->Buffer;
-	if (n < cnt) {
-	    buf += n;
-	    n = cnt - n;
-	    memcpy(rb->WritePointer, buf, n);
-	    rb->WritePointer += n;
-	}
+    if (n > cnt) {                      // don't cross the end
+        memcpy(rb->WritePointer, buf, cnt);
+        rb->WritePointer += cnt;
+    } else {                            // reached or cross the end
+        memcpy(rb->WritePointer, buf, n);
+        rb->WritePointer = rb->Buffer;
+        if (n < cnt) {
+            buf += n;
+            n = cnt - n;
+            memcpy(rb->WritePointer, buf, n);
+            rb->WritePointer += n;
+        }
     }
 
     //
-    //	Only atomic modification!
+    //  Only atomic modification!
     //
     atomic_add(cnt, &rb->Filled);
     return cnt;
@@ -189,17 +189,17 @@ size_t RingBufferGetWritePointer(RingBuffer * rb, void **wp)
     size_t n;
     size_t cnt;
 
-    //	Total free bytes available in ring buffer
+    //  Total free bytes available in ring buffer
     cnt = rb->Size - atomic_read(&rb->Filled);
 
     *wp = rb->WritePointer;
 
     //
-    //	Hitting end of buffer?
+    //  Hitting end of buffer?
     //
     n = rb->BufferEnd - rb->WritePointer;
-    if (n <= cnt) {			// reached or cross the end
-	return n;
+    if (n <= cnt) {                     // reached or cross the end
+        return n;
     }
     return cnt;
 }
@@ -217,25 +217,25 @@ size_t RingBufferReadAdvance(RingBuffer * rb, size_t cnt)
     size_t n;
 
     n = atomic_read(&rb->Filled);
-    if (cnt > n) {			// not enough filled
-	cnt = n;
+    if (cnt > n) {                      // not enough filled
+        cnt = n;
     }
     //
-    //	Hitting end of buffer?
+    //  Hitting end of buffer?
     //
     n = rb->BufferEnd - rb->ReadPointer;
-    if (n > cnt) {			// don't cross the end
-	rb->ReadPointer += cnt;
-    } else {				// reached or cross the end
-	rb->ReadPointer = rb->Buffer;
-	if (n < cnt) {
-	    n = cnt - n;
-	    rb->ReadPointer += n;
-	}
+    if (n > cnt) {                      // don't cross the end
+        rb->ReadPointer += cnt;
+    } else {                            // reached or cross the end
+        rb->ReadPointer = rb->Buffer;
+        if (n < cnt) {
+            n = cnt - n;
+            rb->ReadPointer += n;
+        }
     }
 
     //
-    //	Only atomic modification!
+    //  Only atomic modification!
     //
     atomic_sub(cnt, &rb->Filled);
     return cnt;
@@ -255,29 +255,29 @@ size_t RingBufferRead(RingBuffer * rb, void *buf, size_t cnt)
     size_t n;
 
     n = atomic_read(&rb->Filled);
-    if (cnt > n) {			// not enough filled
-	cnt = n;
+    if (cnt > n) {                      // not enough filled
+        cnt = n;
     }
     //
-    //	Hitting end of buffer?
+    //  Hitting end of buffer?
     //
     n = rb->BufferEnd - rb->ReadPointer;
-    if (n > cnt) {			// don't cross the end
-	memcpy(buf, rb->ReadPointer, cnt);
-	rb->ReadPointer += cnt;
-    } else {				// reached or cross the end
-	memcpy(buf, rb->ReadPointer, n);
-	rb->ReadPointer = rb->Buffer;
-	if (n < cnt) {
-	    buf += n;
-	    n = cnt - n;
-	    memcpy(buf, rb->ReadPointer, n);
-	    rb->ReadPointer += n;
-	}
+    if (n > cnt) {                      // don't cross the end
+        memcpy(buf, rb->ReadPointer, cnt);
+        rb->ReadPointer += cnt;
+    } else {                            // reached or cross the end
+        memcpy(buf, rb->ReadPointer, n);
+        rb->ReadPointer = rb->Buffer;
+        if (n < cnt) {
+            buf += n;
+            n = cnt - n;
+            memcpy(buf, rb->ReadPointer, n);
+            rb->ReadPointer += n;
+        }
     }
 
     //
-    //	Only atomic modification!
+    //  Only atomic modification!
     //
     atomic_sub(cnt, &rb->Filled);
     return cnt;
@@ -297,17 +297,17 @@ size_t RingBufferGetReadPointer(RingBuffer * rb, const void **rp)
     size_t n;
     size_t cnt;
 
-    //	Total used bytes in ring buffer
+    //  Total used bytes in ring buffer
     cnt = atomic_read(&rb->Filled);
 
     *rp = rb->ReadPointer;
 
     //
-    //	Hitting end of buffer?
+    //  Hitting end of buffer?
     //
     n = rb->BufferEnd - rb->ReadPointer;
-    if (n <= cnt) {			// reached or cross the end
-	return n;
+    if (n <= cnt) {                     // reached or cross the end
+        return n;
     }
     return cnt;
 }

ringbuffer.h

@@ -1,62 +1,62 @@
 ///
-///	@file ringbuffer.h	@brief Ringbuffer module header file
+/// @file ringbuffer.h  @brief Ringbuffer module header file
 ///
-///	Copyright (c) 2009, 2011 by Johns.  All Rights Reserved.
+/// Copyright (c) 2009, 2011 by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: 8a2b4c171f1024afb8b8a7a7add631b7ebe2d45e $
+/// $Id: 8a2b4c171f1024afb8b8a7a7add631b7ebe2d45e $
 //////////////////////////////////////////////////////////////////////////////
 
 /// @addtogroup Ringbuffer
 /// @{
 
-    /// ring buffer typedef
+/// ring buffer typedef
 typedef struct _ring_buffer_ RingBuffer;
 
-    /// reset ring buffer pointers
+/// reset ring buffer pointers
 extern void RingBufferReset(RingBuffer *);
 
-    /// create new ring buffer
+/// create new ring buffer
 extern RingBuffer *RingBufferNew(size_t);
 
-    /// free ring buffer
+/// free ring buffer
 extern void RingBufferDel(RingBuffer *);
 
-    /// write into ring buffer
+/// write into ring buffer
 extern size_t RingBufferWrite(RingBuffer *, const void *, size_t);
 
-    /// get write pointer of ring buffer
+/// get write pointer of ring buffer
 extern size_t RingBufferGetWritePointer(RingBuffer *, void **);
 
-    /// advance write pointer of ring buffer
+/// advance write pointer of ring buffer
 extern size_t RingBufferWriteAdvance(RingBuffer *, size_t);
 
-    /// read from ring buffer
+/// read from ring buffer
 extern size_t RingBufferRead(RingBuffer *, void *, size_t);
 
-    /// get read pointer of ring buffer
+/// get read pointer of ring buffer
 extern size_t RingBufferGetReadPointer(RingBuffer *, const void **);
 
-    /// advance read pointer of ring buffer
+/// advance read pointer of ring buffer
 extern size_t RingBufferReadAdvance(RingBuffer *, size_t);
 
-    /// free bytes ring buffer
+/// free bytes ring buffer
 extern size_t RingBufferFreeBytes(RingBuffer *);
 
-    /// used bytes ring buffer
+/// used bytes ring buffer
 extern size_t RingBufferUsedBytes(RingBuffer *);
 
 /// @}

shaders.h

@@ -1,369 +1,465 @@
-
-// shader 
-
-char vertex[] = {"\
-#version 330\n\
-in vec2 vertex_position;\n\
-in vec2 vertex_texcoord0;\n\
-out vec2 texcoord0;\n\
-in vec2 vertex_texcoord1;\n\
-out vec2 texcoord1;\n\
-in vec2 vertex_texcoord2;\n\
-out vec2 texcoord2;\n\
-in vec2 vertex_texcoord3;\n\
-out vec2 texcoord3;\n\
-in vec2 vertex_texcoord4;\n\
-out vec2 texcoord4;\n\
-in vec2 vertex_texcoord5;\n\
-out vec2 texcoord5;\n\
-void main() {\n\
-gl_Position = vec4(vertex_position, 1.0, 1.0);\n\
-texcoord0 = vertex_texcoord0;\n\
-texcoord1 = vertex_texcoord1;\n\
-texcoord2 = vertex_texcoord2;\n\
-texcoord3 = vertex_texcoord3;\n\
-texcoord4 = vertex_texcoord4;\n\
-texcoord5 = vertex_texcoord5;\n\
-}\n"};
-
-
-char fragment[] = {"\
-#version 330\n\
-#define texture1D texture\n\
-#define texture3D texture\n\
-layout(location = 0) out vec4 out_color;\n\
-in vec2 texcoord0;\n\
-in vec2 texcoord1;\n\
-in vec2 texcoord2;\n\
-in vec2 texcoord3;\n\
-in vec2 texcoord4;\n\
-in vec2 texcoord5;\n\
-uniform mat3 colormatrix;\n\
-uniform vec3 colormatrix_c;\n\
-uniform sampler2D texture0;\n\
-//uniform vec2 texture_size0;\n\
-//uniform mat2 texture_rot0;\n\
-//uniform vec2 pixel_size0;\n\
-uniform sampler2D texture1;\n\
-//uniform vec2 texture_size1;\n\
-//uniform mat2 texture_rot1;\n\
-//uniform vec2 pixel_size1;\n\
-//#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n\
-void main() {\n\
-vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
-color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r;\n\
-color.gb = 1.000000 * vec4(texture(texture1, texcoord1)).rg;\n\
-// color conversion\n\
-color.rgb = mat3(colormatrix) * color.rgb  + colormatrix_c;\n\
-color.a = 1.0;\n\
-// color mapping\n\
-out_color = color;\n\
-}\n"};
-
-char fragment_bt2100[] = {"\
-#version 330\n\
-#define texture1D texture\n\
-#define texture3D texture\n\
-layout(location = 0) out vec4 out_color;\n\
-in vec2 texcoord0;\n\
-in vec2 texcoord1;\n\
-in vec2 texcoord2;\n\
-in vec2 texcoord3;\n\
-in vec2 texcoord4;\n\
-in vec2 texcoord5;\n\
-uniform mat3 colormatrix;\n\
-uniform vec3 colormatrix_c;\n\
-uniform mat3 cms_matrix;\n\
-uniform sampler2D texture0;\n\
-//uniform vec2 texture_size0;\n\
-//uniform mat2 texture_rot0;\n\
-//uniform vec2 pixel_size0;\n\
-uniform sampler2D texture1;\n\
-//uniform vec2 texture_size1;\n\
-//uniform mat2 texture_rot1;\n\
-//uniform vec2 pixel_size1;\n\
-//#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n\
-void main() {\n\
-vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
-color.r = 1.003906 * vec4(texture(texture0, texcoord0)).r;\n\
-color.gb = 1.003906 * vec4(texture(texture1, texcoord1)).rg;\n\
-// color conversion\n\
-color.rgb = mat3(colormatrix) * color.rgb  + colormatrix_c;\n\
-color.a = 1.0;\n\
-// color mapping\n\
-color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
-color.rgb = pow(color.rgb, vec3(2.4));\n\
-color.rgb = cms_matrix * color.rgb;\n\
-color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
-color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\
-out_color = color;\n\
-}\n"};
-
-/* Color conversion matrix: RGB = m * YUV + c
- * m is in row-major matrix, with m[row][col], e.g.:
- *     [ a11 a12 a13 ]     float m[3][3] = { { a11, a12, a13 },
- *     [ a21 a22 a23 ]                       { a21, a22, a23 },
- *     [ a31 a32 a33 ]                       { a31, a32, a33 } };
- * This is accessed as e.g.: m[2-1][1-1] = a21
- * In particular, each row contains all the coefficients for one of R, G, B,
- * while each column contains all the coefficients for one of Y, U, V:
- *     m[r,g,b][y,u,v] = ...
- * The matrix could also be viewed as group of 3 vectors, e.g. the 1st column
- * is the Y vector (1, 1, 1), the 2nd is the U vector, the 3rd the V vector.
- * The matrix might also be used for other conversions and colorspaces.
- */
-struct mp_cmat {
-    float m[3][3]; // colormatrix
-    float c[3];    //colormatrix_c
-};
-
-struct mp_mat {
-	float m[3][3];
-};
-
-// YUV input limited range (16-235 for luma, 16-240 for chroma)
-// ITU-R BT.601 (SD)
-struct mp_cmat yuv_bt601 = {\
-{{ 1.164384, 1.164384,  1.164384 },\
-{ 0.00000,  -0.391762,  2.017232 },\
-{ 1.596027, -0.812968 , 0.000000 }},\
-{-0.874202,  0.531668, -1.085631 } };
-
-// ITU-R BT.709 (HD)
-struct mp_cmat yuv_bt709 = {\
-{{ 1.164384, 1.164384,  1.164384 },\
-{ 0.00000,  -0.213249,  2.112402 },\
-{ 1.792741, -0.532909 , 0.000000 }},\
-{-0.972945,  0.301483, -1.133402 } };
-
-// ITU-R BT.2020 non-constant luminance system
-struct mp_cmat yuv_bt2020ncl = {\
-{{ 1.164384, 1.164384,  1.164384 },\
-{ 0.00000,  -0.187326,  2.141772 },\
-{ 1.678674, -0.650424 , 0.000000 }},\
-{-0.915688,  0.347459, -1.148145 } };
-
-// ITU-R BT.2020 constant luminance system
-struct mp_cmat yuv_bt2020cl = {\
-{{ 0.0000,   1.164384,  0.000000 },\
-{ 0.00000,   0.000000,  1.138393 },\
-{ 1.138393,  0.000000 , 0.000000 }},\
-{-0.571429, -0.073059, -0.571429 } };
-
-float cms_matrix[3][3] = \
-{{ 1.660497, -0.124547, -0.018154},\
-{-0.587657,  1.132895, -0.100597},\
-{-0.072840, -0.008348,  1.118751}};
-
-struct gl_vao_entry {
-    // used for shader / glBindAttribLocation
-    const char *name;
-    // glVertexAttribPointer() arguments
-    int num_elems;      // size (number of elements)
-    GLenum type;
-    bool normalized;
-    int offset;
-};
-
-struct vertex_pt {
-    float x, y;
-};
-
-struct vertex_pi {
-    GLint x, y;
-};
-
-#define TEXUNIT_VIDEO_NUM 6
-
-
-struct vertex {
-    struct vertex_pt position;
-    struct vertex_pt texcoord[TEXUNIT_VIDEO_NUM];
-};
-
-static const struct gl_vao_entry vertex_vao[] = {
-    {"position", 2, GL_FLOAT, false, offsetof(struct vertex, position)},
-    {"texcoord0", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[0])},
-    {"texcoord1", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[1])},
-    {"texcoord2", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[2])},
-    {"texcoord3", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[3])},
-    {"texcoord4", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[4])},
-    {"texcoord5", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[5])},
-    {0}
-};
-
-
-static void compile_attach_shader(GLuint program, 
-                                  GLenum type, const char *source) 
-{ 
-    GLuint shader;
-	GLint status, log_length;
-	
-    shader = glCreateShader(type); 
-    glShaderSource(shader, 1, &source, NULL); 
-    glCompileShader(shader); 
-    status = 0; 
-    glGetShaderiv(shader, GL_COMPILE_STATUS, &status); 
-    log_length = 0; 
-    glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length); 
-Debug(3,"compile Status %d loglen %d\n",status,log_length); 
-
-    GlxCheck();
-    glAttachShader(program, shader);
-    glDeleteShader(shader);
-}
-
-static void link_shader(GLuint program)
-{
-	GLint status,log_length;
-	
-    glLinkProgram(program);
-    status = 0;
-    glGetProgramiv(program, GL_LINK_STATUS, &status);
-    log_length = 0;
-    glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length);
-Debug(3,"Link Status %d loglen %d\n",status,log_length); 
-
-
-}
-
-static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace) {
-    
-    char vname[80];
-    int n;
-	GLint cmsLoc;
-	float *m,*c,*cms;
-	char *frag;
-	
-	switch (colorspace) {
-	case AVCOL_SPC_RGB:
-		m = &yuv_bt601.m[0][0];
-		c = &yuv_bt601.c[0];
-		frag = fragment;
-		Debug(3,"BT601 Colorspace used\n");
-		break;
-	case AVCOL_SPC_BT709:
-	case AVCOL_SPC_UNSPECIFIED:   //  comes with UHD
-		m = &yuv_bt709.m[0][0];
-		c = &yuv_bt709.c[0];
-		frag = fragment;
-		Debug(3,"BT709 Colorspace used\n");
-		break;
-	case AVCOL_SPC_BT2020_NCL:
-		m = &yuv_bt2020ncl.m[0][0];
-		c = &yuv_bt2020ncl.c[0];
-		cms = &cms_matrix[0][0];
-		frag = fragment_bt2100;
-		Debug(3,"BT2020NCL Colorspace used\n");
-		break;
-	default:								// fallback
-		m = &yuv_bt709.m[0][0];
-		c = &yuv_bt709.c[0];
-		frag = fragment;
-		Debug(3,"default BT709 Colorspace used  %d\n",colorspace);
-		break;
-	}
-	
-	Debug(3,"vor create\n");
-	gl_prog = glCreateProgram();
-	Debug(3,"vor compile vertex\n");
-	compile_attach_shader(gl_prog, GL_VERTEX_SHADER, vertex);
-	Debug(3,"vor compile fragment\n");
-	compile_attach_shader(gl_prog, GL_FRAGMENT_SHADER, frag);
-	glBindAttribLocation(gl_prog,0,"vertex_position");
-
-	for (n=0;n<6;n++) {
-		sprintf(vname,"vertex_texcoord%1d",n);
-		glBindAttribLocation(gl_prog,n+1,vname);
-	}
-		
-	link_shader(gl_prog);
-	
-	gl_colormatrix = glGetUniformLocation(gl_prog,"colormatrix");
-	Debug(3,"get uniform colormatrix %d \n",gl_colormatrix);
-	if (gl_colormatrix != -1)
-		glProgramUniformMatrix3fv(gl_prog,gl_colormatrix,1,0,m);
-	GlxCheck();
-	  //glProgramUniform3fv(gl_prog,gl_colormatrix,3,&yuv_bt709.m[0][0]);
-	gl_colormatrix_c = glGetUniformLocation(gl_prog,"colormatrix_c");
-	Debug(3,"get uniform colormatrix_c %d %f\n",gl_colormatrix_c,*c);
-	if (gl_colormatrix_c != -1)
-	  glProgramUniform3fv(gl_prog,gl_colormatrix_c,1,c);
-	GlxCheck();
-	
-	if (colorspace == AVCOL_SPC_BT2020_NCL) {
-		cmsLoc = glGetUniformLocation(gl_prog,"cms_matrix");
-		if (cmsLoc != -1)
-		  glProgramUniformMatrix3fv(gl_prog,cmsLoc,1,0,cms);
-		GlxCheck();
-	}
-	
-    return gl_prog; 
-}
-
-static void render_pass_quad(int flip, float xcrop, float ycrop)
-{
-    struct vertex va[4];
-    int n;
-    const struct gl_vao_entry *e;
-	// uhhhh what a hack
-	if (!flip ) {
-		va[0].position.x = (float) -1.0;
-		va[0].position.y = (float)  1.0;
-		va[1].position.x = (float) -1.0;
-		va[1].position.y = (float) -1.0;
-		va[2].position.x = (float)  1.0;
-		va[2].position.y = (float)  1.0;
-		va[3].position.x = (float)  1.0;
-		va[3].position.y = (float) -1.0;
-	} else {
-		va[0].position.x = (float) -1.0;
-		va[0].position.y = (float) -1.0;
-		va[1].position.x = (float) -1.0;
-		va[1].position.y = (float)  1.0;
-		va[2].position.x = (float)  1.0;
-		va[2].position.y = (float) -1.0;
-		va[3].position.x = (float)  1.0;
-		va[3].position.y = (float)  1.0;
-	}
-
-    va[0].texcoord[0].x = (float) 0.0 + xcrop;
-    va[0].texcoord[0].y = (float) 0.0 + ycrop;  // abgeschnitten von links oben
-    va[0].texcoord[1].x = (float) 0.0 + xcrop;
-    va[0].texcoord[1].y = (float) 0.0 + ycrop;  // abgeschnitten von links oben
-    va[1].texcoord[0].x = (float) 0.0 + xcrop;
-    va[1].texcoord[0].y = (float) 1.0 - ycrop;  // abgeschnitten links unten 1.0 - Wert
-    va[1].texcoord[1].x = (float) 0.0 + xcrop;
-    va[1].texcoord[1].y = (float) 1.0 - ycrop;  // abgeschnitten links unten 1.0 - Wert
-    va[2].texcoord[0].x = (float) 1.0 - xcrop;
-    va[2].texcoord[0].y = (float) 0.0 + ycrop;  // abgeschnitten von rechts oben
-    va[2].texcoord[1].x = (float) 1.0 - xcrop;
-    va[2].texcoord[1].y = (float) 0.0 + ycrop;  // abgeschnitten von rechts oben
-    va[3].texcoord[0].x = (float) 1.0 - xcrop;
-    va[3].texcoord[0].y = (float) 1.0 - ycrop;  // abgeschnitten von rechts unten 1.0 - wert
-    va[3].texcoord[1].x = (float) 1.0 - xcrop;
-    va[3].texcoord[1].y = (float) 1.0 - ycrop;  // abgeschnitten von rechts unten 1.0 - wert
-
-	
-	
-    glBindBuffer(GL_ARRAY_BUFFER, vao_buffer);
-    glBufferData(GL_ARRAY_BUFFER, 4  * sizeof(struct vertex), va, GL_DYNAMIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-	
-	 // enable attribs
-    glBindBuffer(GL_ARRAY_BUFFER, vao_buffer);
-	for ( n = 0; vertex_vao[n].name; n++) { 
-        e = &vertex_vao[n];
-        glEnableVertexAttribArray(n);
-        glVertexAttribPointer(n, e->num_elems, e->type, e->normalized,
-                                sizeof(struct vertex), (void *)(intptr_t)e->offset);
-    }
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-	
-	// draw quad
-   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-    for ( n = 0; vertex_vao[n].name; n++) 
-      glDisableVertexAttribArray(n); 
-}
-
-
+// shader
+
+#ifdef CUVID
+const char *gl_version = "#version 330";
+#else
+#ifdef RASPI
+const char *gl_version = "#version 300 es";
+#else
+const char *gl_version = "#version 300 es ";
+#endif
+#endif
+
+char vertex_3[] = {"\
+%s\n\
+in vec2 vertex_position;\n\
+in vec2 vertex_texcoord0;\n\
+out vec2 texcoord0;\n\
+in vec2 vertex_texcoord1;\n\
+out vec2 texcoord1;\n\
+in vec2 vertex_texcoord2;\n\
+out vec2 texcoord2;\n\
+void main() {\n\
+gl_Position = vec4(vertex_position, 1.0, 1.0);\n\
+texcoord0 = vertex_texcoord0;\n\
+texcoord1 = vertex_texcoord1;\n\
+texcoord2 = vertex_texcoord1;\n\
+}\n"};
+
+char fragment_3[] = {"\
+%s\n\
+#define texture1D texture\n\
+#define texture3D texture\n\
+precision mediump float; \
+layout(location = 0) out vec4 out_color;\n\
+in vec2 texcoord0;\n\
+in vec2 texcoord1;\n\
+in vec2 texcoord2;\n\
+uniform mat3 colormatrix;\n\
+uniform vec3 colormatrix_c;\n\
+uniform sampler2D texture0;\n\
+uniform sampler2D texture1;\n\
+uniform sampler2D texture2;\n\
+//#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n\
+void main() {\n\
+vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
+color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r;\n\
+color.g = 1.000000 * vec4(texture(texture1, texcoord1)).r;\n\
+color.b = 1.000000 * vec4(texture(texture2, texcoord2)).r;\n\
+// color conversion\n\
+color.rgb = mat3(colormatrix) * color.rgb  + colormatrix_c;\n\
+color.a = 1.0;\n\
+// color mapping\n\
+out_color = color;\n\
+}\n"};
+
+char fragment_bt2100_3[] = {"\
+%s\n \
+#define texture1D texture\n\
+#define texture3D texture\n\
+precision mediump float; \
+layout(location = 0) out vec4 out_color;\n\
+in vec2 texcoord0;\n\
+in vec2 texcoord1;\n\
+in vec2 texcoord2;\n\
+uniform mat3 colormatrix;\n\
+uniform vec3 colormatrix_c;\n\
+uniform mat3 cms_matrix;\n\
+uniform sampler2D texture0;\n\
+uniform sampler2D texture1;\n\
+uniform sampler2D texture2;\n\
+//#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n\
+void main() {\n\
+vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
+color.r = 1.003906 * vec4(texture(texture0, texcoord0)).r;\n\
+color.g = 1.003906 * vec4(texture(texture1, texcoord1)).r;\n\
+color.b = 1.003906 * vec4(texture(texture2, texcoord2)).r;\n\
+// color conversion\n\
+color.rgb = mat3(colormatrix) * color.rgb  + colormatrix_c;\n\
+color.a = 1.0;\n\
+// color mapping\n\
+color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
+color.rgb = pow(color.rgb, vec3(2.4));\n\
+color.rgb = cms_matrix * color.rgb;\n\
+color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
+color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\
+out_color = color;\n\
+}\n"};
+
+
+char vertex_osd[] = { "\
+%s\n\
+in vec2 vertex_position;\n\
+in vec2 vertex_texcoord0;\n\
+out vec2 texcoord0;\n\
+void main() {\n\
+gl_Position = vec4(vertex_position, 1.0, 1.0);\n\
+texcoord0 = vertex_texcoord0;\n\
+}\n" };
+
+char fragment_osd[] = { "\
+%s\n\
+#define texture1D texture\n\
+precision mediump float; \
+layout(location = 0) out vec4 out_color;\n\
+in vec2 texcoord0;\n\
+uniform sampler2D texture0;\n\
+void main() {\n\
+vec4 color; \n\
+color = vec4(texture(texture0, texcoord0));\n\
+out_color = color;\n\
+}\n" };
+
+char vertex[] = { "\
+%s\n\
+in vec2 vertex_position;\n\
+in vec2 vertex_texcoord0;\n\
+out vec2 texcoord0;\n\
+in vec2 vertex_texcoord1;\n\
+out vec2 texcoord1;\n\
+void main() {\n\
+gl_Position = vec4(vertex_position, 1.0, 1.0);\n\
+texcoord0 = vertex_texcoord0;\n\
+texcoord1 = vertex_texcoord1;\n\
+}\n" };
+
+char fragment[] = { "\
+%s\n\
+#define texture1D texture\n\
+#define texture3D texture\n\
+precision mediump float; \
+layout(location = 0) out vec4 out_color;\n\
+in vec2 texcoord0;\n\
+in vec2 texcoord1;\n\
+uniform mat3 colormatrix;\n\
+uniform vec3 colormatrix_c;\n\
+uniform sampler2D texture0;\n\
+uniform sampler2D texture1;\n\
+//#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n\
+void main() {\n\
+vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
+color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r;\n\
+color.gb = 1.000000 * vec4(texture(texture1, texcoord1)).rg;\n\
+// color conversion\n\
+color.rgb = mat3(colormatrix) * color.rgb  + colormatrix_c;\n\
+color.a = 1.0;\n\
+// color mapping\n\
+out_color = color;\n\
+}\n" };
+
+char fragment_bt2100[] = { "\
+%s\n \
+#define texture1D texture\n\
+#define texture3D texture\n\
+precision mediump float; \
+layout(location = 0) out vec4 out_color;\n\
+in vec2 texcoord0;\n\
+in vec2 texcoord1;\n\
+uniform mat3 colormatrix;\n\
+uniform vec3 colormatrix_c;\n\
+uniform mat3 cms_matrix;\n\
+uniform sampler2D texture0;\n\
+uniform sampler2D texture1;\n\
+//#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n\
+void main() {\n\
+vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
+color.r = 1.003906 * vec4(texture(texture0, texcoord0)).r;\n\
+color.gb = 1.003906 * vec4(texture(texture1, texcoord1)).rg;\n\
+// color conversion\n\
+color.rgb = mat3(colormatrix) * color.rgb  + colormatrix_c;\n\
+color.a = 1.0;\n\
+// color mapping\n\
+color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
+color.rgb = pow(color.rgb, vec3(2.4));\n\
+color.rgb = cms_matrix * color.rgb;\n\
+color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
+color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\
+out_color = color;\n\
+}\n" };
+
+
+/* Color conversion matrix: RGB = m * YUV + c
+ * m is in row-major matrix, with m[row][col], e.g.:
+ *     [ a11 a12 a13 ]     float m[3][3] = { { a11, a12, a13 },
+ *     [ a21 a22 a23 ]                       { a21, a22, a23 },
+ *     [ a31 a32 a33 ]                       { a31, a32, a33 } };
+ * This is accessed as e.g.: m[2-1][1-1] = a21
+ * In particular, each row contains all the coefficients for one of R, G, B,
+ * while each column contains all the coefficients for one of Y, U, V:
+ *     m[r,g,b][y,u,v] = ...
+ * The matrix could also be viewed as group of 3 vectors, e.g. the 1st column
+ * is the Y vector (1, 1, 1), the 2nd is the U vector, the 3rd the V vector.
+ * The matrix might also be used for other conversions and colorspaces.
+ */
+struct mp_cmat
+{
+    GLfloat m[3][3];                    // colormatrix
+    GLfloat c[3];                       //colormatrix_c
+};
+
+struct mp_mat
+{
+    GLfloat m[3][3];
+};
+
+// YUV input limited range (16-235 for luma, 16-240 for chroma)
+// ITU-R BT.601 (SD)
+struct mp_cmat yuv_bt601 = { {{1.164384, 1.164384, 1.164384},
+    {0.00000, -0.391762, 2.017232},
+    {1.596027, -0.812968, 0.000000}},
+{-0.874202, 0.531668, -1.085631}
+};
+
+// ITU-R BT.709 (HD)
+struct mp_cmat yuv_bt709 = { {{1.164384, 1.164384, 1.164384},
+    {0.00000, -0.213249, 2.112402},
+    {1.792741, -0.532909, 0.000000}},
+{-0.972945, 0.301483, -1.133402}
+};
+
+// ITU-R BT.2020 non-constant luminance system
+struct mp_cmat yuv_bt2020ncl = { {{1.164384, 1.164384, 1.164384},
+    {0.00000, -0.187326, 2.141772},
+    {1.678674, -0.650424, 0.000000}},
+{-0.915688, 0.347459, -1.148145}
+};
+
+// ITU-R BT.2020 constant luminance system
+struct mp_cmat yuv_bt2020cl = { {{0.0000, 1.164384, 0.000000},
+    {0.00000, 0.000000, 1.138393},
+    {1.138393, 0.000000, 0.000000}},
+{-0.571429, -0.073059, -0.571429}
+};
+
+float cms_matrix[3][3] = { {1.660497, -0.124547, -0.018154},
+{-0.587657, 1.132895, -0.100597},
+{-0.072840, -0.008348, 1.118751}
+};
+
+struct gl_vao_entry
+{
+    // used for shader / glBindAttribLocation
+    const char *name;
+    // glVertexAttribPointer() arguments
+    int num_elems;                      // size (number of elements)
+    GLenum type;
+    bool normalized;
+    int offset;
+};
+
+struct vertex_pt
+{
+    float x, y;
+};
+
+struct vertex_pi
+{
+    GLint x, y;
+};
+
+#define TEXUNIT_VIDEO_NUM 6
+
+struct vertex
+{
+    struct vertex_pt position;
+    struct vertex_pt texcoord[TEXUNIT_VIDEO_NUM];
+};
+
+static const struct gl_vao_entry vertex_vao[] = {
+    {"position", 2, GL_FLOAT, false, offsetof(struct vertex, position)},
+    {"texcoord0", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[0])},
+    {"texcoord1", 2, GL_FLOAT, false, offsetof(struct vertex, texcoord[1])},
+    {0}
+};
+
+static void compile_attach_shader(GLuint program, GLenum type, const char *source)
+{
+    GLuint shader;
+    GLint status, log_length;
+    char log[4000];
+    GLsizei len;
+	char *buffer = (char *) malloc(1000);
+	sprintf(buffer,source,gl_version);
+    shader = glCreateShader(type);
+    glShaderSource(shader, 1, (const GLchar **)&buffer, NULL);
+    glCompileShader(shader);
+    status = 0;
+    glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
+    log_length = 0;
+    glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length);
+    glGetShaderInfoLog(shader, 4000, &len, log);
+    GlxCheck();
+    Debug(3, "compile Status %d loglen %d >%s<\n", status, log_length, log);
+
+    glAttachShader(program, shader);
+    glDeleteShader(shader);
+	free(buffer);
+}
+
+static void link_shader(GLuint program)
+{
+    GLint status, log_length;
+
+    glLinkProgram(program);
+    status = 0;
+    glGetProgramiv(program, GL_LINK_STATUS, &status);
+    log_length = 0;
+    glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length);
+    Debug(3, "Link Status %d loglen %d\n", status, log_length);
+}
+
+static GLuint sc_generate_osd(GLuint gl_prog)
+{
+
+    Debug(3, "vor create osd\n");
+    gl_prog = glCreateProgram();
+    Debug(3, "vor compile vertex osd\n");
+    compile_attach_shader(gl_prog, GL_VERTEX_SHADER, vertex_osd);
+    Debug(3, "vor compile fragment osd \n");
+    compile_attach_shader(gl_prog, GL_FRAGMENT_SHADER, fragment_osd);
+    glBindAttribLocation(gl_prog, 0, "vertex_position");
+    glBindAttribLocation(gl_prog, 1, "vertex_texcoord0");
+
+    link_shader(gl_prog);
+    return gl_prog;
+}
+
+static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
+{
+
+    char vname[80];
+    int n;
+    GLint cmsLoc;
+    float *m, *c, *cms;
+    char *frag;
+
+    switch (colorspace) {
+        case AVCOL_SPC_RGB:
+            m = &yuv_bt601.m[0][0];
+            c = &yuv_bt601.c[0];
+            frag = Planes == 3?fragment_3:fragment;
+            Debug(3, "BT601 Colorspace used\n");
+            break;
+        case AVCOL_SPC_BT709:
+        case AVCOL_SPC_UNSPECIFIED:    //  comes with UHD
+            m = &yuv_bt709.m[0][0];
+            c = &yuv_bt709.c[0];
+            frag = Planes==3?fragment_3:fragment;
+            Debug(3, "BT709 Colorspace used\n");
+            break;
+        case AVCOL_SPC_BT2020_NCL:
+            m = &yuv_bt2020ncl.m[0][0];
+            c = &yuv_bt2020ncl.c[0];
+            cms = &cms_matrix[0][0];
+            frag = Planes == 3?fragment_bt2100_3:fragment_bt2100;
+            Debug(3, "BT2020NCL Colorspace used\n");
+            break;
+        default:                       // fallback
+            m = &yuv_bt709.m[0][0];
+            c = &yuv_bt709.c[0];
+            frag = Planes==3?fragment_3:fragment;
+            Debug(3, "default BT709 Colorspace used  %d\n", colorspace);
+            break;
+    }
+
+    Debug(3, "vor create\n");
+    gl_prog = glCreateProgram();
+    Debug(3, "vor compile vertex\n");
+    compile_attach_shader(gl_prog, GL_VERTEX_SHADER, Planes==3?vertex_3:vertex);
+    Debug(3, "vor compile fragment\n");
+    compile_attach_shader(gl_prog, GL_FRAGMENT_SHADER, frag);
+    glBindAttribLocation(gl_prog, 0, "vertex_position");
+
+    for (n = 0; n < 6; n++) {
+        sprintf(vname, "vertex_texcoord%1d", n);
+        glBindAttribLocation(gl_prog, n + 1, vname);
+    }
+
+    link_shader(gl_prog);
+
+    gl_colormatrix = glGetUniformLocation(gl_prog, "colormatrix");
+    Debug(3, "get uniform colormatrix %d \n", gl_colormatrix);
+    if (gl_colormatrix != -1)
+        glProgramUniformMatrix3fv(gl_prog, gl_colormatrix, 1, 0, m);
+    GlxCheck();
+    Debug(3, "nach set colormatrix\n");
+
+    gl_colormatrix_c = glGetUniformLocation(gl_prog, "colormatrix_c");
+    Debug(3, "get uniform colormatrix_c %d %f\n", gl_colormatrix_c, *c);
+    if (gl_colormatrix_c != -1)
+        glProgramUniform3fv(gl_prog, gl_colormatrix_c, 1, c);
+    GlxCheck();
+
+    if (colorspace == AVCOL_SPC_BT2020_NCL) {
+        cmsLoc = glGetUniformLocation(gl_prog, "cms_matrix");
+        if (cmsLoc != -1)
+            glProgramUniformMatrix3fv(gl_prog, cmsLoc, 1, 0, cms);
+        GlxCheck();
+    }
+
+    return gl_prog;
+}
+
+static void render_pass_quad(int flip, float xcrop, float ycrop)
+{
+    struct vertex va[4];
+    int n;
+    const struct gl_vao_entry *e;
+
+    // uhhhh what a hack
+    if (!flip) {
+        va[0].position.x = (float)-1.0;
+        va[0].position.y = (float)1.0;
+        va[1].position.x = (float)-1.0;
+        va[1].position.y = (float)-1.0;
+        va[2].position.x = (float)1.0;
+        va[2].position.y = (float)1.0;
+        va[3].position.x = (float)1.0;
+        va[3].position.y = (float)-1.0;
+    } else {
+        va[0].position.x = (float)-1.0;
+        va[0].position.y = (float)-1.0;
+        va[1].position.x = (float)-1.0;
+        va[1].position.y = (float)1.0;
+        va[2].position.x = (float)1.0;
+        va[2].position.y = (float)-1.0;
+        va[3].position.x = (float)1.0;
+        va[3].position.y = (float)1.0;
+    }
+
+    va[0].texcoord[0].x = (float)0.0 + xcrop;
+    va[0].texcoord[0].y = (float)0.0 + ycrop;   // abgeschnitten von links oben
+    va[0].texcoord[1].x = (float)0.0 + xcrop;
+    va[0].texcoord[1].y = (float)0.0 + ycrop;   // abgeschnitten von links oben
+    va[1].texcoord[0].x = (float)0.0 + xcrop;
+    va[1].texcoord[0].y = (float)1.0 - ycrop;   // abgeschnitten links unten 1.0 - Wert
+    va[1].texcoord[1].x = (float)0.0 + xcrop;
+    va[1].texcoord[1].y = (float)1.0 - ycrop;   // abgeschnitten links unten 1.0 - Wert
+    va[2].texcoord[0].x = (float)1.0 - xcrop;
+    va[2].texcoord[0].y = (float)0.0 + ycrop;   // abgeschnitten von rechts oben
+    va[2].texcoord[1].x = (float)1.0 - xcrop;
+    va[2].texcoord[1].y = (float)0.0 + ycrop;   // abgeschnitten von rechts oben
+    va[3].texcoord[0].x = (float)1.0 - xcrop;
+    va[3].texcoord[0].y = (float)1.0 - ycrop;   // abgeschnitten von rechts unten 1.0 - wert
+    va[3].texcoord[1].x = (float)1.0 - xcrop;
+    va[3].texcoord[1].y = (float)1.0 - ycrop;   // abgeschnitten von rechts unten 1.0 - wert
+
+    glBindBuffer(GL_ARRAY_BUFFER, vao_buffer);
+    glBufferData(GL_ARRAY_BUFFER, 4 * sizeof(struct vertex), va, GL_DYNAMIC_DRAW);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+    // enable attribs
+    glBindBuffer(GL_ARRAY_BUFFER, vao_buffer);
+    for (n = 0; vertex_vao[n].name; n++) {
+        e = &vertex_vao[n];
+        glEnableVertexAttribArray(n);
+        glVertexAttribPointer(n, e->num_elems, e->type, e->normalized, sizeof(struct vertex),
+            (void *)(intptr_t) e->offset);
+    }
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+    // draw quad
+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    for (n = 0; vertex_vao[n].name; n++)
+        glDisableVertexAttribArray(n);
+}

shaders.txt

@@ -1,92 +0,0 @@
-Pro 7 1080i
-
-[vo/opengl] [  1] color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r;
-[vo/opengl] [  2] color.gb = 1.000000 * vec4(texture(texture1, texcoord1)).rg;
-[vo/opengl] [  3] // color conversion
-[vo/opengl] [  4] color.rgb = mat3(colormatrix) * color.rgb + colormatrix_c;
-[vo/opengl] [  5] color.a = 1.0;
-[vo/opengl] [  6] // color mapping
-
-UHD 10 Bit
-[vo/opengl] [  1] color.r = 1.003906 * vec4(texture(texture0, texcoord0)).r;
-[vo/opengl] [  2] color.gb = 1.003906 * vec4(texture(texture1, texcoord1)).rg;
-[vo/opengl] [  3] // color conversion
-[vo/opengl] [  4] color.rgb = mat3(colormatrix) * color.rgb + colormatrix_c;
-[vo/opengl] [  5] color.a = 1.0;
-[vo/opengl] [  6] // color mapping
-
-
-HEVC 8 Bit
-[vo/opengl] [  1] color.r = 1.003906 * vec4(texture(texture0, texcoord0)).r;
-[vo/opengl] [  2] color.gb = 1.003906 * vec4(texture(texture1, texcoord1)).rg;
-[vo/opengl] [  3] // color conversion
-[vo/opengl] [  4] color.rgb = mat3(colormatrix) * color.rgb + colormatrix_c;
-[vo/opengl] [  5] color.a = 1.0;
-[vo/opengl] [  6] // color mapping
-
-ZDF 720p
-[vo/opengl] [  1] color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r;
-[vo/opengl] [  2] color.gb = 1.000000 * vec4(texture(texture1, texcoord1)).rg;
-[vo/opengl] [  3] // color conversion
-[vo/opengl] [  4] color.rgb = mat3(colormatrix) * color.rgb + colormatrix_c;
-[vo/opengl] [  5] color.a = 1.0;
-[vo/opengl] [  6] // color mapping
-
-VERTEX
-#version 330
-in vec2 vertex_position;
-in vec2 vertex_texcoord0;
-out vec2 texcoord0;
-in vec2 vertex_texcoord1;
-out vec2 texcoord1;
-in vec2 vertex_texcoord2;
-out vec2 texcoord2;
-in vec2 vertex_texcoord3;
-out vec2 texcoord3;
-in vec2 vertex_texcoord4;
-out vec2 texcoord4;
-in vec2 vertex_texcoord5;
-out vec2 texcoord5;
-void main() {
-gl_Position = vec4(vertex_position, 1.0, 1.0);
-texcoord0 = vertex_texcoord0;
-texcoord1 = vertex_texcoord1;
-texcoord2 = vertex_texcoord2;
-texcoord3 = vertex_texcoord3;
-texcoord4 = vertex_texcoord4;
-texcoord5 = vertex_texcoord5;
-}
-
-FRAGMENT
-#version 330
-#define texture1D texture
-#define texture3D texture
-out vec4 out_color;
-in vec2 texcoord0;
-in vec2 texcoord1;
-in vec2 texcoord2;
-in vec2 texcoord3;
-in vec2 texcoord4;
-in vec2 texcoord5;
-uniform mat3 colormatrix;
-uniform vec3 colormatrix_c;
-uniform sampler2D texture0;
-uniform vec2 texture_size0;
-uniform mat2 texture_rot0;
-uniform vec2 pixel_size0;
-uniform sampler2D texture1;
-uniform vec2 texture_size1;
-uniform mat2 texture_rot1;
-uniform vec2 pixel_size1;
-#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))
-void main() {
-vec4 color = vec4(0.0, 0.0, 0.0, 1.0);
-color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r;
-color.gb = 1.000000 * vec4(texture(texture1, texcoord1)).rg;
-// color conversion
-color.rgb = mat3(colormatrix) * color.rgb + colormatrix_c;
-color.a = 1.0;
-// color mapping
-out_color = color;
-}
-

softhddev.h

@@ -1,23 +1,23 @@
 ///
-///	@file softhddev.h	@brief software HD device plugin header file.
+/// @file softhddev.h   @brief software HD device plugin header file.
 ///
-///	Copyright (c) 2011 - 2015 by Johns.  All Rights Reserved.
+/// Copyright (c) 2011 - 2015 by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: efb2e251dd7082138ec21609478d2402be8208cf $
+/// $Id: efb2e251dd7082138ec21609478d2402be8208cf $
 //////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
@@ -25,8 +25,7 @@ extern "C"
 {
 #endif
     /// C callback feed key press
-    extern void FeedKeyPress(const char *, const char *, int, int,
-	const char *);
+    extern void FeedKeyPress(const char *, const char *, int, int, const char *);
 
     /// C plugin get osd size and ascpect
     extern void GetOsdSize(int *, int *, double *);
@@ -34,8 +33,7 @@ extern "C"
     /// C plugin close osd
     extern void OsdClose(void);
     /// C plugin draw osd pixmap
-    extern void OsdDrawARGB(int, int, int, int, int, const uint8_t *, int,
-	int);
+    extern void OsdDrawARGB(int, int, int, int, int, const uint8_t *, int, int);
 
     /// C plugin play audio packet
     extern int PlayAudio(const uint8_t *, int, uint8_t);
@@ -111,7 +109,7 @@ extern "C"
     /// Pip play video packet
     extern int PipPlayVideo(const uint8_t *, int);
 
-    extern const char *X11DisplayName;	///< x11 display name
+    extern const char *X11DisplayName;  ///< x11 display name
 #ifdef __cplusplus
 }
 #endif

softhddevice.h

@@ -1,21 +1,21 @@
 ///
-///	@file softhddevice.h	@brief software HD device plugin header file.
+/// @file softhddevice.h    @brief software HD device plugin header file.
 ///
-///	Copyright (c) 2011, 2014 by Johns.  All Rights Reserved.
+/// Copyright (c) 2011, 2014 by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: 3bc44809950ec019529638cad9223a85d4ab5576 $
+/// $Id: 3bc44809950ec019529638cad9223a85d4ab5576 $
 //////////////////////////////////////////////////////////////////////////////

softhddevice_service.h

@@ -1,23 +1,23 @@
 ///
-///	@file softhddev_service.h @brief software HD device service header file.
+/// @file softhddev_service.h @brief software HD device service header file.
 ///
-///	Copyright (c) 2012 by durchflieger.  All Rights Reserved.
+/// Copyright (c) 2012 by durchflieger.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: c7c2d5e8b724515d7c767668aab717b27f4e4068 $
+/// $Id: c7c2d5e8b724515d7c767668aab717b27f4e4068 $
 //////////////////////////////////////////////////////////////////////////////
 
 #pragma once

video.h

@@ -1,23 +1,23 @@
 ///
-///	@file video.h	@brief Video module header file
+/// @file video.h   @brief Video module header file
 ///
-///	Copyright (c) 2009 - 2015 by Johns.  All Rights Reserved.
+/// Copyright (c) 2009 - 2015 by Johns.  All Rights Reserved.
 ///
-///	Contributor(s):
+/// Contributor(s):
 ///
-///	License: AGPLv3
+/// License: AGPLv3
 ///
-///	This program is free software: you can redistribute it and/or modify
-///	it under the terms of the GNU Affero General Public License as
-///	published by the Free Software Foundation, either version 3 of the
-///	License.
+/// This program is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Affero General Public License as
+/// published by the Free Software Foundation, either version 3 of the
+/// License.
 ///
-///	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 Affero General Public License for more details.
+/// 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 Affero General Public License for more details.
 ///
-///	$Id: 83cd827a8744e8c80c8adba6cb87653b0ad58c45 $
+/// $Id: 83cd827a8744e8c80c8adba6cb87653b0ad58c45 $
 //////////////////////////////////////////////////////////////////////////////
 
 /// @addtogroup Video
@@ -27,227 +27,231 @@
 #include <GL/glx.h>
 
 //----------------------------------------------------------------------------
-//	Typedefs
+//  Typedefs
 //----------------------------------------------------------------------------
 
-    /// Video hardware decoder typedef
+/// Video hardware decoder typedef
 typedef struct _video_hw_decoder_ VideoHwDecoder;
 
-    /// Video output stream typedef
+/// Video output stream typedef
 typedef struct __video_stream__ VideoStream;
 
 //----------------------------------------------------------------------------
-//	Variables
+//  Variables
 //----------------------------------------------------------------------------
 
-extern signed char VideoHardwareDecoder;	///< flag use hardware decoder
-extern char VideoIgnoreRepeatPict;	///< disable repeat pict warning
-extern int VideoAudioDelay;		///< audio/video delay
-extern char ConfigStartX11Server;	///< flag start the x11 server
+extern signed char VideoHardwareDecoder;    ///< flag use hardware decoder
+extern char VideoIgnoreRepeatPict;      ///< disable repeat pict warning
+extern int VideoAudioDelay;             ///< audio/video delay
+extern char ConfigStartX11Server;       ///< flag start the x11 server
 
 //----------------------------------------------------------------------------
-//	Prototypes
+//  Prototypes
 //----------------------------------------------------------------------------
 
-    /// Allocate new video hardware decoder.
+/// Allocate new video hardware decoder.
 extern VideoHwDecoder *VideoNewHwDecoder(VideoStream *);
 
-    /// Deallocate video hardware decoder.
+/// Deallocate video hardware decoder.
 extern void VideoDelHwDecoder(VideoHwDecoder *);
 
-#ifdef LIBAVCODEC_VERSION
-    /// Get and allocate a video hardware surface.
+/// Get and allocate a video hardware surface.
 extern unsigned VideoGetSurface(VideoHwDecoder *, const AVCodecContext *);
 
-    /// Release a video hardware surface
+/// Release a video hardware surface
 extern void VideoReleaseSurface(VideoHwDecoder *, unsigned);
 
-    /// Callback to negotiate the PixelFormat.
-extern enum AVPixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *,
-    const enum AVPixelFormat *);
+/// Callback to negotiate the PixelFormat.
+extern enum AVPixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *, const enum AVPixelFormat *);
 
-    /// Render a ffmpeg frame.
-extern void VideoRenderFrame(VideoHwDecoder *, const AVCodecContext *,
-    const AVFrame *);
+/// Render a ffmpeg frame.
+extern void VideoRenderFrame(VideoHwDecoder *, const AVCodecContext *, const AVFrame *);
 
-    /// Get hwaccel context for ffmpeg.
+/// Get hwaccel context for ffmpeg.
 extern void *VideoGetHwAccelContext(VideoHwDecoder *);
 
 #ifdef AVCODEC_VDPAU_H
-    /// Draw vdpau render state.
-extern void VideoDrawRenderState(VideoHwDecoder *,
-    struct vdpau_render_state *);
-#endif
+/// Draw vdpau render state.
+extern void VideoDrawRenderState(VideoHwDecoder *, struct vdpau_render_state *);
 #endif
 
 #ifdef USE_OPENGLOSD
-    /// Set callback funktion to notify VDR about VideoEvents
+/// Set callback funktion to notify VDR about VideoEvents
 extern void VideoSetVideoEventCallback(void (*)(void));
 #endif
 
-    /// Poll video events.
+/// Poll video events.
 extern void VideoPollEvent(void);
 
-    /// Wakeup display handler.
+/// Wakeup display handler.
 extern void VideoDisplayWakeup(void);
 
-    /// Set video device.
+/// Set video device.
 extern void VideoSetDevice(const char *);
 
-    /// Get video driver name.
+/// Get video driver name.
 extern const char *VideoGetDriverName(void);
 
-    /// Set video geometry.
+/// Set video geometry.
 extern int VideoSetGeometry(const char *);
 
-    /// Set 60Hz display mode.
+/// Set 60Hz display mode.
 extern void VideoSet60HzMode(int);
 
-    /// Set soft start audio/video sync.
+/// Set soft start audio/video sync.
 extern void VideoSetSoftStartSync(int);
 
-    /// Set show black picture during channel switch.
+/// Set show black picture during channel switch.
 extern void VideoSetBlackPicture(int);
 
-    /// Set brightness adjustment.
+/// Set brightness adjustment.
 extern void VideoSetBrightness(int);
 
-    /// Set contrast adjustment.
+/// Set contrast adjustment.
 extern void VideoSetContrast(int);
 
-    /// Set saturation adjustment.
+/// Set saturation adjustment.
 extern void VideoSetSaturation(int);
 
-    /// Set Gamm.
+/// Set Gamma.
 extern void VideoSetGamma(int);
 
-    /// Set ColorSpace.
+/// Set ColorSpace.
 extern void VideoSetTargetColor(int);
 
-    /// Set hue adjustment.
+/// Set hue adjustment.
 extern void VideoSetHue(int);
 
-    /// Set video output position.
+/// Set Color Blindness.
+extern void VideoSetColorBlindness(int);
+
+/// Set Color Blindness Faktor
+extern void VideoSetColorBlindnessFaktor(int);
+
+/// Set video output position.
 extern void VideoSetOutputPosition(VideoHwDecoder *, int, int, int, int);
 
-    /// Set video mode.
+/// Set video mode.
 extern void VideoSetVideoMode(int, int, int, int);
 
-    /// Set 4:3 display format.
+/// Set 4:3 display format.
 extern void VideoSet4to3DisplayFormat(int);
 
-    /// Set other display format.
+/// Set other display format.
 extern void VideoSetOtherDisplayFormat(int);
 
-    /// Set video fullscreen mode.
+/// Set video fullscreen mode.
 extern void VideoSetFullscreen(int);
 
-    /// Set deinterlace.
+/// Set deinterlace.
 extern void VideoSetDeinterlace(int[]);
 
-    /// Set skip chroma deinterlace.
+/// Set skip chroma deinterlace.
 extern void VideoSetSkipChromaDeinterlace(int[]);
 
-    /// Set inverse telecine.
+/// Set inverse telecine.
 extern void VideoSetInverseTelecine(int[]);
 
-    /// Set scaling.
+/// Set scaling.
 extern void VideoSetScaling(int[]);
 
-    /// Set denoise.
+/// Set scaler test.
+extern void VideoSetScalerTest(int);
+
+/// Set denoise.
 extern void VideoSetDenoise(int[]);
 
-    /// Set sharpen.
+/// Set sharpen.
 extern void VideoSetSharpen(int[]);
 
-    /// Set cut top and bottom.
+/// Set cut top and bottom.
 extern void VideoSetCutTopBottom(int[]);
 
-    /// Set cut left and right.
+/// Set cut left and right.
 extern void VideoSetCutLeftRight(int[]);
 
-    /// Set studio levels.
+/// Set studio levels.
 extern void VideoSetStudioLevels(int);
 
-    /// Set background.
+/// Set background.
 extern void VideoSetBackground(uint32_t);
 
-    /// Set audio delay.
+/// Set audio delay.
 extern void VideoSetAudioDelay(int);
 
-    /// Set auto-crop parameters.
+/// Set auto-crop parameters.
 extern void VideoSetAutoCrop(int, int, int);
 
-    /// Clear OSD.
+/// Clear OSD.
 extern void VideoOsdClear(void);
 
-    /// Draw an OSD ARGB image.
-extern void VideoOsdDrawARGB(int, int, int, int, int, const uint8_t *, int,
-    int);
+/// Draw an OSD ARGB image.
+extern void VideoOsdDrawARGB(int, int, int, int, int, const uint8_t *, int, int);
 
-    /// Get OSD size.
+/// Get OSD size.
 extern void VideoGetOsdSize(int *, int *);
 
-    /// Set OSD size.
+/// Set OSD size.
 extern void VideoSetOsdSize(int, int);
 
-    /// Set Osd 3D Mode
+/// Set Osd 3D Mode
 extern void VideoSetOsd3DMode(int);
 
-    /// Set video clock.
+/// Set video clock.
 extern void VideoSetClock(VideoHwDecoder *, int64_t);
 
-    /// Get video clock.
+/// Get video clock.
 extern int64_t VideoGetClock(const VideoHwDecoder *);
 
-    /// Set closing flag.
+/// Set closing flag.
 extern void VideoSetClosing(VideoHwDecoder *);
 
-    /// Reset start of frame counter
+/// Reset start of frame counter
 extern void VideoResetStart(VideoHwDecoder *);
 
-    /// Set trick play speed.
+/// Set trick play speed.
 extern void VideoSetTrickSpeed(VideoHwDecoder *, int);
 
-    /// Grab screen.
+/// Grab screen.
 extern uint8_t *VideoGrab(int *, int *, int *, int);
 
-    /// Grab screen raw.
+/// Grab screen raw.
 extern uint8_t *VideoGrabService(int *, int *, int *);
 
-    /// Get decoder statistics.
+/// Get decoder statistics.
 extern void VideoGetStats(VideoHwDecoder *, int *, int *, int *, int *, float *);
 
-    /// Get video stream size
+/// Get video stream size
 extern void VideoGetVideoSize(VideoHwDecoder *, int *, int *, int *, int *);
 
-extern void VideoOsdInit(void);		///< Setup osd.
-extern void VideoOsdExit(void);		///< Cleanup osd.
+extern void VideoOsdInit(void);         ///< Setup osd.
+extern void VideoOsdExit(void);         ///< Cleanup osd.
 
-extern void VideoInit(const char *);	///< Setup video module.
-extern void VideoExit(void);		///< Cleanup and exit video module.
+extern void VideoInit(const char *);    ///< Setup video module.
+extern void VideoExit(void);            ///< Cleanup and exit video module.
 
-    /// Poll video input buffers.
+/// Poll video input buffers.
 extern int VideoPollInput(VideoStream *);
 
-    /// Decode video input buffers.
+/// Decode video input buffers.
 extern int VideoDecodeInput(VideoStream *);
 
-    /// Get number of input buffers.
+/// Get number of input buffers.
 extern int VideoGetBuffers(const VideoStream *);
 
-    /// Set DPMS at Blackscreen switch
+/// Set DPMS at Blackscreen switch
 extern void SetDPMSatBlackScreen(int);
 
-    /// Raise the frontend window
+/// Raise the frontend window
 extern int VideoRaiseWindow(void);
+
 #ifdef USE_OPENGLOSD
-extern void ActivateOsd(GLuint,int,int,int,int);
+extern void ActivateOsd(GLuint, int, int, int, int);
 #endif
 #if 0
 long int gettid()
 {
-	return (long int)syscall(224);
+    return (long int)syscall(224);
 }
 #endif