Merge branch 'master' into develop

# Conflicts:
#	common.cpp
#	common.h
#	device.cpp
#	device.h
#	ffmpeghandler.cpp
#	pidscanner.cpp
#	pidscanner.h
#	sidscanner.cpp

Author: Zabrimus

HISTORY

@@ -300,3 +300,10 @@ VDR Plugin 'iptv' Revision History
 2024-07-17: Version 2.6.0
 - Add new stream protocols RADIO and M3U
 
+2024-07-22: Version 2.6.1
+- fix multithreading issue
+
+2024-xx-xx: Version xxx
+- Add new stream protocol STREAM
+- set the default thread-queue-size from 8 to 32
+- New plugin parameter -s to set the thread-queue-size

Makefile

@@ -78,7 +78,8 @@ all-redirect: all
 OBJS = $(PLUGIN).o common.o config.o device.o pidscanner.o \
 	protocolcurl.o protocolext.o protocolfile.o protocolhttp.o \
 	protocoludp.o sectionfilter.o setup.o sidscanner.o socket.o \
-	protocolm3u.o protocolradio.o m3u8handler.o process.o process_unix.o ffmpeghandler.o \
+	protocolm3u.o protocolradio.o protocolstream.o \
+	m3u8handler.o process.o process_unix.o ffmpeghandler.o \
 	source.o statistics.o streamer.o
 
 ### The main target:
@@ -87,10 +88,6 @@ all: $(SOFILE) i18n
 
 ### Implicit rules:
 
-%.o: %.c Makefile
-	@echo CC $@
-	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-
 %.o: %.cpp Makefile
 	@echo CC $@
 	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
@@ -100,7 +97,7 @@ all: $(SOFILE) i18n
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	$(Q)$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	$(Q)$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.cpp) > $@
 
 -include $(DEPFILE)
 
@@ -116,10 +113,6 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	@echo MO $@
 	$(Q)msgfmt -c -o $@ $<
 
-#$(I18Npot): $(wildcard *.c)
-#	@echo GT $@
-#	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
-
 $(I18Npot): $(wildcard *.cpp)
 	@echo GT $@
 	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
@@ -170,4 +163,4 @@ clean:
 
 .PHONY: cppcheck
 cppcheck:
-	$(Q)cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)
+	$(Q)cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.cpp)

README

@@ -19,6 +19,7 @@ Requirements:
 
 - Libcurl - the multiprotocol file transfer library
   http://curl.haxx.se/libcurl/
+- yt-dlp  - optional. Used for protocol M3U.
 
 Description:
 
@@ -74,10 +75,18 @@ Information menu:
 - [Yellow:Filters]                 Opens the section filter statistics page.
 - [Blue:Bits/bytes]                Toggles between bits and bytes mode.
 
+Plugin parameters:
+   -d <num>,  --devices=<number>            number of devices to be created
+   -t <mode>, --trace=<mode>               set the tracing mode
+   -s <num>,  --thread-queue-size=<number> set the FFmpeg thread-queue-size
+   -y <path>, --ytdlp=<path>               set the path to yt-dlp. Default /usr/local/bin/yt-dlp
+
 Configuration:
 
 - channels.conf
 
+  TV8;IPTV:70:S=1|P=0|F=M3U|U=other.cfg|A=2|Y=1:I:0:200:201,202,203,204,205:0:0:11:1:100:0
+  ST1:IPTV:90:S=1|P=0|F=STREAM|U=http%3A//locahost/stream?id=10|A=1:I:0:514:670:2321:0:5:0:200:0
   RD1:IPTV:80:S=1|P=0|F=RADIO|U=http%3A//wdr-1live-live.icecast.wdr.de/wdr/1live/live/mp3/128/stream.mp3|A=8:I:0:270:271,272,273,274,275:0:0:8:1:9:8
   TV7;IPTV:70:S=1|P=0|F=M3U|U=list1.cfg|A=5:I:0:200:201,202,203,204,205:0:0:11:1:100:0
   TV6;IPTV:60:S=1|P=0|F=EXT|U=iptvstream.sh|A=0:I:0:0:680:0:0:6:0:0:0
@@ -87,13 +96,16 @@ Configuration:
   TV2;IPTV:20:S=1|P=0|F=UDP|[email protected]|A=1234:I:0:512:650:2321:0:2:0:0:0
   TV1;IPTV:10:S=1|P=0|F=UDP|U=127.0.0.1|A=1234:I:0:512:650:2321:0:1:0:0:0
            ^  ^   ^   ^     ^           ^      ^
+           |  |   |   |     |           |      |
            |  |   |   |     |           |      Source type ("I")
            |  |   |   |     |           Stream parameter
            |  |   |   |     |            UDP:  multicast port
            |  |   |   |     |            CURL: <<to be defined>>
            |  |   |   |     |            HTTP: HTTP port number
            |  |   |   |     |            FILE: file delay (ms)
            |  |   |   |     |            EXT:  script parameter
+           |  |   |   |     |            M3U:  Y=1 uses yt-dlp to determine the video URL
+           |  |   |   |     |                  Y=2 tries to find the video URL internally
            |  |   |   |     Stream address
            |  |   |   |      UDP:  multicast [source@]group address
            |  |   |   |      CURL: HTTP/HTTPS URL; colons (%3A) and pipes (%7C) shall be URL encoded
@@ -102,7 +114,8 @@ Configuration:
            |  |   |   |      EXT:  script location
            |  |   |   |      M3U:  m3u playlist
            |  |   |   |      RADIO:  An URL for a radio stream
-           |  |   |   Stream protocol ("UDP", "CURL", "HTTP", "FILE", "EXT", "M3U", "RADIO")
+           |  |   |   |      STREAM:  An URL for a video stream
+           |  |   |   Stream protocol ("UDP", "CURL", "HTTP", "FILE", "EXT", "M3U", "RADIO", "STREAM")
            |  |   Pid scanner ("0" disable, "1" enable)
            |  Section id (Sid/Nid/Tid) scanner ("0" disable, "1" enable)
            Unique enumeration
@@ -155,6 +168,9 @@ External streaming:
   TID  = 100  Select a transponder.
   RID  = 0    (Radio only 1)
 
+  It is possible to use parameter Y=1 to use yt-dlp to determine the m3u8 URL.
+  Useful e.g. for youtube videos. Needs yt-dlp.
+
 Notes:
 
 - Working EIT requires correct Nid/Tid/Sid values as the NIT filter cannot

common.cpp

@@ -9,85 +9,99 @@
 #include <vdr/tools.h>
 #include "common.h"
 
-uint16_t ts_pid(const uint8_t *bufP)
-{
-  return (uint16_t)(((bufP[1] & 0x1f) << 8) + bufP[2]);
+uint16_t ts_pid(const uint8_t *bufP) {
+    return (uint16_t) (((bufP[1] & 0x1f) << 8) + bufP[2]);
 }
 
-uint8_t payload(const uint8_t *bufP)
-{
-  if (!(bufP[3] & 0x10)) // no payload?
-     return 0;
-
-  if (bufP[3] & 0x20) {  // adaptation field?
-     if (bufP[4] > 183)  // corrupted data?
+uint8_t payload(const uint8_t *bufP) {
+    if (!(bufP[3] & 0x10)) {// no payload?
         return 0;
-     else
-        return (uint8_t)((184 - 1) - bufP[4]);
-     }
+    }
+
+    if (bufP[3] & 0x20) {  // adaptation field?
+        if (bufP[4] > 183) { // corrupted data?
+            return 0;
+        } else {
+            return (uint8_t) ((184 - 1) - bufP[4]);
+        }
+    }
 
-  return 184;
+    return 184;
 }
 
-const char *id_pid(const u_short pidP)
-{
-  for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
-      if (pidP == section_filter_table[i].pid)
-         return section_filter_table[i].tag;
-      }
-  return "---";
+const char *id_pid(const u_short pidP) {
+    for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
+        if (pidP==section_filter_table[i].pid) {
+            return section_filter_table[i].tag;
+        }
+    }
+    return "---";
 }
 
-int select_single_desc(int descriptorP, const int usecsP, const bool selectWriteP)
-{
-  // Wait for data
-  struct timeval tv;
-  tv.tv_sec = 0;
-  tv.tv_usec = usecsP;
-  // Use select
-  fd_set infd;
-  fd_set outfd;
-  fd_set errfd;
-  FD_ZERO(&infd);
-  FD_ZERO(&outfd);
-  FD_ZERO(&errfd);
-  FD_SET(descriptorP, &errfd);
-  if (selectWriteP)
-     FD_SET(descriptorP, &outfd);
-  else
-     FD_SET(descriptorP, &infd);
-  int retval = select(descriptorP + 1, &infd, &outfd, &errfd, &tv);
-  // Check if error
-  ERROR_IF_RET(retval < 0, "select()", return retval);
-  return retval;
+int select_single_desc(int descriptorP, const int usecsP, const bool selectWriteP) {
+    // Wait for data
+    struct timeval tv;
+    tv.tv_sec = 0;
+    tv.tv_usec = usecsP;
+    // Use select
+    fd_set infd;
+    fd_set outfd;
+    fd_set errfd;
+    FD_ZERO(&infd);
+    FD_ZERO(&outfd);
+    FD_ZERO(&errfd);
+    FD_SET(descriptorP, &errfd);
+
+    if (selectWriteP) {
+        FD_SET(descriptorP, &outfd);
+    } else {
+        FD_SET(descriptorP, &infd);
+    }
+
+    int retval = select(descriptorP + 1, &infd, &outfd, &errfd, &tv);
+
+    // Check if error
+    ERROR_IF_RET(retval < 0, "select()", return retval);
+    return retval;
 }
 
-cString ChangeCase(const cString &strP, bool upperP)
-{
-  cString res(strP);
-  char *p = (char *)*res;
-  while (p && *p) {
+cString ChangeCase(const cString &strP, bool upperP) {
+    cString res(strP);
+    char *p = (char *) *res;
+
+    while (p && *p) {
         *p = upperP ? toupper(*p) : tolower(*p);
         ++p;
-        }
-  return res;
+    }
+    return res;
 }
 
 const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE_SIZE] =
-{
-  /* description                        tag    pid   tid   mask */
-  {trNOOP("PAT (0x00)"),                "PAT", 0x00, 0x00, 0xFF},
-  {trNOOP("NIT (0x40)"),                "NIT", 0x10, 0x40, 0xFF},
-  {trNOOP("SDT (0x42)"),                "SDT", 0x11, 0x42, 0xFF},
-  {trNOOP("EIT (0x4E/0x4F/0x5X/0x6X)"), "EIT", 0x12, 0x40, 0xC0},
-  {trNOOP("TDT (0x70)"),                "TDT", 0x14, 0x70, 0xFF},
-};
+    {
+        /* description                        tag    pid   tid   mask */
+        {trNOOP("PAT (0x00)"), "PAT", 0x00, 0x00, 0xFF},
+        {trNOOP("NIT (0x40)"), "NIT", 0x10, 0x40, 0xFF},
+        {trNOOP("SDT (0x42)"), "SDT", 0x11, 0x42, 0xFF},
+        {trNOOP("EIT (0x4E/0x4F/0x5X/0x6X)"), "EIT", 0x12, 0x40, 0xC0},
+        {trNOOP("TDT (0x70)"), "TDT", 0x14, 0x70, 0xFF},
+    };
+
+std::string ReplaceAll(std::string str, const std::string &from, const std::string &to) {
+    size_t start_pos = 0;
+
+    while ((start_pos = str.find(from, start_pos))!=std::string::npos) {
+        str.replace(start_pos, from.length(), to);
+        start_pos += to.length(); // Handles case where 'to' is a substring of 'from'
+    }
+    return str;
+}
 
 void printBacktrace() {
     cStringList stringList;
 
     cBackTrace::BackTrace(stringList, 0, false);
     esyslog("[iptv] Backtrace size: %d", stringList.Size());
+
     for (int i = 0; i < stringList.Size(); ++i) {
         esyslog("[iptv] ==> %s", stringList[i]);
     }

common.h

@@ -5,19 +5,16 @@
  *
  */
 
-#ifndef __IPTV_COMMON_H
-#define __IPTV_COMMON_H
+#pragma once
 
+#include <string>
 #include <vdr/tools.h>
 #include <vdr/config.h>
 #include <vdr/i18n.h>
 
 #define ELEMENTS(x)                     (sizeof(x) / sizeof(x[0]))
-
 #define IPTV_BUFFER_SIZE                KILOBYTE(2048)
-
 #define IPTV_DVR_FILENAME               "/tmp/vdr-iptv%d.dvr"
-
 #define IPTV_SOURCE_CHARACTER           'I'
 
 #define IPTV_DEVICE_INFO_ALL            0
@@ -26,10 +23,8 @@
 #define IPTV_DEVICE_INFO_FILTERS        3
 #define IPTV_DEVICE_INFO_PROTOCOL       4
 #define IPTV_DEVICE_INFO_BITRATE        5
-
 #define IPTV_STATS_ACTIVE_PIDS_COUNT    10
 #define IPTV_STATS_ACTIVE_FILTERS_COUNT 10
-
 #define SECTION_FILTER_TABLE_SIZE       5
 
 #define ERROR_IF_FUNC(exp, errstr, func, ret)                  \
@@ -44,7 +39,6 @@
   } while (0)
 
 #define ERROR_IF_RET(exp, errstr, ret) ERROR_IF_FUNC(exp, errstr, ,ret);
-
 #define ERROR_IF(exp, errstr) ERROR_IF_FUNC(exp, errstr, , );
 
 #define DELETE_POINTER(ptr)       \
@@ -63,6 +57,7 @@ uint8_t payload(const uint8_t *bufP);
 const char *id_pid(const u_short pidP);
 int select_single_desc(int descriptorP, const int usecsP, const bool selectWriteP);
 cString ChangeCase(const cString &strP, bool upperP);
+std::string ReplaceAll(std::string str, const std::string &from, const std::string &to);
 void printBacktrace();
 
 struct section_filter_table_type {
@@ -77,5 +72,3 @@ extern const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE
 
 extern const char VERSION[];
 
-#endif // __IPTV_COMMON_H
-