- switch from indent to clang-format, which is supported by Visual Studio Code

- reindent all sources to common code style - fix include sort errors from clang-format - update AGPL 3.0 license file
2021-12-27 20:02:45 +01:00 · 2021-12-27 20:02:45 +01:00 · 177e44de98
parent 987ff6ba12
commit 177e44de98
29 changed files with 4309 additions and 5337 deletions
--- a/.clang-format
+++ b/.clang-format
@ -0,0 +1,6 @@
 ---
 BasedOnStyle: LLVM
 UseTab: Never
 IndentWidth: 4
 IndentCaseLabels: true
 ColumnLimit: 119
--- a/.indent.pro
+++ b/.indent.pro
@ -1,37 +0,0 @@
 --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
--- a/34
+++ b/34
@ -22,7 +22,6 @@ CUVID ?= 0
 # only valid for VAAPI
 DRM ?= 0
 # use libplacebo -
 # available for all decoders but for DRM you need LIBPLACEBO_GL
 LIBPLACEBO ?= 1
@ -34,13 +33,7 @@ LIBPLACEBO_GL ?= 0
 # use gamma correction
 #GAMMA ?= 0
-
+CONFIG := -DDEBUG 		# remove '#' to enable debug output
 CONFIG :=  -DDEBUG 		# remove # to enable debug output
 #--------------------- no more config needed past this point--------------------------------
@ -76,10 +69,10 @@ endif
 endif # MAKECMDGOALS!=indent
 endif # MAKECMDGOALS!=clean
 #--------------------------
 PLUGIN = softhdcuvid
 # support OPENGLOSD always needed
@ -154,8 +147,6 @@ APIVERSION = $(call PKGCFG,apiversion)
 -include $(PLGCFG)
 ### Parse softhddevice config
 ifeq ($(ALSA),1)
@ -212,7 +203,6 @@ _CFLAGS += $(shell pkg-config --cflags libdrm)
 LIBS += -lgbm -ldrm -lEGL
 endif
 ifeq ($(CUVID),1)
 #CONFIG += -DUSE_PIP			# PIP support
 CONFIG += -DCUVID			# enable CUVID decoder
@ -226,7 +216,6 @@ ifeq ($(GAMMA),1)
 CONFIG += -DGAMMA
 endif
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
@ -234,7 +223,6 @@ PACKAGE = vdr-$(ARCHIVE)
 SOFILE = libvdr-$(PLUGIN).so
 #
 # Test that libswresample is available
 #
@ -309,6 +297,7 @@ LIBS +=  -lcuda  -lnvcuvid
 endif
 LIBS += -lGLEW -lGLU  -ldl -lglut
 ### Includes and Defines (add further entries here):
 INCLUDES +=
@ -319,10 +308,9 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE $(CONFIG) \
 ### Make it standard
 override CXXFLAGS += $(_CFLAGS) $(DEFINES) $(INCLUDES) \
-    -g  -W -Wextra -Winit-self -Werror=overloaded-virtual  -Wno-unused-parameter 
+    -g -W -Wextra -Werror=overloaded-virtual -Wno-unused-parameter
 override CFLAGS	  += $(_CFLAGS) $(DEFINES) $(INCLUDES) \
-    -g -W  -Wextra -Winit-self  -std=gnu99
+    -g -W -Wextra
 ### The object files (add further files here):
@ -383,7 +371,6 @@ install-i18n: $(I18Nmsgs)
 $(OBJS): Makefile
 $(SOFILE): $(OBJS) shaders.h
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared  $(OBJS) $(LIBS) -o $@
@ -404,17 +391,14 @@ clean:
 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
 ## Private Targets:
 HDRS = $(wildcard *.h)
 indent:
 	for i in $(SRCS) $(HDRS); do \
-		indent $$i; \
+	  clang-format -i $$i; \
 		unexpand -a $$i | sed -e s/constconst/const/ > $$i.up; \
 		mv $$i.up $$i; \
 	done
 ## Private Targets:
 video_test: video.c Makefile
 	$(CC) -DVIDEO_TEST -DVERSION='"$(VERSION)"' $(CFLAGS) $(LDFLAGS) $< \
 	$(LIBS) -o $@
--- a/agpl-3.0.txt
+++ b/agpl-3.0.txt
@ -1,21 +1,21 @@
                    GNU AFFERO GENERAL PUBLIC LICENSE
                       Version 3, 19 November 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
-  The GNU Affero General Public License is a free, copyleft license
+  The GNU Affero General Public License is a free, copyleft license for
-for software and other kinds of works, specifically designed to ensure
+software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
-  The licenses for most software and other practical works are
+  The licenses for most software and other practical works are designed
-designed to take away your freedom to share and change the works.  By
+to take away your freedom to share and change the works.  By contrast,
-contrast, our General Public Licenses are intended to guarantee your
+our General Public Licenses are intended to guarantee your freedom to
-freedom to share and change all versions of a program--to make sure it
+share and change all versions of a program--to make sure it remains free
-remains free software for all its users.
+software for all its users.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@ -60,11 +60,10 @@ modification follow.
  0. Definitions.
-  "This License" refers to version 3 of the GNU Affero General Public
+  "This License" refers to version 3 of the GNU Affero General Public License.
 License.
-  "Copyright" also means copyright-like laws that apply to other kinds
+  "Copyright" also means copyright-like laws that apply to other kinds of
-of works, such as semiconductor masks.
+works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
@ -377,12 +376,12 @@ that material) supplement the terms of this License with terms:
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further restriction,
+governed by this License along with a term that is a further
-you may remove that term.  If a license document contains a further
+restriction, you may remove that term.  If a license document contains
-restriction but permits relicensing or conveying under this License, you
+a further restriction but permits relicensing or conveying under this
-may add to a covered work material governed by the terms of that license
+License, you may add to a covered work material governed by the terms
-document, provided that the further restriction does not survive such
+of that license document, provided that the further restriction does
-relicensing or conveying.
+not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
@ -551,34 +550,34 @@ shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
-  Notwithstanding any other provision of this License, you have permission
+  Notwithstanding any other provision of this License, you have
-to link or combine any covered work with a work licensed under version 3
+permission to link or combine any covered work with a work licensed
-of the GNU General Public License into a single combined work, and to
+under version 3 of the GNU General Public License into a single
-convey the resulting work.  The terms of this License will continue to
+combined work, and to convey the resulting work.  The terms of this
-apply to the part which is the covered work, but the work with which it is
+License will continue to apply to the part which is the covered work,
-combined will remain governed by version 3 of the GNU General Public
+but the work with which it is combined will remain governed by version
-License.
+3 of the GNU General Public License.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new
+the GNU Affero General Public License from time to time.  Such new versions
-versions will be similar in spirit to the present version, but may differ
+will be similar in spirit to the present version, but may differ in detail to
-in detail to address new problems or concerns.
+address new problems or concerns.
  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero
+Program specifies that a certain numbered version of the GNU Affero General
-General Public License "or any later version" applies to it, you have
+Public License "or any later version" applies to it, you have the
-the option of following the terms and conditions either of that
+option of following the terms and conditions either of that numbered
-numbered version or of any later version published by the Free
+version or of any later version published by the Free Software
-Software Foundation.  If the Program does not specify a version number
+Foundation.  If the Program does not specify a version number of the
-of the GNU Affero General Public License, you may choose any version
+GNU Affero General Public License, you may choose any version ever published
-ever published by the Free Software Foundation.
+by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that
+versions of the GNU Affero General Public License can be used, that proxy's
-proxy's public statement of acceptance of a version permanently
+public statement of acceptance of a version permanently authorizes you
-authorizes you to choose that version for the Program.
+to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
@ -634,9 +633,9 @@ the "copyright" line and a pointer to where the full notice is found.
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
+    it under the terms of the GNU Affero General Public License as published by
-    published by the Free Software Foundation, either version 3 of the
+    the Free Software Foundation, either version 3 of the License, or
-    License, or (at your option) any later version.
+    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -644,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU Affero General Public License for more details.
    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
@ -659,4 +658,4 @@ specific requirements.
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
--- a/audio.c
+++ b/audio.c
--- a/codec.c
+++ b/codec.c
@ -51,16 +51,16 @@
 #include <endian.h>
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <libintl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #define _(str) gettext(str) ///< gettext shortcut
 #define _N(str) str         ///< gettext_noop shortcut
 #include <libavcodec/avcodec.h>
 #include <libavutil/opt.h>
 #include <libavutil/mem.h>
 #include <libavutil/opt.h>
 #ifdef USE_SWRESAMPLE
 #include <libswresample/swresample.h>
@ -75,11 +75,13 @@
 #endif
 #include <pthread.h>
 // clang-format off
 #include "iatomic.h"
 #include "misc.h"
 #include "video.h"
 #include "audio.h"
 #include "codec.h"
 // clang-format on
 //----------------------------------------------------------------------------
 //  Global
@ -134,8 +136,7 @@ struct _video_decoder_
 **			valid format, the formats are ordered by
 **			quality.
 */
-static enum AVPixelFormat Codec_get_format(AVCodecContext * video_ctx, const enum AVPixelFormat *fmt)
+static enum AVPixelFormat Codec_get_format(AVCodecContext *video_ctx, const enum AVPixelFormat *fmt) {
 {
    VideoDecoder *decoder;
    enum AVPixelFormat fmt1;
@ -147,7 +148,6 @@ static enum AVPixelFormat Codec_get_format(AVCodecContext * video_ctx, const enu
    //	decoder->GetFormatDone = 1;
    return Video_get_format(decoder->HwDecoder, video_ctx, fmt);
 }
 // static void Codec_free_buffer(void *opaque, uint8_t *data);
@ -160,8 +160,7 @@ static enum AVPixelFormat Codec_get_format(AVCodecContext * video_ctx, const enu
 **  @param video_ctx	Codec context
 **  @param frame	Get buffer for this frame
 */
-static int Codec_get_buffer2(AVCodecContext * video_ctx, AVFrame * frame, int flags)
+static int Codec_get_buffer2(AVCodecContext *video_ctx, AVFrame *frame, int flags) {
 {
    VideoDecoder *decoder;
    decoder = video_ctx->opaque;
@ -197,8 +196,7 @@ static int Codec_get_buffer2(AVCodecContext * video_ctx, AVFrame * frame, int fl
 **
 **  @returns private decoder pointer for video decoder.
 */
-VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder * hw_decoder)
+VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder *hw_decoder) {
 {
    VideoDecoder *decoder;
    if (!(decoder = calloc(1, sizeof(*decoder)))) {
@ -214,10 +212,7 @@ VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder * hw_decoder)
 **
 **  @param decoder  private video decoder
 */
-void CodecVideoDelDecoder(VideoDecoder * decoder)
+void CodecVideoDelDecoder(VideoDecoder *decoder) { free(decoder); }
 {
    free(decoder);
 }
 /**
 **  Open video decoder.
@ -225,8 +220,7 @@ void CodecVideoDelDecoder(VideoDecoder * decoder)
 **  @param decoder  private video decoder
 **  @param codec_id video codec id
 */
-void CodecVideoOpen(VideoDecoder * decoder, int codec_id)
+void CodecVideoOpen(VideoDecoder *decoder, int codec_id) {
 {
    AVCodec *video_codec;
    const char *name;
    int ret, deint = 2;
@ -290,7 +284,8 @@ void CodecVideoOpen(VideoDecoder * decoder, int codec_id)
    decoder->VideoCtx->hw_device_ctx = av_buffer_ref(HwDeviceContext);
 #else
    decoder->VideoCtx->pix_fmt = AV_PIX_FMT_DRM_PRIME; /* request a DRM frame */
-    //  decoder->VideoCtx->pix_fmt = AV_PIX_FMT_MMAL;   /* request a DRM frame */
+    //	decoder->VideoCtx->pix_fmt = AV_PIX_FMT_MMAL;	/* request a DRM frame
    //*/
 #endif
    // FIXME: for software decoder use all cpus, otherwise 1
@ -352,7 +347,8 @@ void CodecVideoOpen(VideoDecoder * decoder, int codec_id)
 #endif
 #ifdef CUVID
-    if (strcmp(decoder->VideoCodec->long_name, "Nvidia CUVID MPEG2VIDEO decoder") == 0) {   // deinterlace for mpeg2 is somehow broken
+    if (strcmp(decoder->VideoCodec->long_name,
               "Nvidia CUVID MPEG2VIDEO decoder") == 0) { // deinterlace for mpeg2 is somehow broken
        if (av_opt_set_int(decoder->VideoCtx->priv_data, "deint", deint, 0) < 0) { // adaptive
            pthread_mutex_unlock(&CodecLockMutex);
            Fatal(_("codec: can't set option deint to video codec!\n"));
@ -428,8 +424,7 @@ void CodecVideoOpen(VideoDecoder * decoder, int codec_id)
 **
 **  @param video_decoder    private video decoder
 */
-void CodecVideoClose(VideoDecoder * video_decoder)
+void CodecVideoClose(VideoDecoder *video_decoder) {
 {
    AVFrame *frame;
    // FIXME: play buffered data
@ -441,14 +436,14 @@ void CodecVideoClose(VideoDecoder * video_decoder)
 #if 1
        frame = av_frame_alloc();
        avcodec_send_packet(video_decoder->VideoCtx, NULL);
-        while (avcodec_receive_frame(video_decoder->VideoCtx, frame) >= 0) ;
+        while (avcodec_receive_frame(video_decoder->VideoCtx, frame) >= 0)
            ;
        av_frame_free(&frame);
 #endif
        avcodec_close(video_decoder->VideoCtx);
        av_freep(&video_decoder->VideoCtx);
        pthread_mutex_unlock(&CodecLockMutex);
    }
 }
 #if 0
@ -501,8 +496,7 @@ extern int push_filters(AVCodecContext * dec_ctx, void *decoder, AVFrame * frame
 #endif
 #ifdef VAAPI
-void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
+void CodecVideoDecode(VideoDecoder *decoder, const AVPacket *avpkt) {
 {
    AVCodecContext *video_ctx = decoder->VideoCtx;
    if (video_ctx->codec_type == AVMEDIA_TYPE_VIDEO && CuvidTestSurfaces()) {
@ -540,7 +534,8 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
                            decoder->filter = 2;
                        }
                    }
-                    if (frame->interlaced_frame && decoder->filter == 2 && (frame->height != 720)) {    // broken ZDF sends Interlaced flag
+                    if (frame->interlaced_frame && decoder->filter == 2 &&
                        (frame->height != 720)) { // broken ZDF sends Interlaced flag
                        push_filters(video_ctx, decoder->HwDecoder, frame);
                        continue;
                    }
@ -557,8 +552,7 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
 #ifdef CUVID
-void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
+void CodecVideoDecode(VideoDecoder *decoder, const AVPacket *avpkt) {
 {
    AVCodecContext *video_ctx;
    AVFrame *frame;
    int ret, ret1;
@ -597,9 +591,11 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
            } else {
                got_frame = 0;
            }
-            //            printf("got %s packet from decoder\n",got_frame?"1":"no");
+            //		  printf("got %s packet from
            // decoder\n",got_frame?"1":"no");
            if (got_frame) { // frame completed
-//              printf("video frame pts %#012" PRIx64 " %dms\n",frame->pts,(int)(apts - frame->pts) / 90);
+//		printf("video frame pts %#012" PRIx64 "
 //%dms\n",frame->pts,(int)(apts - frame->pts) / 90);
 #ifdef YADIF
                if (decoder->filter) {
                    if (decoder->filter == 1) {
@ -611,7 +607,8 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
                            decoder->filter = 2;
                        }
                    }
-                    if (frame->interlaced_frame && decoder->filter == 2 && (frame->height != 720)) {    // broken ZDF sends Interlaced flag
+                    if (frame->interlaced_frame && decoder->filter == 2 &&
                        (frame->height != 720)) { // broken ZDF sends Interlaced flag
                        ret = push_filters(video_ctx, decoder->HwDecoder, frame);
                        // av_frame_unref(frame);
                        continue;
@ -636,7 +633,6 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
    if (!consumed) {
        goto next_part; // try again to stuff decoder
    }
 }
 #endif
@ -645,8 +641,7 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
 **
 **  @param decoder  video decoder data
 */
-void CodecVideoFlushBuffers(VideoDecoder * decoder)
+void CodecVideoFlushBuffers(VideoDecoder *decoder) {
 {
    if (decoder->VideoCtx) {
        avcodec_flush_buffers(decoder->VideoCtx);
    }
@ -666,8 +661,7 @@ typedef struct _audio_decoder_ AudioDecoder;
 ///
 /// Audio decoder structure.
 ///
-struct _audio_decoder_
+struct _audio_decoder_ {
 {
    AVCodec *AudioCodec;      ///< audio codec
    AVCodecContext *AudioCtx; ///< audio codec context
@ -707,8 +701,7 @@ struct _audio_decoder_
 ///
 /// IEC Data type enumeration.
 ///
-enum IEC61937
+enum IEC61937 {
 {
    IEC61937_AC3 = 0x01, ///< AC-3 data
    // FIXME: more data types
    IEC61937_EAC3 = 0x15, ///< E-AC-3 data
@ -736,8 +729,7 @@ static char CodecDownmix;               ///< enable AC-3 decoder downmix
 **
 **  @returns private decoder pointer for audio decoder.
 */
-AudioDecoder *CodecAudioNewDecoder(void)
+AudioDecoder *CodecAudioNewDecoder(void) {
 {
    AudioDecoder *audio_decoder;
    if (!(audio_decoder = calloc(1, sizeof(*audio_decoder)))) {
@ -755,8 +747,7 @@ AudioDecoder *CodecAudioNewDecoder(void)
 **
 **  @param decoder  private audio decoder
 */
-void CodecAudioDelDecoder(AudioDecoder * decoder)
+void CodecAudioDelDecoder(AudioDecoder *decoder) {
 {
    av_frame_free(&decoder->Frame); // callee does checks
    free(decoder);
 }
@ -767,8 +758,7 @@ void CodecAudioDelDecoder(AudioDecoder * decoder)
 **  @param audio_decoder    private audio decoder
 **  @param codec_id audio   codec id
 */
-void CodecAudioOpen(AudioDecoder * audio_decoder, int codec_id)
+void CodecAudioOpen(AudioDecoder *audio_decoder, int codec_id) {
 {
    AVCodec *audio_codec;
    Debug(3, "codec: using audio codec ID %#06x (%s)\n", codec_id, avcodec_get_name(codec_id));
@ -817,8 +807,7 @@ void CodecAudioOpen(AudioDecoder * audio_decoder, int codec_id)
 **
 **  @param audio_decoder    private audio decoder
 */
-void CodecAudioClose(AudioDecoder * audio_decoder)
+void CodecAudioClose(AudioDecoder *audio_decoder) {
 {
    // FIXME: output any buffered data
 #ifdef USE_SWRESAMPLE
@ -844,8 +833,7 @@ void CodecAudioClose(AudioDecoder * audio_decoder)
 **
 **  @param mask enable mask (PCM, AC-3)
 */
-void CodecSetAudioDrift(int mask)
+void CodecSetAudioDrift(int mask) {
 {
 #ifdef USE_AUDIO_DRIFT_CORRECTION
    CodecAudioDrift = mask & (CORRECT_PCM | CORRECT_AC3);
 #endif
@ -857,8 +845,7 @@ void CodecSetAudioDrift(int mask)
 **
 **  @param mask enable mask (PCM, AC-3, E-AC-3)
 */
-void CodecSetAudioPassthrough(int mask)
+void CodecSetAudioPassthrough(int mask) {
 {
 #ifdef USE_PASSTHROUGH
    CodecPassthrough = mask & (CodecPCM | CodecAC3 | CodecEAC3);
 #endif
@ -870,8 +857,7 @@ void CodecSetAudioPassthrough(int mask)
 **
 **  @param onoff    enable/disable downmix.
 */
-void CodecSetAudioDownmix(int onoff)
+void CodecSetAudioDownmix(int onoff) {
 {
    if (onoff == -1) {
        CodecDownmix ^= 1;
        return;
@ -890,8 +876,7 @@ void CodecSetAudioDownmix(int onoff)
 **  @param size		size of sample buffer in bytes
 **  @param channels	number of channels interleaved in sample buffer
 */
-static void CodecReorderAudioFrame(int16_t * buf, int size, int channels)
+static void CodecReorderAudioFrame(int16_t *buf, int size, int channels) {
 {
    int i;
    int c;
    int ls;
@ -945,8 +930,7 @@ static void CodecReorderAudioFrame(int16_t * buf, int size, int channels)
 **  @param audio_decoder    audio decoder data
 **  @param[out] passthrough pass-through output
 */
-static int CodecAudioUpdateHelper(AudioDecoder * audio_decoder, int *passthrough)
+static int CodecAudioUpdateHelper(AudioDecoder *audio_decoder, int *passthrough) {
 {
    const AVCodecContext *audio_ctx;
    int err;
@ -965,8 +949,8 @@ static int CodecAudioUpdateHelper(AudioDecoder * audio_decoder, int *passthrough
    audio_decoder->Passthrough = CodecPassthrough;
    // SPDIF/HDMI pass-through
-    if ((CodecPassthrough & CodecAC3 && audio_ctx->codec_id == AV_CODEC_ID_AC3)
+    if ((CodecPassthrough & CodecAC3 && audio_ctx->codec_id == AV_CODEC_ID_AC3) ||
-        || (CodecPassthrough & CodecEAC3 && audio_ctx->codec_id == AV_CODEC_ID_EAC3)) {
+        (CodecPassthrough & CodecEAC3 && audio_ctx->codec_id == AV_CODEC_ID_EAC3)) {
        if (audio_ctx->codec_id == AV_CODEC_ID_EAC3) {
            // E-AC-3 over HDMI some receivers need HBR
            audio_decoder->HwSampleRate *= 4;
@ -981,8 +965,8 @@ static int CodecAudioUpdateHelper(AudioDecoder * audio_decoder, int *passthrough
        // try E-AC-3 none HBR
        audio_decoder->HwSampleRate /= 4;
-        if (audio_ctx->codec_id != AV_CODEC_ID_EAC3
+        if (audio_ctx->codec_id != AV_CODEC_ID_EAC3 ||
-            || (err = AudioSetup(&audio_decoder->HwSampleRate, &audio_decoder->HwChannels, *passthrough))) {
+            (err = AudioSetup(&audio_decoder->HwSampleRate, &audio_decoder->HwChannels, *passthrough))) {
            Debug(3, "codec/audio: audio setup error\n");
            // FIXME: handle errors
@ -1005,8 +989,7 @@ static int CodecAudioUpdateHelper(AudioDecoder * audio_decoder, int *passthrough
 **  @param audio_decoder    audio decoder data
 **  @param avpkt	    undecoded audio packet
 */
-static int CodecAudioPassthroughHelper(AudioDecoder * audio_decoder, const AVPacket * avpkt)
+static int CodecAudioPassthroughHelper(AudioDecoder *audio_decoder, const AVPacket *avpkt) {
 {
 #ifdef USE_PASSTHROUGH
    const AVCodecContext *audio_ctx;
@ -1025,11 +1008,10 @@ static int CodecAudioPassthroughHelper(AudioDecoder * audio_decoder, const AVPac
        if (CodecAudioDrift & CORRECT_AC3) {
            int x;
-            x = (audio_decoder->DriftFrac +
+            x = (audio_decoder->DriftFrac + (audio_decoder->DriftCorr * spdif_sz)) /
-                (audio_decoder->DriftCorr * spdif_sz)) / (10 * audio_decoder->HwSampleRate * 100);
+                (10 * audio_decoder->HwSampleRate * 100);
-            audio_decoder->DriftFrac =
+            audio_decoder->DriftFrac = (audio_decoder->DriftFrac + (audio_decoder->DriftCorr * spdif_sz)) %
-                (audio_decoder->DriftFrac +
+                                       (10 * audio_decoder->HwSampleRate * 100);
                (audio_decoder->DriftCorr * spdif_sz)) % (10 * audio_decoder->HwSampleRate * 100);
            // round to word border
            x *= audio_decoder->HwChannels * 4;
            if (x < -64) { // limit correction
@ -1120,8 +1102,7 @@ static int CodecAudioPassthroughHelper(AudioDecoder * audio_decoder, const AVPac
 **  @param audio_decoder    audio decoder data
 **  @param pts		    presentation timestamp
 */
-static void CodecAudioSetClock(AudioDecoder * audio_decoder, int64_t pts)
+static void CodecAudioSetClock(AudioDecoder *audio_decoder, int64_t pts) {
 {
 #ifdef USE_AUDIO_DRIFT_CORRECTION
    struct timespec nowtime;
    int64_t delay;
@ -1152,8 +1133,8 @@ static void CodecAudioSetClock(AudioDecoder * audio_decoder, int64_t pts)
        return;
    }
-    tim_diff = (nowtime.tv_sec - audio_decoder->LastTime.tv_sec)
+    tim_diff = (nowtime.tv_sec - audio_decoder->LastTime.tv_sec) * 1000 * 1000 * 1000 +
-        * 1000 * 1000 * 1000 + (nowtime.tv_nsec - audio_decoder->LastTime.tv_nsec);
+               (nowtime.tv_nsec - audio_decoder->LastTime.tv_nsec);
    drift = (tim_diff * 90) / (1000 * 1000) - pts_diff + delay - audio_decoder->LastDelay;
@ -1181,10 +1162,9 @@ static void CodecAudioSetClock(AudioDecoder * audio_decoder, int64_t pts)
        audio_decoder->Drift = drift;
        corr = (10 * audio_decoder->HwSampleRate * drift) / (90 * 1000);
        // SPDIF/HDMI passthrough
-        if ((CodecAudioDrift & CORRECT_AC3) && (!(CodecPassthrough & CodecAC3)
+        if ((CodecAudioDrift & CORRECT_AC3) &&
-                || audio_decoder->AudioCtx->codec_id != AV_CODEC_ID_AC3)
+            (!(CodecPassthrough & CodecAC3) || audio_decoder->AudioCtx->codec_id != AV_CODEC_ID_AC3) &&
-            && (!(CodecPassthrough & CodecEAC3)
+            (!(CodecPassthrough & CodecEAC3) || audio_decoder->AudioCtx->codec_id != AV_CODEC_ID_EAC3)) {
                || audio_decoder->AudioCtx->codec_id != AV_CODEC_ID_EAC3)) {
            audio_decoder->DriftCorr = -corr;
        }
@ -1237,8 +1217,7 @@ static void CodecAudioSetClock(AudioDecoder * audio_decoder, int64_t pts)
 **
 **  @param audio_decoder    audio decoder data
 */
-static void CodecAudioUpdateFormat(AudioDecoder * audio_decoder)
+static void CodecAudioUpdateFormat(AudioDecoder *audio_decoder) {
 {
    int passthrough;
    const AVCodecContext *audio_ctx;
@ -1253,18 +1232,17 @@ static void CodecAudioUpdateFormat(AudioDecoder * audio_decoder)
    audio_ctx = audio_decoder->AudioCtx;
 #ifdef DEBUG
-    if (audio_ctx->sample_fmt == AV_SAMPLE_FMT_S16 && audio_ctx->sample_rate == audio_decoder->HwSampleRate
+    if (audio_ctx->sample_fmt == AV_SAMPLE_FMT_S16 && audio_ctx->sample_rate == audio_decoder->HwSampleRate &&
-        && !CodecAudioDrift) {
+        !CodecAudioDrift) {
        // FIXME: use Resample only, when it is needed!
        fprintf(stderr, "no resample needed\n");
    }
 #endif
 #ifdef USE_SWRESAMPLE
-    audio_decoder->Resample =
+    audio_decoder->Resample = swr_alloc_set_opts(audio_decoder->Resample, audio_ctx->channel_layout, AV_SAMPLE_FMT_S16,
-        swr_alloc_set_opts(audio_decoder->Resample, audio_ctx->channel_layout, AV_SAMPLE_FMT_S16,
+                                                 audio_decoder->HwSampleRate, audio_ctx->channel_layout,
-        audio_decoder->HwSampleRate, audio_ctx->channel_layout, audio_ctx->sample_fmt, audio_ctx->sample_rate, 0,
+                                                 audio_ctx->sample_fmt, audio_ctx->sample_rate, 0, NULL);
        NULL);
    if (audio_decoder->Resample) {
        swr_init(audio_decoder->Resample);
    } else {
@ -1304,8 +1282,7 @@ static void CodecAudioUpdateFormat(AudioDecoder * audio_decoder)
 **  @param avpkt	    audio packet
 */
-void CodecAudioDecode(AudioDecoder * audio_decoder, const AVPacket * avpkt)
+void CodecAudioDecode(AudioDecoder *audio_decoder, const AVPacket *avpkt) {
 {
    AVCodecContext *audio_ctx = audio_decoder->AudioCtx;
    if (audio_ctx->codec_type == AVMEDIA_TYPE_AUDIO) {
@ -1332,8 +1309,9 @@ void CodecAudioDecode(AudioDecoder * audio_decoder, const AVPacket * avpkt)
                CodecAudioSetClock(audio_decoder, avpkt->pts);
            }
            // format change
-            if (audio_decoder->Passthrough != CodecPassthrough || audio_decoder->SampleRate != audio_ctx->sample_rate
+            if (audio_decoder->Passthrough != CodecPassthrough ||
-                || audio_decoder->Channels != audio_ctx->channels) {
+                audio_decoder->SampleRate != audio_ctx->sample_rate ||
                audio_decoder->Channels != audio_ctx->channels) {
                CodecAudioUpdateFormat(audio_decoder);
            }
            if (!audio_decoder->HwSampleRate || !audio_decoder->HwChannels) {
@ -1347,8 +1325,7 @@ void CodecAudioDecode(AudioDecoder * audio_decoder, const AVPacket * avpkt)
                uint8_t *out[1];
                out[0] = outbuf;
-                ret =
+                ret = swr_convert(audio_decoder->Resample, out, sizeof(outbuf) / (2 * audio_decoder->HwChannels),
                    swr_convert(audio_decoder->Resample, out, sizeof(outbuf) / (2 * audio_decoder->HwChannels),
                                  (const uint8_t **)frame->extended_data, frame->nb_samples);
                if (ret > 0) {
                    if (!(audio_decoder->Passthrough & CodecPCM)) {
@ -1370,11 +1347,7 @@ void CodecAudioDecode(AudioDecoder * audio_decoder, const AVPacket * avpkt)
 **
 **  @param decoder  audio decoder data
 */
-void CodecAudioFlushBuffers(AudioDecoder * decoder)
+void CodecAudioFlushBuffers(AudioDecoder *decoder) { avcodec_flush_buffers(decoder->AudioCtx); }
 {
    avcodec_flush_buffers(decoder->AudioCtx);
 }
 //----------------------------------------------------------------------------
 //  Codec
@ -1383,18 +1356,13 @@ void CodecAudioFlushBuffers(AudioDecoder * decoder)
 /**
 **  Empty log callback
 */
-static void CodecNoopCallback( __attribute__((unused))
+static void CodecNoopCallback(__attribute__((unused)) void *ptr, __attribute__((unused)) int level,
-    void *ptr, __attribute__((unused))
+                              __attribute__((unused)) const char *fmt, __attribute__((unused)) va_list vl) {}
    int level, __attribute__((unused))
    const char *fmt, __attribute__((unused)) va_list vl)
 {
 }
 /**
 **  Codec init
 */
-void CodecInit(void)
+void CodecInit(void) {
 {
    pthread_mutex_init(&CodecLockMutex, NULL);
 #ifndef DEBUG
    // disable display ffmpeg error messages
@ -1407,7 +1375,4 @@ void CodecInit(void)
 /**
 **  Codec exit.
 */
-void CodecExit(void)
+void CodecExit(void) { pthread_mutex_destroy(&CodecLockMutex); }
 {
    pthread_mutex_destroy(&CodecLockMutex);
 }
--- a/codec.h
+++ b/codec.h
@ -35,8 +35,7 @@
 #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-enum HWAccelID
+enum HWAccelID {
 {
    HWACCEL_NONE = 0,
    HWACCEL_AUTO,
    HWACCEL_VDPAU,
@ -53,8 +52,7 @@ extern AVBufferRef *hw_device_ctx;
 ///
 /// Video decoder structure.
 ///
-struct _video_decoder_
+struct _video_decoder_ {
 {
    VideoHwDecoder *HwDecoder; ///< video hardware decoder
    int GetFormatDone;        ///< flag get format called!
@ -87,7 +85,6 @@ struct _video_decoder_
    double cached_hdr_peak;
    // From VO
    struct mp_hwdec_devices *hwdec_devs;
 };
 //----------------------------------------------------------------------------
--- a/common.h
+++ b/common.h
@ -19,17 +19,17 @@
 #ifndef MPLAYER_GL_COMMON_H
 #define MPLAYER_GL_COMMON_H
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #if 0
 #include "config.h"
 #include "common/msg.h"
 #include "config.h"
 #include "misc/bstr.h"
 #include "video/out/vo.h"
 #include "video/csputils.h"
 #include "video/mp_image.h"
 #include "video/out/vo.h"
 #endif
 #if HAVE_GL_COCOA
@ -53,8 +53,7 @@
 struct GL;
 typedef struct GL GL;
-enum
+enum {
 {
    MPGL_CAP_ROW_LENGTH = (1 << 4), // GL_[UN]PACK_ROW_LENGTH
    MPGL_CAP_FB = (1 << 5),
    MPGL_CAP_VAO = (1 << 6),
@ -87,8 +86,7 @@ void mpgl_load_functions2(GL * gl, void *(*get_fn)(void *ctx, const char *n), vo
 typedef void(GLAPIENTRY *MP_GLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *, const void *);
 // function pointers loaded from the OpenGL library
-struct GL
+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
@ -192,10 +190,8 @@ struct GL
    void(GLAPIENTRY *VDPAUInitNV)(const GLvoid *, const GLvoid *);
    void(GLAPIENTRY *VDPAUFiniNV)(void);
-     GLvdpauSurfaceNV(GLAPIENTRY * VDPAURegisterOutputSurfaceNV)
+    GLvdpauSurfaceNV(GLAPIENTRY *VDPAURegisterOutputSurfaceNV)(GLvoid *, GLenum, GLsizei, const GLuint *);
-     (GLvoid *, GLenum, GLsizei, const GLuint *);
+    GLvdpauSurfaceNV(GLAPIENTRY *VDPAURegisterVideoSurfaceNV)(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 *);
@ -203,13 +199,17 @@ struct GL
 #if HAVE_GL_WIN32
    // The HANDLE type might not be present on non-Win32
-     BOOL(GLAPIENTRY * DXSetResourceShareHandleNV) (void *dxObject, HANDLE shareHandle);
+    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);
+    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 *DXLockObjectsNV)
-     BOOL(GLAPIENTRY * DXUnlockObjectsNV) (HANDLE hDevice, GLint count, HANDLE * hObjects);
+    (HANDLE hDevice, GLint count, HANDLE *hObjects);
    BOOL(GLAPIENTRY *DXUnlockObjectsNV)
    (HANDLE hDevice, GLint count, HANDLE *hObjects);
 #endif
    GLint(GLAPIENTRY *GetVideoSync)(GLuint *);
--- a/drvapi_error_string.h
+++ b/drvapi_error_string.h
@ -14,12 +14,11 @@
 #define _DRVAPI_ERROR_STRING_H_
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
 // Error Code string definitions here
-typedef struct
+typedef struct {
 {
    char const *error_string;
    unsigned int error_id;
 } s_CudaErrorStr;
@ -84,8 +83,8 @@ s_CudaErrorStr sCudaDrvErrorString[] = {
    {"CUDA_ERROR_PROFILER_ALREADY_STOPPED", 8},
    /**
-     * This indicates that no CUDA-capable devices were detected by the installed
+     * This indicates that no CUDA-capable devices were detected by the
-     * CUDA driver.
+     * installed CUDA driver.
     */
    {"CUDA_ERROR_NO_DEVICE (no CUDA-capable devices were detected)", 100},
@ -256,18 +255,19 @@ s_CudaErrorStr sCudaDrvErrorString[] = {
    /**
     * This indicates that asynchronous operations issued previously have not
-     * completed yet. This result is not actually an error, but must be indicated
+     * completed yet. This result is not actually an error, but must be
-     * differently than ::CUDA_SUCCESS (which indicates completion). Calls that
+     * indicated differently than ::CUDA_SUCCESS (which indicates completion).
-     * may return this value include ::cuEventQuery() and ::cuStreamQuery().
+     * Calls that may return this value include ::cuEventQuery() and
     * ::cuStreamQuery().
     */
    {"CUDA_ERROR_NOT_READY", 600},
    /**
     * While executing a kernel, the device encountered a
     * load or store instruction on an invalid memory address.
-     * This leaves the process in an inconsistent state and any further CUDA work
+     * This leaves the process in an inconsistent state and any further CUDA
-     * will return the same error. To continue using CUDA, the process must be terminated
+     * work will return the same error. To continue using CUDA, the process must
-     * and relaunched.
+     * be terminated and relaunched.
     */
    {"CUDA_ERROR_ILLEGAL_ADDRESS", 700},
@ -342,8 +342,8 @@ s_CudaErrorStr sCudaDrvErrorString[] = {
    {"CUDA_ERROR_TOO_MANY_PEERS", 711},
    /**
-     * This error indicates that the memory range passed to ::cuMemHostRegister()
+     * This error indicates that the memory range passed to
-     * has already been registered.
+     * ::cuMemHostRegister() has already been registered.
     */
    {"CUDA_ERROR_HOST_MEMORY_ALREADY_REGISTERED", 712},
@ -356,25 +356,25 @@ s_CudaErrorStr sCudaDrvErrorString[] = {
    /**
     * While executing a kernel, the device encountered a stack error.
     * This can be due to stack corruption or exceeding the stack size limit.
-     * This leaves the process in an inconsistent state and any further CUDA work
+     * This leaves the process in an inconsistent state and any further CUDA
-     * will return the same error. To continue using CUDA, the process must be terminated
+     * work will return the same error. To continue using CUDA, the process must
-     * and relaunched.
+     * be terminated and relaunched.
     */
    {"CUDA_ERROR_HARDWARE_STACK_ERROR", 714},
    /**
     * While executing a kernel, the device encountered an illegal instruction.
-     * This leaves the process in an inconsistent state and any further CUDA work
+     * This leaves the process in an inconsistent state and any further CUDA
-     * will return the same error. To continue using CUDA, the process must be terminated
+     * work will return the same error. To continue using CUDA, the process must
-     * and relaunched.
+     * be terminated and relaunched.
     */
    {"CUDA_ERROR_ILLEGAL_INSTRUCTION", 715},
    /**
-     * While executing a kernel, the device encountered a load or store instruction
+     * While executing a kernel, the device encountered a load or store
-     * on a memory address which is not aligned.
+     * instruction on a memory address which is not aligned. This leaves the
-     * This leaves the process in an inconsistent state and any further CUDA work
+     * process in an inconsistent state and any further CUDA work will return
-     * will return the same error. To continue using CUDA, the process must be terminated
+     * the same error. To continue using CUDA, the process must be terminated
     * and relaunched.
     */
    {"CUDA_ERROR_MISALIGNED_ADDRESS", 716},
@ -384,17 +384,17 @@ s_CudaErrorStr sCudaDrvErrorString[] = {
     * which can only operate on memory locations in certain address spaces
     * (global, shared, or local), but was supplied a memory address not
     * belonging to an allowed address space.
-     * This leaves the process in an inconsistent state and any further CUDA work
+     * This leaves the process in an inconsistent state and any further CUDA
-     * will return the same error. To continue using CUDA, the process must be terminated
+     * work will return the same error. To continue using CUDA, the process must
-     * and relaunched.
+     * be terminated and relaunched.
     */
    {"CUDA_ERROR_INVALID_ADDRESS_SPACE", 717},
    /**
-     * While executing a kernel, the device program counter wrapped its address space.
+     * While executing a kernel, the device program counter wrapped its address
-     * This leaves the process in an inconsistent state and any further CUDA work
+     * space. This leaves the process in an inconsistent state and any further
-     * will return the same error. To continue using CUDA, the process must be terminated
+     * CUDA work will return the same error. To continue using CUDA, the process
-     * and relaunched.
+     * must be terminated and relaunched.
     */
    {"CUDA_ERROR_INVALID_PC", 718},
@ -409,11 +409,13 @@ s_CudaErrorStr sCudaDrvErrorString[] = {
    {"CUDA_ERROR_LAUNCH_FAILED", 719},
    /**
-     * This error indicates that the number of blocks launched per grid for a kernel that was
+     * This error indicates that the number of blocks launched per grid for a
-     * launched via either ::cuLaunchCooperativeKernel or ::cuLaunchCooperativeKernelMultiDevice
+     * kernel that was launched via either ::cuLaunchCooperativeKernel or
-     * exceeds the maximum number of blocks as allowed by ::cuOccupancyMaxActiveBlocksPerMultiprocessor
+     * ::cuLaunchCooperativeKernelMultiDevice exceeds the maximum number of
-     * or ::cuOccupancyMaxActiveBlocksPerMultiprocessorWithFlags times the number of multiprocessors
+     * blocks as allowed by ::cuOccupancyMaxActiveBlocksPerMultiprocessor or
-     * as specified by the device attribute ::CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT.
+     * ::cuOccupancyMaxActiveBlocksPerMultiprocessorWithFlags times the number
     * of multiprocessors as specified by the device attribute
     * ::CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT.
     */
    {"CUDA_ERROR_COOPERATIVE_LAUNCH_TOO_LARGE", 720},
@ -432,13 +434,11 @@ s_CudaErrorStr sCudaDrvErrorString[] = {
     * This indicates that an unknown internal error has occurred.
     */
    {"CUDA_ERROR_UNKNOWN", 999},
-    {NULL, -1}
+    {NULL, -1}};
 };
 // This is just a linear search through the array, since the error_id's are not
 // always ocurring consecutively
-static 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) {
--- a/iatomic.h
+++ b/iatomic.h
@ -23,9 +23,7 @@
 /// @addtogroup iatomic
 /// @{
-#define GCC_VERSION (__GNUC__ * 10000 \
+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 	+ __GNUC_MINOR__ * 100 \
 	+ __GNUC_PATCHLEVEL__)
 //  gcc before 4.7 didn't support atomic builtins,
 //  use alsa atomic functions.
@ -59,38 +57,32 @@ typedef volatile int atomic_t;
 ///
 /// Set atomic value.
 ///
-#define atomic_set(ptr, val) \
+#define atomic_set(ptr, val) __atomic_store_n(ptr, val, __ATOMIC_SEQ_CST)
    __atomic_store_n(ptr, val, __ATOMIC_SEQ_CST)
 ///
 /// Read atomic value.
 ///
-#define atomic_read(ptr) \
+#define atomic_read(ptr) __atomic_load_n(ptr, __ATOMIC_SEQ_CST)
    __atomic_load_n(ptr, __ATOMIC_SEQ_CST)
 ///
 /// Increment atomic value.
 ///
-#define atomic_inc(ptr) \
+#define atomic_inc(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST)
    __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST)
 ///
 /// Decrement atomic value.
 ///
-#define atomic_dec(ptr) \
+#define atomic_dec(ptr) __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST)
    __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST)
 ///
 /// Add to atomic value.
 ///
-#define atomic_add(val, ptr) \
+#define atomic_add(val, ptr) __atomic_add_fetch(ptr, val, __ATOMIC_SEQ_CST)
    __atomic_add_fetch(ptr, val, __ATOMIC_SEQ_CST)
 ///
 /// Subtract from atomic value.
 ///
-#define atomic_sub(val, ptr) \
+#define atomic_sub(val, ptr) __atomic_sub_fetch(ptr, val, __ATOMIC_SEQ_CST)
    __atomic_sub_fetch(ptr, val, __ATOMIC_SEQ_CST)
 #endif
--- a/misc.h
+++ b/misc.h
@ -24,8 +24,8 @@
 /// @addtogroup misc
 /// @{
 #include <syslog.h>
 #include <stdarg.h>
 #include <syslog.h>
 #include <time.h> // clock_gettime
 //////////////////////////////////////////////////////////////////////////////
@ -46,8 +46,7 @@ extern int SysLogLevel;                 ///< how much information wanted
 //  Prototypes
 //////////////////////////////////////////////////////////////////////////////
-static inline void Syslog(const int, const char *format, ...)
+static inline void Syslog(const int, const char *format, ...) __attribute__((format(printf, 2, 3)));
    __attribute__((format(printf, 2, 3)));
 //////////////////////////////////////////////////////////////////////////////
 //  Inlines
@ -67,8 +66,7 @@ static inline void Syslog(const int, const char *format, ...)
 **	- 2	info
 **	- 3	important debug and fixme's
 */
-static inline void Syslog(const int level, const char *format, ...)
+static inline void Syslog(const int level, const char *format, ...) {
 {
    if (SysLogLevel > level || DebugLevel > level) {
        va_list ap;
@ -86,7 +84,11 @@ static inline void Syslog(const int level, const char *format, ...)
 /**
 **	Show fatal error.
 */
-#define Fatal(fmt...)	do { Error(fmt); abort(); } while (0)
+#define Fatal(fmt...)                                                                                                 \
    do {                                                                                                              \
        Error(fmt);                                                                                                   \
        abort();                                                                                                      \
    } while (0)
 /**
 **	Show warning.
@ -116,8 +118,7 @@ static inline void Syslog(const int level, const char *format, ...)
 **
 **	@param ts	dvb time stamp
 */
-static inline const char *Timestamp2String(int64_t ts)
+static inline const char *Timestamp2String(int64_t ts) {
 {
    static char buf[4][16];
    static int idx;
@ -136,8 +137,7 @@ static inline const char *Timestamp2String(int64_t ts)
 **
 **	@returns ticks in ms,
 */
-static inline uint32_t GetMsTicks(void)
+static inline uint32_t GetMsTicks(void) {
 {
 #ifdef CLOCK_MONOTONIC
    struct timespec tspec;
@ -153,8 +153,7 @@ static inline uint32_t GetMsTicks(void)
 #endif
 }
-static inline uint64_t GetusTicks(void)
+static inline uint64_t GetusTicks(void) {
 {
 #ifdef CLOCK_MONOTONIC
    struct timespec tspec;
--- a/openglosd.cpp
+++ b/openglosd.cpp
--- a/openglosd.h
+++ b/openglosd.h
@ -1,6 +1,7 @@
 #ifndef __SOFTHDDEVICE_OPENGLOSD_H
 #define __SOFTHDDEVICE_OPENGLOSD_H
 // clang-format off
 #include <GL/glew.h>
 #include <GL/freeglut.h>
 #include <GL/gl.h>
@ -36,17 +37,15 @@ extern "C"
 {
 #include <stdint.h>
 #include <libavcodec/avcodec.h>
 #include "audio.h"
 #include "video.h"
 #include "codec.h"
 }
 // clang-format on
 extern "C" pthread_mutex_t OSDMutex;
-struct sOglImage
+struct sOglImage {
 {
    GLuint texture;
    GLint width;
    GLint height;
@ -62,28 +61,18 @@ void ConvertColor(const GLint & colARGB, glm::vec4 & col);
 /****************************************************************************************
 * cShader
 ****************************************************************************************/
-enum eShaderType
+enum eShaderType { stRect, stTexture, stText, stCount };
 {
    stRect,
    stTexture,
    stText,
    stCount
 };
-class cShader
+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)
+    cShader(void){};
-    {
+    virtual ~cShader(void){};
    };
    virtual ~ cShader(void)
    {
    };
    bool Load(eShaderType type);
    void Use(void);
    void SetFloat(const GLchar *name, GLfloat value);
@ -97,11 +86,9 @@ class cShader
 /****************************************************************************************
 * cOglGlyph
 ****************************************************************************************/
-class cOglGlyph:public cListObject
+class cOglGlyph : public cListObject {
 {
  private:
-    struct tKerning
+    struct tKerning {
    {
      public:
        tKerning(FT_ULong prevSym, GLfloat kerning = 0.0f) {
            this->prevSym = prevSym;
@ -124,30 +111,12 @@ class cOglGlyph:public cListObject
  public:
    cOglGlyph(FT_ULong charCode, FT_BitmapGlyph ftGlyph);
    virtual ~cOglGlyph();
-    FT_ULong CharCode(void)
+    FT_ULong CharCode(void) { return charCode; }
-    {
+    int AdvanceX(void) { return advanceX; }
-        return charCode;
+    int BearingLeft(void) const { return bearingLeft; }
-    }
+    int BearingTop(void) const { return bearingTop; }
-    int AdvanceX(void)
+    int Width(void) const { return width; }
-    {
+    int Height(void) const { return height; }
        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(FT_ULong prevSym);
    void SetKerningCache(FT_ULong prevSym, int kerning);
    void BindTexture(void);
@ -156,8 +125,7 @@ class cOglGlyph:public cListObject
 /****************************************************************************************
 * cOglFont
 ****************************************************************************************/
-class cOglFont:public cListObject
+class cOglFont : public cListObject {
 {
  private:
    static bool initiated;
    cString name;
@ -170,26 +138,15 @@ class cOglFont:public cListObject
    mutable cList<cOglGlyph> glyphCache;
    cOglFont(const char *fontName, int charHeight);
    static void Init(void);
  public:
    virtual ~cOglFont(void);
    static cOglFont *Get(const char *name, int charHeight);
    static void Cleanup(void);
-    const char *Name(void)
+    const char *Name(void) { return *name; };
-    {
+    int Size(void) { return size; };
-        return *name;
+    int Bottom(void) { return bottom; };
-    };
+    int Height(void) { return height; };
    int Size(void)
    {
        return size;
    };
    int Bottom(void)
    {
        return bottom;
    };
    int Height(void)
    {
        return height;
    };
    cOglGlyph *Glyph(FT_ULong charCode) const;
    int Kerning(cOglGlyph *glyph, FT_ULong prevSym) const;
 };
@ -198,8 +155,7 @@ class cOglFont:public cListObject
 * cOglFb
 * Framebuffer Object - OpenGL part of a Pixmap
 ****************************************************************************************/
-class cOglFb
+class cOglFb {
 {
  protected:
    bool initiated;
    // GLuint fb;
@ -207,16 +163,14 @@ class cOglFb
    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)
+    bool Initiated(void) { return initiated; }
    {
        return initiated;
    }
    virtual bool Init(void);
    void Bind(void);
    void BindRead(void);
@ -224,38 +178,25 @@ class cOglFb
    virtual void Unbind(void);
    bool BindTexture(void);
    void Blit(GLint destX1, GLint destY1, GLint destX2, GLint destY2);
-    GLint Width(void)
+    GLint Width(void) { return width; };
-    {
+    GLint Height(void) { return height; };
-        return width;
+    bool Scrollable(void) { return scrollable; };
-    };
+    GLint ViewportWidth(void) { return viewPortWidth; };
-    GLint Height(void)
+    GLint ViewportHeight(void) { return viewPortHeight; };
    {
        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"
+ * Output Framebuffer Object - holds Vdpau Output Surface which is our "output
 *framebuffer"
 ****************************************************************************************/
-class cOglOutputFb:public cOglFb
+class cOglOutputFb : public cOglFb {
 {
  protected:
    bool initiated;
  private:
    GLvdpauSurfaceNV surface;
  public:
    GLuint fb;
    GLuint texture;
@ -270,18 +211,9 @@ class cOglOutputFb:public cOglFb
 * cOglVb
 * Vertex Buffer - OpenGl Vertices for the different drawing commands
 ****************************************************************************************/
-enum eVertexBufferType
+enum eVertexBufferType { vbRect, vbEllipse, vbSlope, vbTexture, vbText, vbCount };
 {
    vbRect,
    vbEllipse,
    vbSlope,
    vbTexture,
    vbText,
    vbCount
 };
-class cOglVb
+class cOglVb {
 {
  private:
    eVertexBufferType type;
    eShaderType shader;
@ -291,6 +223,7 @@ class cOglVb
    int sizeVertex2;
    int numVertices;
    GLuint drawMode;
  public:
    cOglVb(int type);
    virtual ~cOglVb(void);
@ -310,141 +243,99 @@ class cOglVb
 /****************************************************************************************
 * cOpenGLCmd
 ****************************************************************************************/
-class cOglCmd
+class cOglCmd {
 {
  protected:
    cOglFb *fb;
  public:
-    cOglCmd(cOglFb * fb)
+    cOglCmd(cOglFb *fb) { this->fb = fb; };
-    {
+    virtual ~cOglCmd(void){};
        this->fb = fb;
    };
    virtual ~ cOglCmd(void)
    {
    };
    virtual const char *Description(void) = 0;
    virtual bool Execute(void) = 0;
 };
-class cOglCmdInitOutputFb:public cOglCmd
+class cOglCmdInitOutputFb : public cOglCmd {
 {
  private:
    cOglOutputFb *oFb;
  public:
    cOglCmdInitOutputFb(cOglOutputFb *oFb);
-    virtual ~ cOglCmdInitOutputFb(void)
+    virtual ~cOglCmdInitOutputFb(void){};
-    {
+    virtual const char *Description(void) { return "InitOutputFramebuffer"; }
    };
    virtual const char *Description(void)
    {
        return "InitOutputFramebuffer";
    }
    virtual bool Execute(void);
 };
-class cOglCmdInitFb:public cOglCmd
+class cOglCmdInitFb : public cOglCmd {
 {
  private:
    cCondWait *wait;
  public:
    cOglCmdInitFb(cOglFb *fb, cCondWait *wait = NULL);
-    virtual ~ cOglCmdInitFb(void)
+    virtual ~cOglCmdInitFb(void){};
-    {
+    virtual const char *Description(void) { return "InitFramebuffer"; }
    };
    virtual const char *Description(void)
    {
        return "InitFramebuffer";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDeleteFb:public cOglCmd
+class cOglCmdDeleteFb : public cOglCmd {
 {
  public:
    cOglCmdDeleteFb(cOglFb *fb);
-    virtual ~ cOglCmdDeleteFb(void)
+    virtual ~cOglCmdDeleteFb(void){};
-    {
+    virtual const char *Description(void) { return "DeleteFramebuffer"; }
    };
    virtual const char *Description(void)
    {
        return "DeleteFramebuffer";
    }
    virtual bool Execute(void);
 };
-class cOglCmdRenderFbToBufferFb:public cOglCmd
+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 ~cOglCmdRenderFbToBufferFb(void){};
-    {
+    virtual const char *Description(void) { return "Render Framebuffer to Buffer"; }
    };
    virtual const char *Description(void)
    {
        return "Render Framebuffer to Buffer";
    }
    virtual bool Execute(void);
 };
-class cOglCmdCopyBufferToOutputFb:public cOglCmd
+class cOglCmdCopyBufferToOutputFb : public cOglCmd {
 {
  private:
    cOglOutputFb *oFb;
    GLint x, y;
  public:
    cOglCmdCopyBufferToOutputFb(cOglFb *fb, cOglOutputFb *oFb, GLint x, GLint y);
-     virtual ~ cOglCmdCopyBufferToOutputFb(void)
+    virtual ~cOglCmdCopyBufferToOutputFb(void){};
-    {
+    virtual const char *Description(void) { return "Copy buffer to OutputFramebuffer"; }
    };
    virtual const char *Description(void)
    {
        return "Copy buffer to OutputFramebuffer";
    }
    virtual bool Execute(void);
 };
-class cOglCmdFill:public cOglCmd
+class cOglCmdFill : public cOglCmd {
 {
  private:
    GLint color;
  public:
    cOglCmdFill(cOglFb *fb, GLint color);
-    virtual ~ cOglCmdFill(void)
+    virtual ~cOglCmdFill(void){};
-    {
+    virtual const char *Description(void) { return "Fill"; }
    };
    virtual const char *Description(void)
    {
        return "Fill";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDrawRectangle:public cOglCmd
+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 ~cOglCmdDrawRectangle(void){};
-    {
+    virtual const char *Description(void) { return "DrawRectangle"; }
    };
    virtual const char *Description(void)
    {
        return "DrawRectangle";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDrawEllipse:public cOglCmd
+class cOglCmdDrawEllipse : public cOglCmd {
 {
  private:
    GLint x, y;
    GLint width, height;
@ -453,39 +344,29 @@ class cOglCmdDrawEllipse:public cOglCmd
    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 ~cOglCmdDrawEllipse(void){};
-    {
+    virtual const char *Description(void) { return "DrawEllipse"; }
    };
    virtual const char *Description(void)
    {
        return "DrawEllipse";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDrawSlope:public cOglCmd
+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 ~cOglCmdDrawSlope(void){};
-    {
+    virtual const char *Description(void) { return "DrawSlope"; }
    };
    virtual const char *Description(void)
    {
        return "DrawSlope";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDrawText:public cOglCmd
+class cOglCmdDrawText : public cOglCmd {
 {
  private:
    GLint x, y;
    GLint limitX;
@ -493,81 +374,63 @@ class cOglCmdDrawText:public cOglCmd
    cString fontName;
    int fontSize;
    unsigned int *symbols;
  public:
-     cOglCmdDrawText(cOglFb * fb, GLint x, GLint y, unsigned int *symbols, GLint limitX, const char *name,
+    cOglCmdDrawText(cOglFb *fb, GLint x, GLint y, unsigned int *symbols, GLint limitX, const char *name, int fontSize,
-        int fontSize, tColor colorText);
+                    tColor colorText);
    virtual ~cOglCmdDrawText(void);
-    virtual const char *Description(void)
+    virtual const char *Description(void) { return "DrawText"; }
    {
        return "DrawText";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDrawImage:public cOglCmd
+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 =
+    cOglCmdDrawImage(cOglFb *fb, tColor *argb, GLint width, GLint height, GLint x, GLint y, bool overlay = true,
-        true, double scaleX = 1.0f, double scaleY = 1.0f);
+                     double scaleX = 1.0f, double scaleY = 1.0f);
    virtual ~cOglCmdDrawImage(void);
-    virtual const char *Description(void)
+    virtual const char *Description(void) { return "Draw Image"; }
    {
        return "Draw Image";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDrawTexture:public cOglCmd
+class cOglCmdDrawTexture : public cOglCmd {
 {
  private:
    sOglImage *imageRef;
    GLint x, y;
  public:
    cOglCmdDrawTexture(cOglFb *fb, sOglImage *imageRef, GLint x, GLint y);
-     virtual ~ cOglCmdDrawTexture(void)
+    virtual ~cOglCmdDrawTexture(void){};
-    {
+    virtual const char *Description(void) { return "Draw Texture"; }
    };
    virtual const char *Description(void)
    {
        return "Draw Texture";
    }
    virtual bool Execute(void);
 };
-class cOglCmdStoreImage:public cOglCmd
+class cOglCmdStoreImage : public cOglCmd {
 {
  private:
    sOglImage *imageRef;
    tColor *data;
  public:
    cOglCmdStoreImage(sOglImage *imageRef, tColor *argb);
    virtual ~cOglCmdStoreImage(void);
-    virtual const char *Description(void)
+    virtual const char *Description(void) { return "Store Image"; }
    {
        return "Store Image";
    }
    virtual bool Execute(void);
 };
-class cOglCmdDropImage:public cOglCmd
+class cOglCmdDropImage : public cOglCmd {
 {
  private:
    sOglImage *imageRef;
    cCondWait *wait;
  public:
    cOglCmdDropImage(sOglImage *imageRef, cCondWait *wait);
-     virtual ~ cOglCmdDropImage(void)
+    virtual ~cOglCmdDropImage(void){};
-    {
+    virtual const char *Description(void) { return "Drop Image"; }
    };
    virtual const char *Description(void)
    {
        return "Drop Image";
    }
    virtual bool Execute(void);
 };
@ -577,8 +440,7 @@ class cOglCmdDropImage:public cOglCmd
 #define OGL_MAX_OSDIMAGES 256
 #define OGL_CMDQUEUE_SIZE 100
-class cOglThread:public cThread
+class cOglThread : public cThread {
 {
  private:
    cCondWait *startWait;
    cCondWait *wait;
@ -597,8 +459,10 @@ class cOglThread:public cThread
    void Cleanup(void);
    int GetFreeSlot(void);
    void ClearSlot(int slot);
  protected:
    virtual void Action(void);
  public:
    cOglThread(cCondWait *startWait, int maxCacheSize);
    virtual ~cOglThread();
@ -607,44 +471,27 @@ class cOglThread:public cThread
    int StoreImage(const cImage &image);
    void DropImageData(int imageHandle);
    sOglImage *GetImageRef(int slot);
-    int MaxTextureSize(void)
+    int MaxTextureSize(void) { return maxTextureSize; };
    {
        return maxTextureSize;
    };
 };
 /****************************************************************************************
 * cOglPixmap
 ****************************************************************************************/
-class cOglPixmap:public cPixmap
+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 =
+    cOglPixmap(std::shared_ptr<cOglThread> oglThread, int Layer, const cRect &ViewPort,
-        cRect::Null);
+               const cRect &DrawPort = cRect::Null);
    virtual ~cOglPixmap(void);
-    cOglFb *Fb(void)
+    cOglFb *Fb(void) { return fb; };
-    {
+    int X(void) { return ViewPort().X(); };
-        return fb;
+    int Y(void) { return ViewPort().Y(); };
-    };
+    virtual bool IsDirty(void) { return dirty; }
-    int X(void)
+    virtual void SetDirty(bool dirty = true) { this->dirty = dirty; }
    {
        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);
@ -654,8 +501,8 @@ class cOglPixmap:public cPixmap
    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 =
+    virtual void DrawBitmap(const cPoint &Point, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0,
-        0, bool Overlay = false);
+                            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);
@ -670,13 +517,13 @@ class cOglPixmap:public cPixmap
 /******************************************************************************
 * cOglOsd
 ******************************************************************************/
-class cOglOsd:public cOsd
+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);
--- a/po/de_DE.po
+++ b/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: 2020-04-15 18:57+0200\n"
+"POT-Creation-Date: 2021-12-27 13:13+0100\n"
 "PO-Revision-Date: blabla\n"
 "Last-Translator: blabla\n"
 "Language-Team: blabla\n"
@ -408,7 +408,7 @@ msgstr ""
 msgid "Hue (-314..314) "
 msgstr ""
-msgid "Monitor Colorspace"
+msgid "Temperature 6500K + x * 100K"
 msgstr ""
 msgid "Color Blindness"
@ -417,6 +417,9 @@ msgstr ""
 msgid "Color Correction (-100..100) "
 msgstr ""
 msgid "Monitor Type"
 msgstr ""
 msgid "Scaling"
 msgstr "Skalierung"
@ -574,15 +577,15 @@ msgstr ""
 msgid "Suspend SoftHdDevice"
 msgstr "Unterbreche SoftHdDevice"
 msgid "Toggle LUT on/off"
 msgstr ""
 msgid "PIP toggle on/off: off"
 msgstr "PIP deaktivieren"
 msgid "PIP toggle on/off: on"
 msgstr "PIP aktivieren"
 msgid "PIP zapmode (not working)"
 msgstr ""
 msgid "PIP channel +"
 msgstr "PIP Kanal +"
@ -715,6 +718,10 @@ msgstr ""
 msgid "[softhddev] no codec known for still picture\n"
 msgstr ""
 #, c-format
 msgid "Too much shaders definded\n"
 msgstr ""
 #, c-format
 msgid "Bad formated geometry please use: [=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]\n"
 msgstr ""
@ -884,6 +891,9 @@ msgstr ""
 msgid "Failed initializing libplacebo\n"
 msgstr ""
 msgid "Failed to create placebo opengl \n"
 msgstr ""
 msgid "Failed to create XCB Surface\n"
 msgstr ""
@ -893,6 +903,9 @@ msgstr ""
 msgid "Failed creating vulkan swapchain!"
 msgstr ""
 msgid "libplacebo: failed initializing swapchain\n"
 msgstr ""
 msgid "Failed initializing libplacebo renderer\n"
 msgstr ""
--- a/ringbuffer.c
+++ b/ringbuffer.c
@ -34,8 +34,7 @@
 #include "ringbuffer.h"
 /// ring buffer structure
-struct _ring_buffer_
+struct _ring_buffer_ {
 {
    char *Buffer;          ///< ring buffer data
    const char *BufferEnd; ///< end of buffer
    size_t Size;           ///< bytes in buffer (for faster calc)
@ -52,8 +51,7 @@ struct _ring_buffer_
 **
 **	@param rb	Ring buffer to reset read/write pointers.
 */
-void RingBufferReset(RingBuffer * rb)
+void RingBufferReset(RingBuffer *rb) {
 {
    rb->ReadPointer = rb->Buffer;
    rb->WritePointer = rb->Buffer;
    atomic_set(&rb->Filled, 0);
@ -67,8 +65,7 @@ void RingBufferReset(RingBuffer * rb)
 **	@returns	Allocated ring buffer, must be freed with
 **			RingBufferDel(), NULL for out of memory.
 */
-RingBuffer *RingBufferNew(size_t size)
+RingBuffer *RingBufferNew(size_t size) {
 {
    RingBuffer *rb;
    if (!(rb = malloc(sizeof(*rb)))) { // allocate structure
@ -89,8 +86,7 @@ RingBuffer *RingBufferNew(size_t size)
 /**
 **	Free an allocated ring buffer.
 */
-void RingBufferDel(RingBuffer * rb)
+void RingBufferDel(RingBuffer *rb) {
 {
    free(rb->Buffer);
    free(rb);
 }
@ -103,8 +99,7 @@ void RingBufferDel(RingBuffer * rb)
 **
 **	@returns	Number of bytes that could be advanced in ring buffer.
 */
-size_t RingBufferWriteAdvance(RingBuffer * rb, size_t cnt)
+size_t RingBufferWriteAdvance(RingBuffer *rb, size_t cnt) {
 {
    size_t n;
    n = rb->Size - atomic_read(&rb->Filled);
@ -142,8 +137,7 @@ size_t RingBufferWriteAdvance(RingBuffer * rb, size_t cnt)
 **	@returns	The number of bytes that could be placed in the ring
 **			buffer.
 */
-size_t RingBufferWrite(RingBuffer * rb, const void *buf, size_t cnt)
+size_t RingBufferWrite(RingBuffer *rb, const void *buf, size_t cnt) {
 {
    size_t n;
    n = rb->Size - atomic_read(&rb->Filled);
@ -184,8 +178,7 @@ size_t RingBufferWrite(RingBuffer * rb, const void *buf, size_t cnt)
 **	@returns	The number of bytes that could be placed in the ring
 **			buffer at the write pointer.
 */
-size_t RingBufferGetWritePointer(RingBuffer * rb, void **wp)
+size_t RingBufferGetWritePointer(RingBuffer *rb, void **wp) {
 {
    size_t n;
    size_t cnt;
@ -212,8 +205,7 @@ size_t RingBufferGetWritePointer(RingBuffer * rb, void **wp)
 **
 **	@returns	Number of bytes that could be advanced in ring buffer.
 */
-size_t RingBufferReadAdvance(RingBuffer * rb, size_t cnt)
+size_t RingBufferReadAdvance(RingBuffer *rb, size_t cnt) {
 {
    size_t n;
    n = atomic_read(&rb->Filled);
@ -250,8 +242,7 @@ size_t RingBufferReadAdvance(RingBuffer * rb, size_t cnt)
 **
 **	@returns	Number of bytes that could be read from ring buffer.
 */
-size_t RingBufferRead(RingBuffer * rb, void *buf, size_t cnt)
+size_t RingBufferRead(RingBuffer *rb, void *buf, size_t cnt) {
 {
    size_t n;
    n = atomic_read(&rb->Filled);
@ -292,8 +283,7 @@ size_t RingBufferRead(RingBuffer * rb, void *buf, size_t cnt)
 **	@returns	The number of bytes that could be read from the ring
 **			buffer at the read pointer.
 */
-size_t RingBufferGetReadPointer(RingBuffer * rb, const void **rp)
+size_t RingBufferGetReadPointer(RingBuffer *rb, const void **rp) {
 {
    size_t n;
    size_t cnt;
@ -319,10 +309,7 @@ size_t RingBufferGetReadPointer(RingBuffer * rb, const void **rp)
 **
 **	@returns	Number of bytes free in buffer.
 */
-size_t RingBufferFreeBytes(RingBuffer * rb)
+size_t RingBufferFreeBytes(RingBuffer *rb) { return rb->Size - atomic_read(&rb->Filled); }
 {
    return rb->Size - atomic_read(&rb->Filled);
 }
 /**
 **	Get used bytes in ring buffer.
@ -331,7 +318,4 @@ size_t RingBufferFreeBytes(RingBuffer * rb)
 **
 **	@returns	Number of bytes used in buffer.
 */
-size_t RingBufferUsedBytes(RingBuffer * rb)
+size_t RingBufferUsedBytes(RingBuffer *rb) { return atomic_read(&rb->Filled); }
 {
    return atomic_read(&rb->Filled);
 }
--- a/shaders.h
+++ b/shaders.h
@ -24,65 +24,47 @@ const char *gl_version = "#version 300 es ";
 * 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
+struct mp_cmat {
 {
    GLfloat m[3][3]; // colormatrix
    GLfloat c[3];    // colormatrix_c
 };
-struct mp_mat
+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},
+struct mp_cmat yuv_bt601 = {
-    						  {0.00000, -0.391762, 2.017232},
+    {{1.164384, 1.164384, 1.164384}, {0.00000, -0.391762, 2.017232}, {1.596027, -0.812968, 0.000000}},
-    						  {1.596027, -0.812968, 0.000000}},
+    {-0.874202, 0.531668, -1.085631}};
 							  {-0.874202, 0.531668, -1.085631}
 };
 // ITU-R BT.709 (HD)
-struct mp_cmat yuv_bt709 = { {{1.164384, 1.164384, 1.164384},
+struct mp_cmat yuv_bt709 = {
-    						  {0.00000, -0.213249, 2.112402},
+    {{1.164384, 1.164384, 1.164384}, {0.00000, -0.213249, 2.112402}, {1.792741, -0.532909, 0.000000}},
-    						  {1.792741, -0.532909, 0.000000}},
+    {-0.972945, 0.301483, -1.133402}};
 							  {-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},
+struct mp_cmat yuv_bt2020ncl = {
-    							  {0.00000, -0.187326, 2.141772},
+    {{1.164384, 1.164384, 1.164384}, {0.00000, -0.187326, 2.141772}, {1.678674, -0.650424, 0.000000}},
-    							  {1.678674, -0.650424, 0.000000}},
+    {-0.915688, 0.347459, -1.148145}};
 								  {-0.915688, 0.347459, -1.148145}
 };
 // ITU-R BT.2020 constant luminance system
-struct mp_cmat yuv_bt2020cl = { {{0.0000, 1.164384, 0.000000},
+struct mp_cmat yuv_bt2020cl = {
-    							 {0.00000, 0.000000, 1.138393},
+    {{0.0000, 1.164384, 0.000000}, {0.00000, 0.000000, 1.138393}, {1.138393, 0.000000, 0.000000}},
-    							 {1.138393, 0.000000, 0.000000}},
+    {-0.571429, -0.073059, -0.571429}};
 							  	 {-0.571429, -0.073059, -0.571429}
 };
-float cms_matrix[3][3] = { {1.660497, -0.124547, -0.018154},
+float cms_matrix[3][3] = {
-						 {-0.587657, 1.132895, -0.100597},
+    {1.660497, -0.124547, -0.018154}, {-0.587657, 1.132895, -0.100597}, {-0.072840, -0.008348, 1.118751}};
 						 {-0.072840, -0.008348, 1.118751}
 };
 // Common constants for SMPTE ST.2084 (PQ)
-static const float PQ_M1 = 2610. / 4096 * 1. / 4,
+static const float PQ_M1 = 2610. / 4096 * 1. / 4, PQ_M2 = 2523. / 4096 * 128, PQ_C1 = 3424. / 4096,
-				   PQ_M2 = 2523. / 4096 * 128,
+                   PQ_C2 = 2413. / 4096 * 32, PQ_C3 = 2392. / 4096 * 32;
 				   PQ_C1 = 3424. / 4096, 
 				   PQ_C2 =    2413. / 4096 * 32, 
 				   PQ_C3 = 2392. / 4096 * 32;
 // Common constants for ARIB STD-B67 (HLG)
-static const float HLG_A = 0.17883277,
+static const float HLG_A = 0.17883277, HLG_B = 0.28466892, HLG_C = 0.55991073;
 				   HLG_B = 0.28466892, 
 				   HLG_C = 0.55991073;
-struct gl_vao_entry
+struct gl_vao_entry {
 {
    // used for shader / glBindAttribLocation
    const char *name;
    // glVertexAttribPointer() arguments
@ -92,20 +74,17 @@ struct gl_vao_entry
    int offset;
 };
-struct vertex_pt
+struct vertex_pt {
 {
    float x, y;
 };
-struct vertex_pi
+struct vertex_pi {
 {
    GLint x, y;
 };
 #define TEXUNIT_VIDEO_NUM 6
-struct vertex
+struct vertex {
 {
    struct vertex_pt position;
    struct vertex_pt texcoord[TEXUNIT_VIDEO_NUM];
 };
@ -114,8 +93,7 @@ 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}
+    {0}};
 };
 #define GLSL(...) pl_shader_append(__VA_ARGS__)
 #define GLSLV(...) pl_shader_append_v(__VA_ARGS__)
@ -123,18 +101,11 @@ static const struct gl_vao_entry vertex_vao[] = {
 char sh[SHADER_LENGTH];
 char shv[SHADER_LENGTH];
-void GL_init()
+void GL_init() { sh[0] = 0; }
 {
    sh[0] = 0;
 }
-void GLV_init()
+void GLV_init() { shv[0] = 0; }
 {
    shv[0] = 0;
 }
-void pl_shader_append(const char *fmt, ...)
+void pl_shader_append(const char *fmt, ...) {
 {
    char temp[1000];
    va_list ap;
@ -145,11 +116,9 @@ void pl_shader_append(const char *fmt, ...)
    if (strlen(sh) + strlen(temp) > SHADER_LENGTH)
        Fatal(_("Shaderlenght fault\n"));
    strcat(sh, temp);
 }
-void pl_shader_append_v(const char *fmt, ...)
+void pl_shader_append_v(const char *fmt, ...) {
 {
    char temp[1000];
    va_list ap;
@ -160,11 +129,9 @@ void pl_shader_append_v(const char *fmt, ...)
    if (strlen(shv) + strlen(temp) > SHADER_LENGTH)
        Fatal(_("Shaderlenght fault\n"));
    strcat(shv, temp);
 }
-static void compile_attach_shader(GLuint program, GLenum type, const char *source)
+static void compile_attach_shader(GLuint program, GLenum type, const char *source) {
 {
    GLuint shader;
    GLint status = 1234, log_length;
    char log[4000];
@ -183,11 +150,9 @@ static void compile_attach_shader(GLuint program, GLenum type, const char *sourc
    glAttachShader(program, shader);
    glDeleteShader(shader);
 }
-static void link_shader(GLuint program)
+static void link_shader(GLuint program) {
 {
    GLint status, log_length;
    glLinkProgram(program);
@ -198,8 +163,7 @@ static void link_shader(GLuint program)
    Debug(3, "Link Status %d loglen %d\n", status, log_length);
 }
-static GLuint sc_generate_osd(GLuint gl_prog)
+static GLuint sc_generate_osd(GLuint gl_prog) {
 {
    Debug(3, "vor create osd\n");
    gl_prog = glCreateProgram();
@ -243,8 +207,7 @@ static GLuint sc_generate_osd(GLuint gl_prog)
    return gl_prog;
 }
-static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
+static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace) {
 {
    char vname[80];
    int n;
@ -333,15 +296,20 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
            GLSL("color.gb = 1.003906 * vec4(texture(texture1, texcoord1)).rg;\n");
        }
        GLSL("// color conversion\n");
-        GLSL("color.rgb = mat3(colormatrix) * color.rgb  + colormatrix_c;     \n");
+        GLSL("color.rgb = mat3(colormatrix) * color.rgb	 + colormatrix_c;     "
             "\n");
        GLSL("color.a = 1.0;				 \n");
        GLSL("// pl_shader_linearize			 \n");
        GLSL("color.rgb = max(color.rgb, 0.0);		 \n");
        //	GLSL("color.rgb = clamp(color.rgb, 0.0, 1.0);	 \n");
        //	GLSL("color.rgb = pow(color.rgb, vec3(2.4));	 \n");
-//      GLSL("color.rgb = mix(vec3(4.0) * color.rgb * color.rgb,exp((color.rgb - vec3(%f))         * vec3(1.0/%f))         + vec3(%f)        , bvec3(lessThan(vec3(0.5), color.rgb)));\n",HLG_C, HLG_A, HLG_B);
+        //	GLSL("color.rgb = mix(vec3(4.0) * color.rgb * color.rgb,exp((color.rgb -
-        GLSL("color.rgb = mix(vec3(4.0) * color.rgb * color.rgb,exp((color.rgb - vec3(0.55991073)) * vec3(1.0/0.17883277)) + vec3(0.28466892), bvec3(lessThan(vec3(0.5), color.rgb)));\n");
+        // vec3(%f))	   * vec3(1.0/%f))	   + vec3(%f)	     ,
        // bvec3(lessThan(vec3(0.5), color.rgb)));\n",HLG_C, HLG_A, HLG_B);
        GLSL("color.rgb = mix(vec3(4.0) * color.rgb * color.rgb,exp((color.rgb - "
             "vec3(0.55991073)) * vec3(1.0/0.17883277)) + vec3(0.28466892), "
             "bvec3(lessThan(vec3(0.5), color.rgb)));\n");
        GLSL("color.rgb *= vec3(1.0/3.17955);		 \n"); // PL_COLOR_SDR_WHITE_HLG
        GLSL("// color mapping				 \n");
        GLSL("color.rgb = cms_matrix * color.rgb;	 \n");
@ -351,7 +319,9 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
        //	GLSL("color.rgb = clamp(color.rgb, 0.0, 1.0);	 \n");
        //	GLSL("color.rgb = pow(color.rgb, vec3(1.0/2.4)); \n");
        GLSL("color.rgb *= vec3(3.17955);		 \n"); // PL_COLOR_SDR_WHITE_HLG
-        GLSL("color.rgb = mix(vec3(0.5) * sqrt(color.rgb), vec3(0.17883277) * log(color.rgb - vec3(0.28466892)) + vec3(0.55991073), bvec3(lessThan(vec3(1.0), color.rgb))); \n");
+        GLSL("color.rgb = mix(vec3(0.5) * sqrt(color.rgb), vec3(0.17883277) * "
             "log(color.rgb - vec3(0.28466892)) + vec3(0.55991073), "
             "bvec3(lessThan(vec3(1.0), color.rgb))); \n");
 #endif
        GLSL("out_color = color;			 \n");
@ -375,7 +345,9 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
 #ifndef GAMMA
        GLSL("// delinearize gamma to sRGB		 \n");
        GLSL("color.rgb = max(color.rgb, 0.0);	       \n");
-        GLSL("color.rgb = mix(color.rgb * vec3(12.92), vec3(1.055) * pow(color.rgb, vec3(1.0/2.4)) - vec3(0.055), bvec3(lessThanEqual(vec3(0.0031308), color.rgb))); \n");
+        GLSL("color.rgb = mix(color.rgb * vec3(12.92), vec3(1.055) * "
             "pow(color.rgb, vec3(1.0/2.4)) - vec3(0.055), "
             "bvec3(lessThanEqual(vec3(0.0031308), color.rgb))); \n");
 #endif
        GLSL("// color mapping		  \n");
        GLSL("out_color = color;	  \n");
@ -416,8 +388,7 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
    return gl_prog;
 }
-static void render_pass_quad(int flip, float xcrop, float ycrop)
+static void render_pass_quad(int flip, float xcrop, float ycrop) {
 {
    struct vertex va[4];
    int n;
    const struct gl_vao_entry *e;
--- a/softhdcuvid.cpp
+++ b/softhdcuvid.cpp
--- a/softhddev.c
+++ b/softhddev.c
@ -24,19 +24,19 @@
 #define noUSE_PIP         ///< include PIP support + new API
 #define noDUMP_TRICKSPEED ///< dump raw trickspeed packets
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #ifdef __FreeBSD__
 #include <signal.h>
 #endif
 #include <fcntl.h>
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <string.h>
 #include <unistd.h>
 #include <libintl.h>
 #define _(str) gettext(str) ///< gettext shortcut
@ -54,9 +54,11 @@
 #include "misc.h"
 #include "softhddev.h"
 // clang-format off
 #include "audio.h"
 #include "video.h"
 #include "codec.h"
 // clang-format on
 #ifdef DEBUG
 static int DumpH264(const uint8_t *data, int size);
@ -108,32 +110,26 @@ int AudioDelay = 0;
 static const uint16_t BitRateTable[2][4][16] = {
    // MPEG Version 1
    {{},
-        {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,
+     {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
            0},
     {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 0},
     {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0}},
    // MPEG Version 2 & 2.5
    {{},
     {0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0},
     {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0},
-        {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0}
+     {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0}}};
        }
 };
 ///
 /// Mpeg samperate table.
 ///
-static const uint16_t SampleRateTable[4] = {
+static const uint16_t SampleRateTable[4] = {44100, 48000, 32000, 0};
    44100, 48000, 32000, 0
 };
 ///
 /// Fast check for Mpeg audio.
 ///
 /// 4 bytes 0xFFExxxxx Mpeg audio
 ///
-static inline int FastMpegCheck(const uint8_t * p)
+static inline int FastMpegCheck(const uint8_t *p) {
 {
    if (p[0] != 0xFF) { // 11bit frame sync
        return 0;
    }
@ -185,8 +181,7 @@ static inline int FastMpegCheck(const uint8_t * p)
 /// Layer II & III:
 /// FrameLengthInBytes = 144 * BitRate / SampleRate + Padding
 ///
-static int MpegCheck(const uint8_t * data, int size)
+static int MpegCheck(const uint8_t *data, int size) {
 {
    int mpeg2;
    int mpeg25;
    int layer;
@ -232,7 +227,10 @@ static int MpegCheck(const uint8_t * data, int size)
            break;
    }
    if (0) {
-        Debug(3, "pesdemux: mpeg%s layer%d bitrate=%d samplerate=%d %d bytes\n", mpeg25 ? "2.5" : mpeg2 ? "2" : "1",
+        Debug(3, "pesdemux: mpeg%s layer%d bitrate=%d samplerate=%d %d bytes\n",
              mpeg25  ? "2.5"
              : mpeg2 ? "2"
                      : "1",
              layer, bit_rate, sample_rate, frame_size);
    }
@ -252,8 +250,7 @@ static int MpegCheck(const uint8_t * data, int size)
 ///
 /// 3 bytes 0x56Exxx AAC LATM audio
 ///
-static inline int FastLatmCheck(const uint8_t * p)
+static inline int FastLatmCheck(const uint8_t *p) {
 {
    if (p[0] != 0x56) { // 11bit sync
        return 0;
    }
@ -275,8 +272,7 @@ static inline int FastLatmCheck(const uint8_t * p)
 /// @retval 0	no valid AAC LATM audio
 /// @retval >0	valid AAC LATM audio
 ///
-static int LatmCheck(const uint8_t * data, int size)
+static int LatmCheck(const uint8_t *data, int size) {
 {
    int frame_size;
    // 13 bit frame size without header
@ -300,15 +296,13 @@ static int LatmCheck(const uint8_t * data, int size)
 /// from ATSC A/52 table 5.18 frame size code table.
 ///
 const uint16_t Ac3FrameSizeTable[38][3] = {
-    {64, 69, 96}, {64, 70, 96}, {80, 87, 120}, {80, 88, 120},
+    {64, 69, 96},       {64, 70, 96},       {80, 87, 120},      {80, 88, 120},      {96, 104, 144},
-    {96, 104, 144}, {96, 105, 144}, {112, 121, 168}, {112, 122, 168},
+    {96, 105, 144},     {112, 121, 168},    {112, 122, 168},    {128, 139, 192},    {128, 140, 192},
-    {128, 139, 192}, {128, 140, 192}, {160, 174, 240}, {160, 175, 240},
+    {160, 174, 240},    {160, 175, 240},    {192, 208, 288},    {192, 209, 288},    {224, 243, 336},
-    {192, 208, 288}, {192, 209, 288}, {224, 243, 336}, {224, 244, 336},
+    {224, 244, 336},    {256, 278, 384},    {256, 279, 384},    {320, 348, 480},    {320, 349, 480},
-    {256, 278, 384}, {256, 279, 384}, {320, 348, 480}, {320, 349, 480},
+    {384, 417, 576},    {384, 418, 576},    {448, 487, 672},    {448, 488, 672},    {512, 557, 768},
-    {384, 417, 576}, {384, 418, 576}, {448, 487, 672}, {448, 488, 672},
+    {512, 558, 768},    {640, 696, 960},    {640, 697, 960},    {768, 835, 1152},   {768, 836, 1152},
-    {512, 557, 768}, {512, 558, 768}, {640, 696, 960}, {640, 697, 960},
+    {896, 975, 1344},   {896, 976, 1344},   {1024, 1114, 1536}, {1024, 1115, 1536}, {1152, 1253, 1728},
    {768, 835, 1152}, {768, 836, 1152}, {896, 975, 1344}, {896, 976, 1344},
    {1024, 1114, 1536}, {1024, 1115, 1536}, {1152, 1253, 1728},
    {1152, 1254, 1728}, {1280, 1393, 1920}, {1280, 1394, 1920},
 };
@ -317,8 +311,7 @@ const uint16_t Ac3FrameSizeTable[38][3] = {
 ///
 /// 5 bytes 0x0B77xxxxxx AC-3 audio
 ///
-static inline int FastAc3Check(const uint8_t * p)
+static inline int FastAc3Check(const uint8_t *p) {
 {
    if (p[0] != 0x0B) { // 16bit sync
        return 0;
    }
@ -360,8 +353,7 @@ static inline int FastAc3Check(const uint8_t * p)
 /// o e 2x  Framesize code
 /// o f 2x  Framesize code 2
 ///
-static int Ac3Check(const uint8_t * data, int size)
+static int Ac3Check(const uint8_t *data, int size) {
 {
    int frame_size;
    if (size < 5) { // need 5 bytes to see if AC-3/E-AC-3
@ -408,8 +400,7 @@ static int Ac3Check(const uint8_t * data, int size)
 ///
 /// 7/9 bytes 0xFFFxxxxxxxxxxx(xxxx)  ADTS audio
 ///
-static inline int FastAdtsCheck(const uint8_t * p)
+static inline int FastAdtsCheck(const uint8_t *p) {
 {
    if (p[0] != 0xFF) { // 12bit sync
        return 0;
    }
@ -445,8 +436,7 @@ static inline int FastAdtsCheck(const uint8_t * p)
 /// o ..
 /// o M*13  frame length
 ///
-static int AdtsCheck(const uint8_t * data, int size)
+static int AdtsCheck(const uint8_t *data, int size) {
 {
    int frame_size;
    if (size < 6) {
@ -475,8 +465,7 @@ static int AdtsCheck(const uint8_t * data, int size)
 ///
 /// PES type.
 ///
-enum
+enum {
 {
    PES_PROG_STREAM_MAP = 0xBC,
    PES_PRIVATE_STREAM1 = 0xBD,
    PES_PADDING_STREAM = 0xBE, ///< filler, padding stream
@ -498,8 +487,7 @@ enum
 ///
 /// PES parser state.
 ///
-enum
+enum {
 {
    PES_INIT, ///< unknown codec
    PES_SKIP,    ///< skip packet
@ -520,8 +508,7 @@ enum
 ///
 /// PES demuxer.
 ///
-typedef struct _pes_demux_
+typedef struct _pes_demux_ {
 {
    // int Pid;		///< packet id
    // int PcrPid;	///< program clock reference pid
    // int StreamType;	    ///< stream type
@ -544,8 +531,7 @@ typedef struct _pes_demux_
 ///
 /// Reset packetized elementary stream demuxer.
 ///
-static void PesReset(PesDemux * pesdx)
+static void PesReset(PesDemux *pesdx) {
 {
    pesdx->State = PES_INIT;
    pesdx->Index = 0;
    pesdx->Skip = 0;
@ -559,8 +545,7 @@ static void PesReset(PesDemux * pesdx)
 ///
 /// @param pesdx    packetized elementary stream demuxer
 ///
-static void PesInit(PesDemux * pesdx)
+static void PesInit(PesDemux *pesdx) {
 {
    memset(pesdx, 0, sizeof(*pesdx));
    pesdx->Size = PES_MAX_PAYLOAD;
    pesdx->Buffer = av_malloc(PES_MAX_PAYLOAD + AV_INPUT_BUFFER_PADDING_SIZE);
@ -578,8 +563,7 @@ static void PesInit(PesDemux * pesdx)
 /// @param size number of payload data bytes
 /// @param is_start flag, start of pes packet
 ///
-static void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_start)
+static void PesParse(PesDemux *pesdx, const uint8_t *data, int size, int is_start) {
 {
    const uint8_t *p;
    const uint8_t *q;
@ -728,8 +712,7 @@ static void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_st
                    unsigned code;
                    // bad mpeg pes packet start code prefix 0x00001xx
-                    if (pesdx->Header[0] || pesdx->Header[1]
+                    if (pesdx->Header[0] || pesdx->Header[1] || pesdx->Header[2] != 0x01) {
                        || pesdx->Header[2] != 0x01) {
                        Debug(3, "pesdemux: bad pes packet\n");
                        pesdx->State = PES_SKIP;
                        return;
@ -776,21 +759,16 @@ static void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_st
                    int64_t dts;
                    if ((pesdx->Header[7] & 0xC0) == 0x80) {
-                        pts =
+                        pts = (int64_t)(data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 |
-                            (int64_t) (data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7
+                              data[12] << 7 | (data[13] & 0xFE) >> 1;
                            | (data[13]
                            & 0xFE) >> 1;
                        pesdx->PTS = pts;
                        pesdx->DTS = AV_NOPTS_VALUE;
                    } else if ((pesdx->Header[7] & 0xC0) == 0xC0) {
-                        pts =
+                        pts = (int64_t)(data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 |
-                            (int64_t) (data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7
+                              data[12] << 7 | (data[13] & 0xFE) >> 1;
                            | (data[13]
                            & 0xFE) >> 1;
                        pesdx->PTS = pts;
-                        dts =
+                        dts = (int64_t)(data[14] & 0x0E) << 29 | data[15] << 22 | (data[16] & 0xFE) << 14 |
-                            (int64_t) (data[14] & 0x0E) << 29 | data[15] << 22 | (data[16] & 0xFE) << 14 | data[17] <<
+                              data[17] << 7 | (data[18] & 0xFE) >> 1;
                            7 | (data[18] & 0xFE) >> 1;
                        pesdx->DTS = dts;
                        Debug(4, "pesdemux: pts %#012" PRIx64 " %#012" PRIx64 "\n", pts, dts);
                    }
@ -896,8 +874,7 @@ typedef struct _ts_demux_ TsDemux;
 ///
 /// transport stream demuxer structure.
 ///
-struct _ts_demux_
+struct _ts_demux_ {
 {
    int Packets; ///< packets between PCR
 };
@ -912,8 +889,7 @@ static PesDemux PesDemuxAudio[1];       ///< audio demuxer
 ///
 /// @returns number of bytes consumed from buffer.
 ///
-static int TsDemuxer(TsDemux * tsdx, const uint8_t * data, int size)
+static int TsDemuxer(TsDemux *tsdx, const uint8_t *data, int size) {
 {
    const uint8_t *p;
    p = data;
@ -987,8 +963,7 @@ static int TsDemuxer(TsDemux * tsdx, const uint8_t * data, int size)
 **  @param size size of PES packet
 **  @param id	PES packet type
 */
-int PlayAudio(const uint8_t * data, int size, uint8_t id)
+int PlayAudio(const uint8_t *data, int size, uint8_t id) {
 {
    int n;
    const uint8_t *p;
@ -1045,15 +1020,14 @@ int PlayAudio(const uint8_t * data, int size, uint8_t id)
    }
    if (data[7] & 0x80 && n >= 5) {
-        AudioAvPkt->pts =
+        AudioAvPkt->pts = (int64_t)(data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7 |
-            (int64_t) (data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7 | (data[13] &
+                          (data[13] & 0xFE) >> 1;
            0xFE) >> 1;
        // Debug(3, "audio: pts %#012" PRIx64 "\n", AudioAvPkt->pts);
    }
    if (0) { // dts is unused
        if (data[7] & 0x40) {
-            AudioAvPkt->dts = (int64_t) (data[14] & 0x0E) << 29 | data[15] << 22 | (data[16]
+            AudioAvPkt->dts = (int64_t)(data[14] & 0x0E) << 29 | data[15] << 22 | (data[16] & 0xFE) << 14 |
-                & 0xFE) << 14 | data[17] << 7 | (data[18] & 0xFE) >> 1;
+                              data[17] << 7 | (data[18] & 0xFE) >> 1;
            Debug(3, "audio: dts %#012" PRIx64 "\n", AudioAvPkt->dts);
        }
    }
@ -1219,8 +1193,7 @@ int PlayAudio(const uint8_t * data, int size, uint8_t id)
 **
 **  @returns number of bytes consumed;
 */
-int PlayTsAudio(const uint8_t * data, int size)
+int PlayTsAudio(const uint8_t *data, int size) {
 {
    static TsDemux tsdx[1];
    if (SkipAudio || !MyAudioDecoder) { // skip audio
@ -1256,7 +1229,6 @@ int PlayTsAudio(const uint8_t * data, int size)
        usleep(AudioDelay * 1000);
        AudioDelay = 0;
        // TsDemuxer(tsdx, data, size);	  // insert dummy audio
    }
    return TsDemuxer(tsdx, data, size);
 }
@ -1268,16 +1240,12 @@ int PlayTsAudio(const uint8_t * data, int size)
 **
 **  @param volume   VDR volume (0 .. 255)
 */
-void SetVolumeDevice(int volume)
+void SetVolumeDevice(int volume) { AudioSetVolume((volume * 1000) / 255); }
 {
    AudioSetVolume((volume * 1000) / 255);
 }
 /**
 *** Resets channel ID (restarts audio).
 **/
-void ResetChannelId(void)
+void ResetChannelId(void) {
 {
    AudioChannelID = -1;
    Debug(3, "audio/demux: reset channel id\n");
 }
@ -1292,8 +1260,7 @@ void ResetChannelId(void)
 /**
 **  Video output stream device structure.   Parser, decoder, display.
 */
-struct __video_stream__
+struct __video_stream__ {
 {
    VideoHwDecoder *HwDecoder;        ///< video hardware decoder
    VideoDecoder *Decoder;            ///< video decoder
    pthread_mutex_t DecoderLockMutex; ///< video decoder lock mutex
@ -1348,8 +1315,7 @@ static volatile char Usr1Signal;        ///< true got usr1 signal
 **
 **  @param stream   video stream
 */
-static void VideoPacketInit(VideoStream * stream)
+static void VideoPacketInit(VideoStream *stream) {
 {
    int i;
    for (i = 0; i < VIDEO_PACKET_MAX; ++i) {
@ -1371,8 +1337,7 @@ static void VideoPacketInit(VideoStream * stream)
 **
 **  @param stream   video stream
 */
-static void VideoPacketExit(VideoStream * stream)
+static void VideoPacketExit(VideoStream *stream) {
 {
    int i;
    atomic_set(&stream->PacketsFilled, 0);
@ -1390,8 +1355,7 @@ static void VideoPacketExit(VideoStream * stream)
 **  @param data data of pes packet
 **  @param size size of pes packet
 */
-static void VideoEnqueue(VideoStream * stream, int64_t pts, int64_t dts, const void *data, int size)
+static void VideoEnqueue(VideoStream *stream, int64_t pts, int64_t dts, const void *data, int size) {
 {
    AVPacket *avpkt;
    // Debug(3, "video: enqueue %d\n", size);
@ -1408,8 +1372,7 @@ static void VideoEnqueue(VideoStream * stream, int64_t pts, int64_t dts, const v
        // avpkt->stream_index + size);
        // new + grow reserves FF_INPUT_BUFFER_PADDING_SIZE
-        av_grow_packet(avpkt, ((size + VIDEO_BUFFER_SIZE / 2)
+        av_grow_packet(avpkt, ((size + VIDEO_BUFFER_SIZE / 2) / (VIDEO_BUFFER_SIZE / 2)) * (VIDEO_BUFFER_SIZE / 2));
                / (VIDEO_BUFFER_SIZE / 2)) * (VIDEO_BUFFER_SIZE / 2));
        // FIXME: out of memory!
 #ifdef DEBUG
        if (avpkt->size <= avpkt->stream_index + size) {
@ -1435,8 +1398,7 @@ static void VideoEnqueue(VideoStream * stream, int64_t pts, int64_t dts, const v
 **
 **  @param stream   video stream
 */
-static void VideoResetPacket(VideoStream * stream)
+static void VideoResetPacket(VideoStream *stream) {
 {
    AVPacket *avpkt;
    stream->StartCodeState = 0; // reset start code state
@ -1454,8 +1416,7 @@ static void VideoResetPacket(VideoStream * stream)
 **  @param stream   video stream
 **  @param codec_id codec id of packet (MPEG/H264)
 */
-static void VideoNextPacket(VideoStream * stream, int codec_id)
+static void VideoNextPacket(VideoStream *stream, int codec_id) {
 {
    AVPacket *avpkt;
    avpkt = &stream->PacketRb[stream->PacketWrite];
@ -1506,8 +1467,7 @@ static void VideoNextPacket(VideoStream * stream, int codec_id)
 **  @param data data of pes packet
 **  @param size size of pes packet
 */
-static void VideoMpegEnqueue(VideoStream * stream, int64_t pts, int64_t dts, const uint8_t * data, int size)
+static void VideoMpegEnqueue(VideoStream *stream, int64_t pts, int64_t dts, const uint8_t *data, int size) {
 {
    static const char startcode[3] = {0x00, 0x00, 0x01};
    const uint8_t *p;
    int n;
@ -1666,8 +1626,7 @@ static void VideoMpegEnqueue(VideoStream * stream, int64_t pts, int64_t dts, con
 */
 #ifndef USE_PIP
-static void FixPacketForFFMpeg(VideoDecoder * vdecoder, AVPacket * avpkt)
+static void FixPacketForFFMpeg(VideoDecoder *vdecoder, AVPacket *avpkt) {
 {
    uint8_t *p;
    int n;
    AVPacket tmp[1];
@ -1732,8 +1691,7 @@ static void FixPacketForFFMpeg(VideoDecoder * vdecoder, AVPacket * avpkt)
 **
 **  @param stream   video stream
 */
-static void VideoStreamOpen(VideoStream * stream)
+static void VideoStreamOpen(VideoStream *stream) {
 {
    stream->SkipStream = 1;
    stream->CodecID = AV_CODEC_ID_NONE;
    stream->LastCodecID = AV_CODEC_ID_NONE;
@ -1753,8 +1711,7 @@ static void VideoStreamOpen(VideoStream * stream)
 **  @note must be called from the video thread, otherwise xcb has a
 **  deadlock.
 */
-static void VideoStreamClose(VideoStream * stream, int delhw)
+static void VideoStreamClose(VideoStream *stream, int delhw) {
 {
    stream->SkipStream = 1;
    if (stream->Decoder) {
        VideoDecoder *decoder;
@ -1791,8 +1748,7 @@ static void VideoStreamClose(VideoStream * stream, int delhw)
 **  @retval 1	something todo
 **  @retval -1	empty stream
 */
-int VideoPollInput(VideoStream * stream)
+int VideoPollInput(VideoStream *stream) {
 {
    if (!stream->Decoder || !stream->HwDecoder) { // closing
 #ifdef DEBUG
        fprintf(stderr, "no decoder\n");
@ -1832,8 +1788,7 @@ int VideoPollInput(VideoStream * stream)
 **  @retval 1	stream paused
 **  @retval -1	empty stream
 */
-int VideoDecodeInput(VideoStream * stream, int trick)
+int VideoDecodeInput(VideoStream *stream, int trick) {
 {
    int filled;
    AVPacket *avpkt;
    int saved_size;
@ -1982,18 +1937,14 @@ int VideoDecodeInput(VideoStream * stream, int trick)
 **
 **  @param stream   video stream
 */
-int VideoGetBuffers(const VideoStream * stream)
+int VideoGetBuffers(const VideoStream *stream) { return atomic_read(&stream->PacketsFilled); }
 {
    return atomic_read(&stream->PacketsFilled);
 }
 /**
 **  Try video start.
 **
 **  NOT TRUE: Could be called, when already started.
 */
-static void StartVideo(void)
+static void StartVideo(void) {
 {
    VideoInit(X11DisplayName);
    if (ConfigFullscreen) {
@ -2010,8 +1961,7 @@ static void StartVideo(void)
 /**
 **  Stop video.
 */
-static void StopVideo(void)
+static void StopVideo(void) {
 {
    VideoOsdExit();
    VideoExit();
    AudioSyncStream = NULL;
@ -2050,8 +2000,7 @@ static void StopVideo(void)
 **
 **  Function to dump a mpeg packet, not needed.
 */
-static void DumpMpeg(const uint8_t * data, int size)
+static void DumpMpeg(const uint8_t *data, int size) {
 {
    fprintf(stderr, "%8d: ", size);
    // b3 b4 b8 00 b5 ... 00 b5 ...
@ -2074,8 +2023,7 @@ static void DumpMpeg(const uint8_t * data, int size)
 **
 **  Function to Dump a h264 packet, not needed.
 */
-static int DumpH264(const uint8_t * data, int size)
+static int DumpH264(const uint8_t *data, int size) {
 {
    printf("H264:");
    do {
        if (size < 4) {
@ -2098,8 +2046,7 @@ static int DumpH264(const uint8_t * data, int size)
 **
 **  Function to validate a mpeg packet, not needed.
 */
-static int ValidateMpeg(const uint8_t * data, int size)
+static int ValidateMpeg(const uint8_t *data, int size) {
 {
    int pes_l;
    do {
@ -2138,8 +2085,7 @@ static int ValidateMpeg(const uint8_t * data, int size)
 **  @return number of bytes used, 0 if internal buffer are full.
 **
 */
-int PlayVideo3(VideoStream * stream, const uint8_t * data, int size)
+int PlayVideo3(VideoStream *stream, const uint8_t *data, int size) {
 {
    const uint8_t *check;
    int64_t pts, dts;
    int n;
@ -2201,8 +2147,8 @@ int PlayVideo3(VideoStream * stream, const uint8_t * data, int size)
    }
 #ifdef USE_SOFTLIMIT
    // soft limit buffer full
-    if (AudioSyncStream == stream && atomic_read(&stream->PacketsFilled) > 3
+    if (AudioSyncStream == stream && atomic_read(&stream->PacketsFilled) > 3 &&
-        && AudioUsedBytes() > AUDIO_MIN_BUFFER_FREE * 2) {
+        AudioUsedBytes() > AUDIO_MIN_BUFFER_FREE * 2) {
        return 0;
    }
 #endif
@ -2210,17 +2156,14 @@ int PlayVideo3(VideoStream * stream, const uint8_t * data, int size)
    pts = AV_NOPTS_VALUE;
    dts = AV_NOPTS_VALUE;
    if ((data[7] & 0xc0) == 0x80) {
-        pts =
+        pts = (int64_t)(data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7 |
-            (int64_t) (data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7 | (data[13] &
+              (data[13] & 0xFE) >> 1;
            0xFE) >> 1;
    }
    if ((data[7] & 0xC0) == 0xc0) {
-        pts =
+        pts = (int64_t)(data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7 |
-            (int64_t) (data[9] & 0x0E) << 29 | data[10] << 22 | (data[11] & 0xFE) << 14 | data[12] << 7 | (data[13] &
+              (data[13] & 0xFE) >> 1;
-            0xFE) >> 1;
+        dts = (int64_t)(data[14] & 0x0E) << 29 | data[15] << 22 | (data[16] & 0xFE) << 14 | data[17] << 7 |
-        dts =
+              (data[18] & 0xFE) >> 1;
            (int64_t) (data[14] & 0x0E) << 29 | data[15] << 22 | (data[16] & 0xFE) << 14 | data[17] << 7 | (data[18] &
            0xFE) >> 1;
    }
    check = data + 9 + n;
@ -2370,10 +2313,7 @@ int PlayVideo3(VideoStream * stream, const uint8_t * data, int size)
 **
 **  @todo FIXME: combine the 5 ifs at start of the function
 */
-int PlayVideo(const uint8_t * data, int size)
+int PlayVideo(const uint8_t *data, int size) { return PlayVideo3(MyVideoStream, data, size); }
 {
    return PlayVideo3(MyVideoStream, data, size);
 }
 /// call VDR support function
 extern uint8_t *CreateJpeg(uint8_t *, int *, int, int, int);
@ -2392,8 +2332,7 @@ extern uint8_t *CreateJpeg(uint8_t *, int *, int, int, int);
 **
 **  @returns allocated jpeg image.
 */
-uint8_t *CreateJpeg(uint8_t * image, int raw_size, int *size, int quality, int width, int height)
+uint8_t *CreateJpeg(uint8_t *image, int raw_size, int *size, int quality, int width, int height) {
 {
    struct jpeg_compress_struct cinfo;
    struct jpeg_error_mgr jerr;
    JSAMPROW row_ptr[1];
@ -2440,8 +2379,7 @@ uint8_t *CreateJpeg(uint8_t * image, int raw_size, int *size, int quality, int w
 **  @param width    number of horizontal pixels in the frame
 **  @param height   number of vertical pixels in the frame
 */
-uint8_t *GrabImage(int *size, int jpeg, int quality, int width, int height)
+uint8_t *GrabImage(int *size, int jpeg, int quality, int width, int height) {
 {
    if (jpeg) {
        uint8_t *image;
        int raw_size;
@ -2468,8 +2406,7 @@ uint8_t *GrabImage(int *size, int jpeg, int quality, int width, int height)
 **
 **  @param play_mode	play mode (none, video+audio, audio-only, ...)
 */
-int SetPlayMode(int play_mode)
+int SetPlayMode(int play_mode) {
 {
    Debug(3, "Set Playmode %d\n", play_mode);
    switch (play_mode) {
        case 0: // audio/video from decoder
@ -2520,8 +2457,7 @@ int SetPlayMode(int play_mode)
 **  Gets the current System Time Counter, which can be used to
 **  synchronize audio, video and subtitles.
 */
-int64_t GetSTC(void)
+int64_t GetSTC(void) {
 {
    if (MyVideoStream->HwDecoder) {
        return VideoGetClock(MyVideoStream->HwDecoder);
    }
@ -2537,8 +2473,7 @@ int64_t GetSTC(void)
 **  @param height[OUT]	height of video stream
 **  @param aspect[OUT]	aspect ratio (4/3, 16/9, ...) of video stream
 */
-void GetVideoSize(int *width, int *height, double *aspect)
+void GetVideoSize(int *width, int *height, double *aspect) {
 {
 #ifdef DEBUG
    static int done_width;
    static int done_height;
@ -2572,8 +2507,7 @@ void GetVideoSize(int *width, int *height, double *aspect)
 **
 **  @param speed    trick speed
 */
-void TrickSpeed(int speed)
+void TrickSpeed(int speed) {
 {
    MyVideoStream->TrickSpeed = speed;
    if (MyVideoStream->HwDecoder) {
        VideoSetTrickSpeed(MyVideoStream->HwDecoder, speed);
@ -2588,8 +2522,7 @@ void TrickSpeed(int speed)
 /**
 **  Clears all video and audio data from the device.
 */
-void Clear(void)
+void Clear(void) {
 {
    int i;
    VideoResetPacket(MyVideoStream); // terminate work
@ -2611,8 +2544,7 @@ void Clear(void)
 /**
 **  Sets the device into play mode.
 */
-void Play(void)
+void Play(void) {
 {
    TrickSpeed(0); // normal play
    SkipAudio = 0;
    AudioPlay();
@ -2621,8 +2553,7 @@ void Play(void)
 /**
 **  Sets the device into "freeze frame" mode.
 */
-void Freeze(void)
+void Freeze(void) {
 {
    StreamFreezed = 1;
    MyVideoStream->Freezed = 1;
    AudioPause();
@ -2631,8 +2562,7 @@ void Freeze(void)
 /**
 **  Turns off audio while replaying.
 */
-void Mute(void)
+void Mute(void) {
 {
    SkipAudio = 1;
    AudioFlushBuffers();
    // AudioSetVolume(0);
@ -2644,8 +2574,7 @@ void Mute(void)
 **  @param data pes frame data
 **  @param size number of bytes in frame
 */
-void StillPicture(const uint8_t * data, int size)
+void StillPicture(const uint8_t *data, int size) {
 {
    static uint8_t seq_end_mpeg[] = {0x00, 0x00, 0x01, 0xB7};
    // H264 NAL End of Sequence
    static uint8_t seq_end_h264[] = {0x00, 0x00, 0x00, 0x01, 0x0A};
@ -2718,7 +2647,8 @@ void StillPicture(const uint8_t * data, int size)
                n -= 6 + len;
            } while (n > 6);
-            VideoNextPacket(MyVideoStream, MyVideoStream->CodecID); // terminate last packet
+            VideoNextPacket(MyVideoStream,
                            MyVideoStream->CodecID); // terminate last packet
        } else {                                     // ES packet
            if (MyVideoStream->CodecID != AV_CODEC_ID_MPEG2VIDEO) {
                VideoNextPacket(MyVideoStream, AV_CODEC_ID_NONE); // close last stream
@ -2733,7 +2663,8 @@ void StillPicture(const uint8_t * data, int size)
        } else {
            VideoEnqueue(MyVideoStream, AV_NOPTS_VALUE, AV_NOPTS_VALUE, seq_end_mpeg, sizeof(seq_end_mpeg));
        }
-        VideoNextPacket(MyVideoStream, MyVideoStream->CodecID); // terminate last packet
+        VideoNextPacket(MyVideoStream,
                        MyVideoStream->CodecID); // terminate last packet
    }
    // wait for empty buffers
@ -2763,8 +2694,7 @@ void StillPicture(const uint8_t * data, int size)
 **  @retval true    if ready
 **  @retval false   if busy
 */
-int Poll(int timeout)
+int Poll(int timeout) {
 {
    // poll is only called during replay, flush buffers after replay
    MyVideoStream->ClearClose = 1;
    for (;;) {
@ -2777,8 +2707,8 @@ int Poll(int timeout)
        // FIXME: no video!
        filled = atomic_read(&MyVideoStream->PacketsFilled);
        // soft limit + hard limit
-        full = (used > AUDIO_MIN_BUFFER_FREE && filled > 3)
+        full = (used > AUDIO_MIN_BUFFER_FREE && filled > 3) || AudioFreeBytes() < AUDIO_MIN_BUFFER_FREE ||
-            || AudioFreeBytes() < AUDIO_MIN_BUFFER_FREE || filled >= VIDEO_PACKET_MAX - 10;
+               filled >= VIDEO_PACKET_MAX - 10;
        if (!full || !timeout) {
            return !full;
@ -2798,8 +2728,7 @@ int Poll(int timeout)
 **
 **  @param timeout  timeout to flush in ms
 */
-int Flush(int timeout)
+int Flush(int timeout) {
 {
    if (atomic_read(&MyVideoStream->PacketsFilled)) {
        if (timeout) { // let display thread work
            usleep(timeout * 1000);
@ -2820,8 +2749,7 @@ int Flush(int timeout)
 **  @param height[OUT]	height of OSD
 **  @param aspect[OUT]	aspect ratio (4/3, 16/9, ...) of OSD
 */
-void GetOsdSize(int *width, int *height, double *aspect)
+void GetOsdSize(int *width, int *height, double *aspect) {
 {
 #ifdef DEBUG
    static int done_width;
    static int done_height;
@ -2842,10 +2770,7 @@ void GetOsdSize(int *width, int *height, double *aspect)
 /**
 **  Close OSD.
 */
-void OsdClose(void)
+void OsdClose(void) { VideoOsdClear(); }
 {
    VideoOsdClear();
 }
 /**
 **  Draw an OSD pixmap.
@ -2859,8 +2784,7 @@ void OsdClose(void)
 **  @param x	x-coordinate on screen of argb image
 **  @param y	y-coordinate on screen of argb image
 */
-void OsdDrawARGB(int xi, int yi, int height, int width, int pitch, const uint8_t * argb, int x, int y)
+void OsdDrawARGB(int xi, int yi, int height, int width, int pitch, const uint8_t *argb, int x, int y) {
 {
    // wakeup display for showing remote learning dialog
    VideoDisplayWakeup();
    VideoOsdDrawARGB(xi, yi, height, width, pitch, argb, x, y);
@ -2871,27 +2795,33 @@ void OsdDrawARGB(int xi, int yi, int height, int width, int pitch, const uint8_t
 /**
 **  Return command line help string.
 */
-const char *CommandLineHelp(void)
+const char *CommandLineHelp(void) {
 {
    return "  -a device\taudio device (fe. alsa: hw:0,0 oss: /dev/dsp)\n"
           "  -p device\taudio device for pass-through (hw:0,1 or /dev/dsp1)\n"
-        "  -c channel\taudio mixer channel name (fe. PCM)\n" "  -d display\tdisplay of x11 server (fe. :0.0)\n"
+           "  -c channel\taudio mixer channel name (fe. PCM)\n"
           "	-d display\tdisplay of x11 server (fe. :0.0)\n"
           "  -f\t\tstart with fullscreen window (only with window manager)\n"
-        "  -g geometry\tx11 window geometry wxh+x+y\n" "  -r Refresh\tRefreshrate for DRM (default is 50 Hz)\n"
+           "  -g geometry\tx11 window geometry wxh+x+y\n"
           "  -r Refresh\tRefreshrate for DRM (default is 50 Hz)\n"
           "  -C Connector\tConnector for DRM (default is current Connector)\n"
-		"  -S shader\tShader to use.\n\t\tOnly with placebo. Can be repeated for more shaders\n"
+           "  -S shader\tShader to use.\n\t\tOnly with placebo. Can be repeated "
-        "  -v device\tvideo driver device (cuvid)\n" "  -s\t\tstart in suspended mode\n"
+           "for more shaders\n"
           "  -v device\tvideo driver device (cuvid)\n"
           "	-s\t\tstart in suspended mode\n"
           "  -x\t\tstart x11 server, with -xx try to connect, if this fails\n"
-        "  -X args\tX11 server arguments (f.e. -nocursor)\n" "  -w workaround\tenable/disable workarounds\n"
+           "  -X args\tX11 server arguments (f.e. -nocursor)\n"
           "	-w workaround\tenable/disable workarounds\n"
           "\tno-hw-decoder\t\tdisable hw decoder, use software decoder only\n"
           "\tno-mpeg-hw-decoder\tdisable hw decoder for mpeg only\n"
           "\tstill-hw-decoder\tenable hardware decoder for still-pictures\n"
           "\tstill-h264-hw-decoder\tenable h264 hw decoder for still-pictures\n"
           "\talsa-driver-broken\tdisable broken alsa driver message\n"
           "\talsa-no-close-open\tdisable close open to fix alsa no sound bug\n"
-        "\talsa-close-open-delay\tenable close open delay to fix no sound bug\n"
+           "\talsa-close-open-delay\tenable close open delay to fix no sound "
           "bug\n"
           "\tignore-repeat-pict\tdisable repeat pict message\n"
-        "\tuse-possible-defect-frames prefer faster channel switch\n" "  -D\t\tstart in detached mode\n";
+           "\tuse-possible-defect-frames prefer faster channel switch\n"
           "	 -D\t\tstart in detached mode\n";
 }
 /**
@ -2900,8 +2830,7 @@ const char *CommandLineHelp(void)
 **  @param argc number of arguments
 **  @param argv arguments vector
 */
-int ProcessArgs(int argc, char *const argv[])
+int ProcessArgs(int argc, char *const argv[]) {
 {
    //
    //	Parse arguments.
    //
@ -2943,8 +2872,8 @@ int ProcessArgs(int argc, char *const argv[])
                continue;
            case 'g': // geometry
                if (VideoSetGeometry(optarg) < 0) {
-                    fprintf(stderr,
+                    fprintf(stderr, _("Bad formated geometry please use: "
-                        _("Bad formated geometry please use: [=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]\n"));
+                                      "[=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]\n"));
                    return 0;
                }
                continue;
@ -3032,8 +2961,7 @@ static pid_t X11ServerPid;              ///< x11 server pid
 **
 **  @param sig	signal number
 */
-static void Usr1Handler(int __attribute__((unused)) sig)
+static void Usr1Handler(int __attribute__((unused)) sig) {
 {
    ++Usr1Signal;
    Debug(3, "x-setup: got signal usr1\n");
@ -3042,8 +2970,7 @@ static void Usr1Handler(int __attribute__((unused)) sig)
 /**
 **  Start the X server
 */
-static void StartXServer(void)
+static void StartXServer(void) {
 {
    struct sigaction usr1;
    pid_t pid;
    const char *sval;
@ -3126,8 +3053,7 @@ static void StartXServer(void)
 /**
 **  Exit + cleanup.
 */
-void SoftHdDeviceExit(void)
+void SoftHdDeviceExit(void) {
 {
    // lets hope that vdr does a good thread cleanup
    AudioExit();
@ -3190,8 +3116,7 @@ void SoftHdDeviceExit(void)
 **  @retval 1	suspended start
 **  @retval -1	detached start
 */
-int Start(void)
+int Start(void) {
 {
    if (ConfigStartX11Server) {
        StartXServer();
    }
@ -3234,8 +3159,7 @@ int Start(void)
 **
 **  @note stop everything, but don't cleanup, module is still called.
 */
-void Stop(void)
+void Stop(void) {
 {
 #ifdef DEBUG
    Debug(3, "video: max used PES packet size: %d\n", VideoMaxPacketSize);
 #endif
@ -3244,8 +3168,7 @@ void Stop(void)
 /**
 **  Perform any cleanup or other regular tasks.
 */
-void Housekeeping(void)
+void Housekeeping(void) {
 {
    //
    //	when starting an own X11 server fails, try to connect to a already
    //	running X11 server.  This can take some time.
@ -3274,8 +3197,7 @@ void Housekeeping(void)
 /**
 **  Main thread hook, periodic called from main thread.
 */
-void MainThreadHook(void)
+void MainThreadHook(void) {
 {
    if (Usr1Signal) { // x11 server ready
        // FIYME: x11 server keeps sending sigusr1 signals
        signal(SIGUSR1, SIG_IGN); // ignore further signals
@ -3299,8 +3221,7 @@ extern void DelPip(void);
 **  @param audio    suspend closes audio
 **  @param dox11    suspend closes x11 server
 */
-void Suspend(int video, int audio, int dox11)
+void Suspend(int video, int audio, int dox11) {
 {
    pthread_mutex_lock(&SuspendLockMutex);
    if (MyVideoStream->SkipStream && SkipAudio) { // already suspended
        pthread_mutex_unlock(&SuspendLockMutex);
@ -3342,8 +3263,7 @@ void Suspend(int video, int audio, int dox11)
 /**
 **  Resume plugin.
 */
-void Resume(void)
+void Resume(void) {
 {
    if (!MyVideoStream->SkipStream && !SkipAudio) { // we are not suspended
        return;
    }
@ -3382,8 +3302,7 @@ void Resume(void)
 **  @param[out] count	number of decoded frames
 */
 void GetStats(int *missed, int *duped, int *dropped, int *counter, float *frametime, int *width, int *height,
-    int *color, int *eotf)
+              int *color, int *eotf) {
 {
    *missed = 0;
    *duped = 0;
    *dropped = 0;
@ -3407,12 +3326,14 @@ void GetStats(int *missed, int *duped, int *dropped, int *counter, float *framet
 **  @param width    video window width OSD relative
 **  @param height   video window height OSD relative
 */
-void ScaleVideo(int x, int y, int width, int height)
+void ScaleVideo(int x, int y, int width, int height) {
 {
 #ifdef USE_PIP
    if (PiPActive && !(x & y & width & height)) {
        Info("[softhddev]%s: fullscreen with PiP active.\n", __FUNCTION__);
-        x = mwx; y = mwy; width = mww; height = mwh;
+        x = mwx;
        y = mwy;
        width = mww;
        height = mwh;
    }
 #endif
    if (MyVideoStream->HwDecoder) {
@ -3438,8 +3359,7 @@ void ScaleVideo(int x, int y, int width, int height)
 **  @param pip_width	pip window width OSD relative
 **  @param pip_height	pip window height OSD relative
 */
-void PipSetPosition(int x, int y, int width, int height, int pip_x, int pip_y, int pip_width, int pip_height)
+void PipSetPosition(int x, int y, int width, int height, int pip_x, int pip_y, int pip_width, int pip_height) {
 {
    if (!MyVideoStream->HwDecoder) { // video not running
        return;
    }
@ -3463,8 +3383,7 @@ void PipSetPosition(int x, int y, int width, int height, int pip_x, int pip_y, i
 **  @param pip_width	pip window width OSD relative
 **  @param pip_height	pip window height OSD relative
 */
-void PipStart(int x, int y, int width, int height, int pip_x, int pip_y, int pip_width, int pip_height)
+void PipStart(int x, int y, int width, int height, int pip_x, int pip_y, int pip_width, int pip_height) {
 {
    if (!MyVideoStream->HwDecoder) { // video not running
        return;
    }
@ -3473,15 +3392,17 @@ void PipStart(int x, int y, int width, int height, int pip_x, int pip_y, int pip
        VideoStreamOpen(PipVideoStream);
    }
    PipSetPosition(x, y, width, height, pip_x, pip_y, pip_width, pip_height);
-    mwx = x; mwy = y; mww = width; mwh = height;
+    mwx = x;
    mwy = y;
    mww = width;
    mwh = height;
    PiPActive = 1;
 }
 /**
 **  Stop PIP.
 */
-void PipStop(void)
+void PipStop(void) {
 {
    int i;
    if (!MyVideoStream->HwDecoder) { // video not running
@ -3489,7 +3410,10 @@ void PipStop(void)
    }
    PiPActive = 0;
-    mwx = 0; mwy = 0; mww = 0; mwh = 0;
+    mwx = 0;
    mwy = 0;
    mww = 0;
    mwh = 0;
    ScaleVideo(0, 0, 0, 0);
    PipVideoStream->Close = 1;
@ -3507,9 +3431,6 @@ void PipStop(void)
 **
 **  @return number of bytes used, 0 if internal buffer are full.
 */
-int PipPlayVideo(const uint8_t * data, int size)
+int PipPlayVideo(const uint8_t *data, int size) { return PlayVideo3(PipVideoStream, data, size); }
 {
    return PlayVideo3(PipVideoStream, data, size);
 }
 #endif
--- a/softhddev.h
+++ b/softhddev.h
@ -21,8 +21,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifdef __cplusplus
-extern "C"
+extern "C" {
 {
 #endif
 /// C callback feed key press
 extern void FeedKeyPress(const char *, const char *, int, int, const char *);
--- a/softhddevice_service.h
+++ b/softhddevice_service.h
@ -26,11 +26,9 @@
 #define ATMO1_GRAB_SERVICE "SoftHDDevice-AtmoGrabService-v1.1"
 #define OSD_3DMODE_SERVICE "SoftHDDevice-Osd3DModeService-v1.0"
-enum
+enum { GRAB_IMG_RGBA_FORMAT_B8G8R8A8 };
 { GRAB_IMG_RGBA_FORMAT_B8G8R8A8 };
-typedef struct
+typedef struct {
 {
    int structSize;
    // request data
@ -45,13 +43,11 @@ typedef struct
    void *img;
 } SoftHDDevice_AtmoGrabService_v1_0_t;
-typedef struct
+typedef struct {
 {
    int Mode;
 } SoftHDDevice_Osd3DModeService_v1_0_t;
-typedef struct
+typedef struct {
 {
    // request/reply data
    int width;
--- a/video.c
+++ b/video.c
--- a/video.h
+++ b/video.h
@ -45,6 +45,7 @@ extern char VideoIgnoreRepeatPict;      ///< disable repeat pict warning
 extern int VideoAudioDelay;              ///< audio/video delay
 extern char ConfigStartX11Server;        ///< flag start the x11 server
 extern char MyConfigDir[];
 //----------------------------------------------------------------------------
 //  Prototypes
 //----------------------------------------------------------------------------