fix: multithreading issue.

Remove parameter ""-mpegts_flags nit" in ffmpeghandler

Author: Zabrimus

Diff for: device.cpp

@@ -21,6 +21,7 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
           sidScanEnabledM(false),
           pidScanEnabledM(false),
           channelM() {
+
     unsigned int bufsize = (unsigned int) IPTV_BUFFER_SIZE;
     bufsize -= (bufsize % TS_SIZE);
     info("Creating IPTV device %d (CardIndex=%d)", deviceIndexM, CardIndex());
@@ -46,6 +47,8 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
     AttachFilter(pSidScannerM = new cSidScanner());
     // Check if dvr fifo exists
     struct stat sb;
+    memset(&sb, 0, sizeof(struct stat));
+
     cString filename = cString::sprintf(IPTV_DVR_FILENAME, deviceIndexM);
     stat(filename, &sb);
     if (S_ISFIFO(sb.st_mode)) {

Diff for: ffmpeghandler.cpp

@@ -138,8 +138,8 @@ std::vector<std::string> FFmpegHandler::prepareStreamCmdVideo(const m3u_stream&
     callStr.emplace_back("-mpegts_flags");
     callStr.emplace_back("system_b");
 
-    callStr.emplace_back("-mpegts_flags");
-    callStr.emplace_back("nit");
+    // callStr.emplace_back("-mpegts_flags");
+    // callStr.emplace_back("nit");
 
     callStr.emplace_back("-metadata");
     callStr.emplace_back("service_name=" + stream.channelName);
@@ -216,8 +216,8 @@ std::vector<std::string> FFmpegHandler::prepareStreamCmdAudio(const m3u_stream&
     callStr.emplace_back("-mpegts_flags");
     callStr.emplace_back("system_b");
 
-    callStr.emplace_back("-mpegts_flags");
-    callStr.emplace_back("nit");
+    // callStr.emplace_back("-mpegts_flags");
+    // callStr.emplace_back("nit");
 
     callStr.emplace_back("-metadata");
     callStr.emplace_back("service_name=" + stream.channelName);
@@ -277,7 +277,7 @@ bool FFmpegHandler::streamAudio(const m3u_stream& stream) {
 
     streamHandler = new TinyProcessLib::Process(callStr, "",
             [this](const char *bytes, size_t n) {
-                debug9("Queue size %ld\n", tsPackets.size());
+                debug9("Add new packets. Current queue size %ld\n", tsPackets.size());
 
                 std::lock_guard<std::mutex> guard(queueMutex);
                 tsPackets.emplace(bytes, n);
@@ -305,6 +305,7 @@ void FFmpegHandler::stop() {
         streamHandler = nullptr;
     }
 
+    std::lock_guard<std::mutex> guard(queueMutex);
     std::queue<std::string> empty;
     std::swap(tsPackets, empty);
 }
@@ -315,17 +316,20 @@ int FFmpegHandler::popPackets(unsigned char* bufferAddrP, unsigned int bufferLen
         std::string front = tsPackets.front();
 
         if (bufferLenP < front.size()) {
+            // this shall never happen. A possible solution is to use a deque instead
+            // and modify the front element. Unsure, if this is worth the effort, because
+            // a full buffer points to another problem.
             error("WARNING: BufferLen %u < Size %ld\n", bufferLenP, front.size());
-            return -1;
+            return 0;
         }
 
-        debug9("Read from queue, size %ld\n", front.size());
+        debug9("Read from queue: len %ld, size %ld bytes\n", tsPackets.size(), front.size());
 
         memcpy(bufferAddrP, front.data(), front.size());
 
         tsPackets.pop();
         return front.size();
     }
 
-    return -1;
+    return 0;
 }

Diff for: iptv.cpp

@@ -22,6 +22,9 @@
 #endif
 
 const char VERSION[] = "2.4.0" GITVERSION;
+static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
+
+const char *cPluginIptv::Description() { return tr(DESCRIPTION); }
 
 cPluginIptv::cPluginIptv() : deviceCountM(1) {
     debug16("%s", __PRETTY_FUNCTION__);

Diff for: iptv.h

@@ -13,7 +13,7 @@
 #include "device.h"
 #include "iptvservice.h"
 
-static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
+
 
 class cPluginIptv : public cPlugin {
 private:
@@ -25,7 +25,7 @@ class cPluginIptv : public cPlugin {
     ~cPluginIptv() override;
 
     const char *Version() override { return VERSION; }
-    const char *Description() override { return tr(DESCRIPTION); }
+    const char *Description() override;
     const char *CommandLineHelp() override;
 
     bool ProcessArgs(int argc, char *argv[]) override;

Diff for: protocolm3u.cpp

@@ -30,6 +30,8 @@ bool cIptvProtocolM3U::Open() {
 
         auto streams = m3u8Handler.parseM3u(url);
         if (streams.width == 0 || streams.height == 0) {
+            debug1("Unable to read URL '%s'\n", url.c_str());
+
             isActiveM = false;
             return false;
         }
@@ -68,6 +70,7 @@ bool cIptvProtocolM3U::Close() {
 
     isActiveM = false;
     handler.stop();
+
     return true;
 }
 

Diff for: streamer.cpp

@@ -66,6 +66,7 @@ void cIptvStreamer::Action() {
 }
 
 bool cIptvStreamer::Open() {
+    std::lock_guard<std::mutex> guard(streamerMutex);
     debug1("%s", __PRETTY_FUNCTION__);
 
     // Open the protocol
@@ -74,10 +75,12 @@ bool cIptvStreamer::Open() {
 
     // Start thread
     Start();
+
     return true;
 }
 
 bool cIptvStreamer::Close() {
+    std::lock_guard<std::mutex> guard(streamerMutex);
     debug1("%s", __PRETTY_FUNCTION__);
 
     // Stop thread
@@ -96,6 +99,7 @@ bool cIptvStreamer::Close() {
 }
 
 bool cIptvStreamer::SetSource(const char *locationP, const int parameterP, const int indexP, cIptvProtocolIf *protocolP, int channelNumber) {
+    std::lock_guard<std::mutex> guard(streamerMutex);
     debug1("%s (%s, %d, %d, ChannelNumber: %d)", __PRETTY_FUNCTION__, locationP, parameterP, indexP, channelNumber);
 
     if (!isempty(locationP)) {

Diff for: streamer.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <mutex>
 #include <arpa/inet.h>
 
 #include <vdr/thread.h>
@@ -23,6 +24,8 @@ class cIptvStreamer : public cThread, public cIptvStreamerStatistics {
     unsigned int packetBufferLenM;
     cIptvProtocolIf *protocolM;
 
+    std::mutex streamerMutex;
+
 protected:
     void Action() override;