From d5dec38d62e8db6d34dc0e747c370926056390f9 Mon Sep 17 00:00:00 2001
From: jojo61 <joachim.koenig@gmx.net>
Date: Sat, 9 Jul 2022 12:52:28 +0200
Subject: [PATCH 1/3] remove glxMakeCurrent

---
 softhdcuvid.cpp | 2 +-
 video.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/softhdcuvid.cpp b/softhdcuvid.cpp
index 1935050..adc8ef6 100644
--- a/softhdcuvid.cpp
+++ b/softhdcuvid.cpp
@@ -61,7 +61,7 @@ extern void ToggleLUT();
 /// vdr-plugin version number.
 /// Makefile extracts the version number for generating the file name
 /// for the distribution archive.
-static const char *const VERSION = "3.6"
+static const char *const VERSION = "3.7"
 #ifdef GIT_REV
                                    "-GIT" GIT_REV
 #endif
diff --git a/video.c b/video.c
index c084606..73e4caf 100644
--- a/video.c
+++ b/video.c
@@ -1227,7 +1227,7 @@ static void EglExit(void) {
     // must destroy glx
     // if (glXGetCurrentContext() == glxContext) {
     // if currently used, set to none
-    glXMakeCurrent(XlibDisplay, None, NULL);
+    // glXMakeCurrent(XlibDisplay, None, NULL);
     // }
     if (OSDcontext) {
         glXDestroyContext(XlibDisplay, OSDcontext);

From 79fa8efc6ae6a341162eceb41b7d1db7aa418a02 Mon Sep 17 00:00:00 2001
From: jojo61 <joachim.koenig@gmx.net>
Date: Tue, 20 Sep 2022 15:05:18 +0200
Subject: [PATCH 2/3] Fix E-AC3 Parser

---
 softhdcuvid.cpp | 2 +-
 softhddev.c     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/softhdcuvid.cpp b/softhdcuvid.cpp
index adc8ef6..3a52b09 100644
--- a/softhdcuvid.cpp
+++ b/softhdcuvid.cpp
@@ -61,7 +61,7 @@ extern void ToggleLUT();
 /// vdr-plugin version number.
 /// Makefile extracts the version number for generating the file name
 /// for the distribution archive.
-static const char *const VERSION = "3.7"
+static const char *const VERSION = "3.7.1"
 #ifdef GIT_REV
                                    "-GIT" GIT_REV
 #endif
diff --git a/softhddev.c b/softhddev.c
index b4a8f0c..29a7da2 100644
--- a/softhddev.c
+++ b/softhddev.c
@@ -364,7 +364,7 @@ static int Ac3Check(const uint8_t *data, int size) {
         if ((data[4] & 0xF0) == 0xF0) { // invalid fscod fscod2
             return 0;
         }
-        frame_size = ((data[2] & 0x03) << 8) + data[3] + 1;
+        frame_size = ((data[2] & 0x07) << 8) + data[3] + 1;
         frame_size *= 2;
     } else { // AC-3
         int fscod;
@@ -2142,7 +2142,7 @@ int PlayVideo3(VideoStream *stream, const uint8_t *data, int size) {
     }
     // hard limit buffer full: needed for replay
     if (atomic_read(&stream->PacketsFilled) >= VIDEO_PACKET_MAX - 10) {
-        // Debug(3, "video: video buffer full\n");
+        //Debug(3, "video: video buffer full\n");
         return 0;
     }
 #ifdef USE_SOFTLIMIT

From af370721d4654be3f30bc61ca4a46b52d158bce1 Mon Sep 17 00:00:00 2001
From: jojo61 <joachim.koenig@gmx.net>
Date: Sat, 24 Sep 2022 14:59:46 +0200
Subject: [PATCH 3/3] Fix Audio for NUC11

---
 audio.c         | 19 ++++++++++++++++++-
 softhdcuvid.cpp |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/audio.c b/audio.c
index d5a21c2..7c0c405 100644
--- a/audio.c
+++ b/audio.c
@@ -1951,7 +1951,7 @@ void AudioSetVolume(int volume) {
     }
     AudioAmplifier = volume;
     if (!AudioSoftVolume) {
-        AudioUsedModule->SetVolume(volume);
+        //AudioUsedModule->SetVolume(volume);
     }
 }
 
@@ -2173,6 +2173,22 @@ found:
     AudioDoingInit = 1;
     AudioRingInit();
     AudioUsedModule->Init();
+
+#if 1
+    for (u = 0; u < AudioRatesMax; ++u) {
+       
+        AudioChannelMatrix[u][1]=AudioChannelMatrix[u][2]=AudioChannelMatrix[u][3]=AudioChannelMatrix[u][4]=\
+        AudioChannelMatrix[u][5]=AudioChannelMatrix[u][6]=AudioChannelMatrix[u][7]=AudioChannelMatrix[u][8]=2;
+        //printf("audio: %6dHz supports %d %d %d %d %d %d %d %d channels\n", AudioRatesTable[u],
+        //    AudioChannelMatrix[u][1], AudioChannelMatrix[u][2], AudioChannelMatrix[u][3], AudioChannelMatrix[u][4],
+        //    AudioChannelMatrix[u][5], AudioChannelMatrix[u][6], AudioChannelMatrix[u][7], AudioChannelMatrix[u][8]);
+
+    }
+
+    AudioChannelsInHw[1]=AudioChannelsInHw[3]=AudioChannelsInHw[4]=AudioChannelsInHw[5]=AudioChannelsInHw[6]=AudioChannelsInHw[7]=AudioChannelsInHw[8]=0;
+    AudioChannelsInHw[2]=2;
+
+#else
     //
     //	Check which channels/rates/formats are supported
     //	FIXME: we force 44.1Khz and 48Khz must be supported equal
@@ -2294,6 +2310,7 @@ found:
              AudioChannelMatrix[u][1], AudioChannelMatrix[u][2], AudioChannelMatrix[u][3], AudioChannelMatrix[u][4],
              AudioChannelMatrix[u][5], AudioChannelMatrix[u][6], AudioChannelMatrix[u][7], AudioChannelMatrix[u][8]);
     }
+#endif
 #ifdef USE_AUDIO_THREAD
     if (AudioUsedModule->Thread) { // supports threads
         AudioInitThread();
diff --git a/softhdcuvid.cpp b/softhdcuvid.cpp
index 3a52b09..c6932aa 100644
--- a/softhdcuvid.cpp
+++ b/softhdcuvid.cpp
@@ -61,7 +61,7 @@ extern void ToggleLUT();
 /// vdr-plugin version number.
 /// Makefile extracts the version number for generating the file name
 /// for the distribution archive.
-static const char *const VERSION = "3.7.1"
+static const char *const VERSION = "3.7.2"
 #ifdef GIT_REV
                                    "-GIT" GIT_REV
 #endif