[vdr-plugin-iptv] 01/03: Imported Upstream version 2.1.3
Tobias Grimm
tiber-guest at moszumanska.debian.org
Mon Feb 9 18:42:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-iptv.
commit d23475b311a93a46eb458da5a36838d022e6fd1d
Author: etobi <git at e-tobi.net>
Date: Mon Feb 9 19:39:55 2015 +0100
Imported Upstream version 2.1.3
---
HISTORY | 41 ++++++++++++
Makefile | 6 +-
README | 32 +++++----
common.c | 14 ++--
common.h | 7 +-
config.c | 11 +++-
config.h | 15 ++---
device.c | 166 ++++++++++++++++++++++++++++------------------
device.h | 17 +++--
iptv.c | 27 ++++----
pidscanner.c | 1 -
pidscanner.h | 8 +++
po/de_DE.po | 50 +++-----------
po/fi_FI.po | 60 ++++-------------
po/fr_FR.po | 60 ++++-------------
po/it_IT.po | 60 ++++-------------
po/nl_NL.po | 60 ++++-------------
po/ru_RU.po | 50 +++-----------
protocolcurl.c | 200 ++++++++++++++++++++++++++++++++++++++------------------
protocolcurl.h | 13 ++--
protocolext.c | 12 +++-
protocolext.h | 3 +-
protocolfile.c | 8 ++-
protocolfile.h | 3 +-
protocolhttp.c | 8 ++-
protocolhttp.h | 3 +-
protocolif.h | 3 +-
protocoludp.c | 8 ++-
protocoludp.h | 3 +-
sectionfilter.c | 92 +++++++++++++++++++-------
sectionfilter.h | 27 ++++----
setup.c | 24 ++-----
setup.h | 4 +-
sidscanner.c | 14 ++--
socket.c | 27 +++++++-
socket.h | 6 ++
source.c | 25 +++----
source.h | 2 -
statistics.c | 32 +++++----
statistics.h | 6 +-
streamer.c | 14 +++-
streamer.h | 3 +-
42 files changed, 657 insertions(+), 568 deletions(-)
diff --git a/HISTORY b/HISTORY
index d7616c7..3fc1cb9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -212,3 +212,44 @@ VDR Plugin 'iptv' Revision History
- Fixed a nasty network byte order bug.
- Fixed and refactored the section filtering code.
- Fixed a possible crash in the file protocol.
+
+2014-01-10: Version 2.0.1
+
+- Added missing CURL timeouts.
+- Improved section id scanner.
+- Added support for cDevice::IsTunedToTransponder() and
+ cDevice::GetCurrentlyTunedTransponder().
+- Fixed a memory leak and some issues reported by scan-build.
+
+2014-01-18: Version 2.0.2
+
+- Made devices to shutdown already in cPluginManager::Stop()
+ to prevent possible crashes while VDR shutdown.
+
+2014-03-09: Version 2.0.3
+
+- Fixed installation target bugs (Thanks to Alexander Grothe).
+
+
+==================================
+VDR Plugin 'iptv' Revision History
+==================================
+
+2014-02-20: Version 2.1.0
+
+- Added initial CAM support.
+- Added missing RTSP/UDP support.
+
+2014-03-09: Version 2.1.1
+
+- Fixed installation target bugs (Thanks to Alexander Grothe).
+
+2014-03-16: Version 2.1.2
+
+- Updated for vdr-2.1.6.
+
+2014-05-10: Version 2.1.3
+
+- Updated the section filtering options.
+- Removed unnecessary TS buffer settings.
+- Added RTP packet error detection.
diff --git a/Makefile b/Makefile
index 7f147b8..48c8b2c 100644
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,11 @@ GITTAG = $(shell git describe --always 2>/dev/null)
### The directory environment:
# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir)
PLGCFG = $(call PKGCFG,plgcfg)
+RESDIR = $(call PKGCFG,resdir)
CFGDIR = $(call PKGCFG,configdir)
#
TMPDIR ?= /tmp
@@ -147,7 +148,8 @@ install-lib: $(SOFILE)
install-conf:
@mkdir -p $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)
- @cp -pn $(PLUGIN)/* $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/
+ @mkdir -p $(DESTDIR)$(RESDIR)/plugins/$(PLUGIN)
+ @cp -pn $(PLUGIN)/* $(DESTDIR)$(RESDIR)/plugins/$(PLUGIN)/
install: install-lib install-i18n install-conf
diff --git a/README b/README
index 9b64d3a..9eddbd2 100644
--- a/README
+++ b/README
@@ -53,10 +53,12 @@ Setup menu:
stream ringbuffer before data is
transferred to VDR.
Valid range: 0...40
-- EXT protocol base port = 4321 Defines base port used in EXT protocol.
+- Protocol base port = 4321 Defines base port used in CURL/EXT
+ protocol. Two ports are defined for
+ each device.
The port range is defined by the number
- of IPTV devices (max. 8).
- Valid range: 0...65527
+ of IPTV devices times two (max. 32).
+ Valid range: 0...65503
- Use section filtering = 1 Defines whether section filtering shall
be used.
Valid range: 0...1
@@ -127,11 +129,11 @@ External streaming:
script parameter is passed to the script and it can be used to select for
example between different URLs.
-- When an EXT channel is opened the IPTV plugin opens an UDP listening port
- on the localhost. The external script is responsible for supplying IPTV
- plugin with MPEG2 TS data in UDP/RTP format to the listening port. The
- data will be processed in VDR like a normal DVB broadcast. The listening
- base port can be specified in the plugin configuration menu.
+- When an EXT or CURL/RTSP channel is opened the IPTV plugin opens an UDP
+ listening port on the localhost. The external script is responsible for
+ supplying IPTV plugin with MPEG2 TS data in UDP/RTP format to the listening
+ port. The data will be processed in VDR like a normal DVB broadcast. The
+ listening base port can be specified in the plugin configuration menu.
- Each IPTV device has different listen port. The port number is specified
as a base port number plus IPTV device index minus one. Maximum of 8 IPTV
@@ -165,8 +167,7 @@ Notes:
"disable_ca_updates" patch to the VDR in order to get rid of "Channel not
available" messages.
-- EIT scanning functionality can be disabled for all IPTV channels by applying
- the "disable_eitscan" patch to the VDR.
+- EIT scanning functionality is disabled by default.
- Section id and pid scanners should be disabled after the correct data is
found. This can be made via VDR's channel editor.
@@ -176,11 +177,16 @@ Notes:
IGMP v3 protocol:
"U=<source address>@<group address>"
-- The CURL implementation supports only HTTP/HTTPS protocols and an optional
- netrc configuration file for authentication:
+- The CURL implementation supports only RTSP/HTTP/HTTPS protocols and an
+ optional netrc configuration file for authentication:
$(CONFDIR)/iptv/netrc
-- CURL implementation
+- You can quite easily figure out correct DVB triplet values by using the
+ multicat and dvbsnoop tools:
+ $ multicat -u -d 1620000000 @127.0.0.1:1234 /tmp/video.ts
+ $ dvbsnoop -s ts -if /tmp/video.ts -tssubdecode -hexdumpbuffer 0x12 | \
+ grep -m1 -A8 Service_ID | grep _ID
+
Acknowledgements:
- The IPTV section filtering code is derived from Linux kernel.
diff --git a/common.c b/common.c
index f1751ac..24abeed 100644
--- a/common.c
+++ b/common.c
@@ -75,12 +75,10 @@ cString ChangeCase(const cString &strP, bool upperP)
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)"), "EIT", 0x12, 0x4E, 0xFE},
- {trNOOP("EIT (0x5X)"), "EIT", 0x12, 0x50, 0xF0},
- {trNOOP("EIT (0x6X)"), "EIT", 0x12, 0x60, 0xF0},
- {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},
};
diff --git a/common.h b/common.h
index 35e1e47..450f53a 100644
--- a/common.h
+++ b/common.h
@@ -24,6 +24,8 @@
#define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
+#define IPTV_BUFFER_SIZE MEGABYTE(1)
+
#define IPTV_DVR_FILENAME "/tmp/vdr-iptv%d.dvr"
#define IPTV_SOURCE_CHARACTER 'I'
@@ -38,13 +40,14 @@
#define IPTV_STATS_ACTIVE_PIDS_COUNT 10
#define IPTV_STATS_ACTIVE_FILTERS_COUNT 10
-#define SECTION_FILTER_TABLE_SIZE 7
+#define SECTION_FILTER_TABLE_SIZE 5
#define ERROR_IF_FUNC(exp, errstr, func, ret) \
do { \
if (exp) { \
char tmp[64]; \
- error(errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
+ error("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
+ strerror_r(errno, tmp, sizeof(tmp))); \
func; \
ret; \
} \
diff --git a/config.c b/config.c
index 1285d70..6a5e7b2 100644
--- a/config.c
+++ b/config.c
@@ -10,15 +10,14 @@
cIptvConfig IptvConfig;
cIptvConfig::cIptvConfig(void)
-: tsBufferSizeM(2),
- tsBufferPrefillRatioM(0),
- extProtocolBasePortM(4321),
+: protocolBasePortM(4321),
useBytesM(1),
sectionFilteringM(1)
{
for (unsigned int i = 0; i < ARRAY_SIZE(disabledFiltersM); ++i)
disabledFiltersM[i] = -1;
memset(configDirectoryM, 0, sizeof(configDirectoryM));
+ memset(resourceDirectoryM, 0, sizeof(resourceDirectoryM));
}
unsigned int cIptvConfig::GetDisabledFiltersCount(void) const
@@ -45,3 +44,9 @@ void cIptvConfig::SetConfigDirectory(const char *directoryP)
debug("cIptvConfig::%s(%s)", __FUNCTION__, directoryP);
ERROR_IF(!realpath(directoryP, configDirectoryM), "Cannot canonicalize configuration directory");
}
+
+void cIptvConfig::SetResourceDirectory(const char *directoryP)
+{
+ debug("cIptvConfig::%s(%s)", __FUNCTION__, directoryP);
+ ERROR_IF(!realpath(directoryP, resourceDirectoryM), "Cannot canonicalize resource directory");
+}
diff --git a/config.h b/config.h
index dc7c687..e13318a 100644
--- a/config.h
+++ b/config.h
@@ -14,31 +14,28 @@
class cIptvConfig
{
private:
- unsigned int tsBufferSizeM;
- unsigned int tsBufferPrefillRatioM;
- unsigned int extProtocolBasePortM;
+ unsigned int protocolBasePortM;
unsigned int useBytesM;
unsigned int sectionFilteringM;
int disabledFiltersM[SECTION_FILTER_TABLE_SIZE];
char configDirectoryM[PATH_MAX];
+ char resourceDirectoryM[PATH_MAX];
public:
cIptvConfig();
- unsigned int GetTsBufferSize(void) const { return tsBufferSizeM; }
- unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatioM; }
- unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePortM; }
+ unsigned int GetProtocolBasePort(void) const { return protocolBasePortM; }
unsigned int GetUseBytes(void) const { return useBytesM; }
unsigned int GetSectionFiltering(void) const { return sectionFilteringM; }
const char *GetConfigDirectory(void) const { return configDirectoryM; }
+ const char *GetResourceDirectory(void) const { return resourceDirectoryM; }
unsigned int GetDisabledFiltersCount(void) const;
int GetDisabledFilters(unsigned int indexP) const;
- void SetTsBufferSize(unsigned int sizeP) { tsBufferSizeM = sizeP; }
- void SetTsBufferPrefillRatio(unsigned int ratioP) { tsBufferPrefillRatioM = ratioP; }
- void SetExtProtocolBasePort(unsigned int portNumberP) { extProtocolBasePortM = portNumberP; }
+ void SetProtocolBasePort(unsigned int portNumberP) { protocolBasePortM = portNumberP; }
void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; }
void SetSectionFiltering(unsigned int onOffP) { sectionFilteringM = onOffP; }
void SetDisabledFilters(unsigned int indexP, int numberP);
void SetConfigDirectory(const char *directoryP);
+ void SetResourceDirectory(const char *directoryP);
};
extern cIptvConfig IptvConfig;
diff --git a/device.c b/device.c
index 472b70c..1ca7043 100644
--- a/device.c
+++ b/device.c
@@ -20,9 +20,9 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
isOpenDvrM(false),
sidScanEnabledM(false),
pidScanEnabledM(false),
- channelIdM(tChannelID::InvalidID)
+ channelM()
{
- unsigned int bufsize = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize());
+ unsigned int bufsize = (unsigned int)IPTV_BUFFER_SIZE;
bufsize -= (bufsize % TS_SIZE);
isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndexM, CardIndex());
tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
@@ -32,7 +32,6 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
tsBufferM->SetIoThrottle();
pIptvStreamerM = new cIptvStreamer(*this, tsBufferM->Free());
}
- ResetBuffering();
pUdpProtocolM = new cIptvProtocolUdp();
pCurlProtocolM = new cIptvProtocolCurl();
pHttpProtocolM = new cIptvProtocolHttp();
@@ -58,18 +57,18 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
cIptvDevice::~cIptvDevice()
{
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
- DELETE_POINTER(pIptvStreamerM);
- DELETE_POINTER(pUdpProtocolM);
- DELETE_POINTER(pCurlProtocolM);
- DELETE_POINTER(pHttpProtocolM);
- DELETE_POINTER(pFileProtocolM);
- DELETE_POINTER(pExtProtocolM);
- DELETE_POINTER(tsBufferM);
- DELETE_POINTER(pPidScannerM);
- DELETE_POINTER(pSidScannerM);
// Stop section handler of iptv device
StopSectionHandler();
DELETE_POINTER(pIptvSectionM);
+ DELETE_POINTER(pSidScannerM);
+ DELETE_POINTER(pPidScannerM);
+ DELETE_POINTER(pIptvStreamerM);
+ DELETE_POINTER(pExtProtocolM);
+ DELETE_POINTER(pFileProtocolM);
+ DELETE_POINTER(pHttpProtocolM);
+ DELETE_POINTER(pCurlProtocolM);
+ DELETE_POINTER(pUdpProtocolM);
+ DELETE_POINTER(tsBufferM);
// Close dvr fifo
if (dvrFdM >= 0) {
int fd = dvrFdM;
@@ -91,6 +90,15 @@ bool cIptvDevice::Initialize(unsigned int deviceCountP)
return true;
}
+void cIptvDevice::Shutdown(void)
+{
+ debug("cIptvDevice::%s()", __FUNCTION__);
+ for (int i = 0; i < IPTV_MAX_DEVICES; ++i) {
+ if (IptvDevicesS[i])
+ IptvDevicesS[i]->CloseDvr();
+ }
+}
+
unsigned int cIptvDevice::Count(void)
{
unsigned int count = 0;
@@ -106,7 +114,7 @@ cIptvDevice *cIptvDevice::GetIptvDevice(int cardIndexP)
{
//debug("cIptvDevice::%s(%d)", __FUNCTION__, cardIndexP);
for (unsigned int i = 0; i < IPTV_MAX_DEVICES; ++i) {
- if ((IptvDevicesS[i] != NULL) && (IptvDevicesS[i]->CardIndex() == cardIndexP)) {
+ if (IptvDevicesS[i] && (IptvDevicesS[i]->CardIndex() == cardIndexP)) {
//debug("cIptvDevice::%s(%d): found!", __FUNCTION__, cardIndexP);
return IptvDevicesS[i];
}
@@ -214,7 +222,7 @@ bool cIptvDevice::ProvidesChannel(const cChannel *channelP, int priorityP, bool
if (channelP && ProvidesTransponder(channelP)) {
result = hasPriority;
if (Receiving()) {
- if (channelP->GetChannelID() == channelIdM)
+ if (channelP->GetChannelID() == channelM.GetChannelID())
result = true;
else
needsDetachReceivers = Receiving();
@@ -235,6 +243,21 @@ int cIptvDevice::NumProvidedSystems(void) const
return 1;
}
+const cChannel *cIptvDevice::GetCurrentlyTunedTransponder(void) const
+{
+ return &channelM;
+}
+
+bool cIptvDevice::IsTunedToTransponder(const cChannel *channelP) const
+{
+ return channelP ? (channelP->GetChannelID() == channelM.GetChannelID()) : false;
+}
+
+bool cIptvDevice::MaySwitchTransponder(const cChannel *channelP) const
+{
+ return cDevice::MaySwitchTransponder(channelP);
+}
+
bool cIptvDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
{
cIptvProtocolIf *protocol;
@@ -269,35 +292,43 @@ bool cIptvDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
}
sidScanEnabledM = itp.SidScan() ? true : false;
pidScanEnabledM = itp.PidScan() ? true : false;
- if (pIptvStreamerM->Set(itp.Address(), itp.Parameter(), deviceIndexM, protocol)) {
- channelIdM = channelP->GetChannelID();
+ if (pIptvStreamerM && pIptvStreamerM->SetSource(itp.Address(), itp.Parameter(), deviceIndexM, protocol)) {
+ channelM = *channelP;
if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
- pSidScannerM->SetChannel(channelIdM);
+ pSidScannerM->SetChannel(channelM.GetChannelID());
if (pidScanEnabledM && pPidScannerM)
- pPidScannerM->SetChannel(channelIdM);
+ pPidScannerM->SetChannel(channelM.GetChannelID());
}
return true;
}
bool cIptvDevice::SetPid(cPidHandle *handleP, int typeP, bool onP)
{
- debug("cIptvDevice::%s(%d): pid=%d type=%d on=%d", __FUNCTION__, deviceIndexM, handleP->pid, typeP, onP);
+ debug("cIptvDevice::%s(%d): pid=%d type=%d on=%d", __FUNCTION__, deviceIndexM, handleP ? handleP->pid : -1, typeP, onP);
+ if (pIptvStreamerM && handleP)
+ return pIptvStreamerM->SetPid(handleP->pid, typeP, onP);
return true;
}
int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP)
{
//debug("cIptvDevice::%s(%d): pid=%d tid=%d mask=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP);
- if (pIptvSectionM && IptvConfig.GetSectionFiltering())
+ if (pIptvSectionM && IptvConfig.GetSectionFiltering()) {
+ if (pIptvStreamerM)
+ pIptvStreamerM->SetPid(pidP, ptOther, true);
return pIptvSectionM->Open(pidP, tidP, maskP);
+ }
return -1;
}
void cIptvDevice::CloseFilter(int handleP)
{
//debug("cIptvDevice::%s(%d): handle=%d", __FUNCTION__, deviceIndexM, handleP);
- if (pIptvSectionM)
+ if (pIptvSectionM) {
+ if (pIptvStreamerM)
+ pIptvStreamerM->SetPid(pIptvSectionM->GetPid(handleP), ptOther, false);
pIptvSectionM->Close(handleP);
+ }
}
bool cIptvDevice::OpenDvr(void)
@@ -305,11 +336,12 @@ bool cIptvDevice::OpenDvr(void)
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
isPacketDeliveredM = false;
tsBufferM->Clear();
- ResetBuffering();
if (pIptvStreamerM)
pIptvStreamerM->Open();
if (sidScanEnabledM && pSidScannerM && IptvConfig.GetSectionFiltering())
pSidScannerM->Open();
+ if (pidScanEnabledM && pPidScannerM)
+ pPidScannerM->Open();
isOpenDvrM = true;
return true;
}
@@ -317,7 +349,9 @@ bool cIptvDevice::OpenDvr(void)
void cIptvDevice::CloseDvr(void)
{
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
- if (sidScanEnabledM && pSidScannerM )
+ if (pidScanEnabledM && pPidScannerM)
+ pPidScannerM->Close();
+ if (sidScanEnabledM && pSidScannerM)
pSidScannerM->Close();
if (pIptvStreamerM)
pIptvStreamerM->Close();
@@ -327,31 +361,12 @@ void cIptvDevice::CloseDvr(void)
bool cIptvDevice::HasLock(int timeoutMsP) const
{
//debug("cIptvDevice::%s(%d): timeoutMs=%d", __FUNCTION__, deviceIndexM, timeoutMsP);
- return (!IsBuffering());
+ return (pIptvStreamerM && pIptvStreamerM->Active());
}
bool cIptvDevice::HasInternalCam(void)
{
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
- return true;
-}
-
-void cIptvDevice::ResetBuffering(void)
-{
- debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
- // Pad prefill to multiple of TS_SIZE
- tsBufferPrefillM = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize()) *
- IptvConfig.GetTsBufferPrefillRatio() / 100;
- tsBufferPrefillM -= (tsBufferPrefillM % TS_SIZE);
-}
-
-bool cIptvDevice::IsBuffering(void) const
-{
- //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
- if (tsBufferPrefillM && tsBufferM && tsBufferM->Available() < tsBufferPrefillM)
- return true;
- else
- tsBufferPrefillM = 0;
return false;
}
@@ -381,39 +396,66 @@ unsigned int cIptvDevice::CheckData(void)
return 0;
}
-bool cIptvDevice::GetTSPacket(uchar *&Data)
+uchar *cIptvDevice::GetData(int *availableP)
{
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
- if (tsBufferM && !IsBuffering()) {
- if (isPacketDeliveredM) {
- tsBufferM->Del(TS_SIZE);
- isPacketDeliveredM = false;
- // Update buffer statistics
- AddBufferStatistic(TS_SIZE, tsBufferM->Available());
- }
- int Count = 0;
- uchar *p = tsBufferM->Get(Count);
- if (p && Count >= TS_SIZE) {
+ if (isOpenDvrM && tsBufferM) {
+ int count = 0;
+ if (isPacketDeliveredM)
+ SkipData(TS_SIZE);
+ uchar *p = tsBufferM->Get(count);
+ if (p && count >= TS_SIZE) {
if (*p != TS_SYNC_BYTE) {
- for (int i = 1; i < Count; i++) {
+ for (int i = 1; i < count; i++) {
if (p[i] == TS_SYNC_BYTE) {
- Count = i;
+ count = i;
break;
}
}
- tsBufferM->Del(Count);
- error("Skipped %d bytes to sync on TS packet", Count);
- return false;
+ tsBufferM->Del(count);
+ info("Skipped %d bytes to sync on TS packet", count);
+ return NULL;
}
isPacketDeliveredM = true;
- Data = p;
+ if (availableP)
+ *availableP = count;
// Update pid statistics
AddPidStatistic(ts_pid(p), payload(p));
- return true;
+ return p;
}
}
+ return NULL;
+}
+
+void cIptvDevice::SkipData(int countP)
+{
+ //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+ tsBufferM->Del(countP);
+ isPacketDeliveredM = false;
+ // Update buffer statistics
+ AddBufferStatistic(countP, tsBufferM->Available());
+}
+
+bool cIptvDevice::GetTSPacket(uchar *&dataP)
+{
+ //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+ if (tsBufferM) {
+ if (cCamSlot *cs = CamSlot()) {
+ if (cs->WantsTsData()) {
+ int available;
+ dataP = GetData(&available);
+ if (dataP) {
+ dataP = cs->Decrypt(dataP, available);
+ SkipData(available);
+ }
+ return true;
+ }
+ }
+ dataP = GetData();
+ return true;
+ }
// Reduce cpu load by preventing busylooping
cCondWait::SleepMs(10);
- Data = NULL;
+ dataP = NULL;
return true;
}
diff --git a/device.h b/device.h
index 705f131..ce254b8 100644
--- a/device.h
+++ b/device.h
@@ -27,6 +27,7 @@ class cIptvDevice : public cDevice, public cIptvPidStatistics, public cIptvBuffe
public:
static unsigned int deviceCount;
static bool Initialize(unsigned int DeviceCount);
+ static void Shutdown(void);
static unsigned int Count(void);
static cIptvDevice *GetIptvDevice(int CardIndex);
@@ -39,8 +40,7 @@ private:
bool sidScanEnabledM;
bool pidScanEnabledM;
cRingBufferLinear *tsBufferM;
- mutable int tsBufferPrefillM;
- tChannelID channelIdM;
+ cChannel channelM;
cIptvProtocolUdp *pUdpProtocolM;
cIptvProtocolCurl *pCurlProtocolM;
cIptvProtocolHttp *pHttpProtocolM;
@@ -68,11 +68,6 @@ private:
cString GetPidsInformation(void);
cString GetFiltersInformation(void);
- // for channel parsing & buffering
-private:
- void ResetBuffering(void);
- bool IsBuffering(void) const;
-
// for channel info
public:
virtual cString DeviceType(void) const;
@@ -87,10 +82,18 @@ public:
virtual bool ProvidesChannel(const cChannel *channelP, int priorityP = -1, bool *needsDetachReceiversP = NULL) const;
virtual bool ProvidesEIT(void) const;
virtual int NumProvidedSystems(void) const;
+ virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
+ virtual bool IsTunedToTransponder(const cChannel *channelP) const;
+ virtual bool MaySwitchTransponder(const cChannel *channelP) const;
+
protected:
virtual bool SetChannelDevice(const cChannel *channelP, bool liveViewP);
// for recording
+private:
+ uchar *GetData(int *availableP = NULL);
+ void SkipData(int countP);
+
protected:
virtual bool SetPid(cPidHandle *handleP, int typeP, bool onP);
virtual bool OpenDvr(void);
diff --git a/iptv.c b/iptv.c
index 8158e67..2c00080 100644
--- a/iptv.c
+++ b/iptv.c
@@ -13,15 +13,15 @@
#include "device.h"
#include "iptvservice.h"
-#if defined(APIVERSNUM) && APIVERSNUM < 20000
-#error "VDR-2.0.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20106
+#error "VDR-2.1.6 API version or greater is required!"
#endif
#ifndef GITVERSION
#define GITVERSION ""
#endif
- const char VERSION[] = "2.0.0" GITVERSION;
+ const char VERSION[] = "2.1.3" GITVERSION;
static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
class cPluginIptv : public cPlugin {
@@ -99,7 +99,8 @@ bool cPluginIptv::Initialize(void)
{
debug("cPluginIptv::%s()", __FUNCTION__);
// Initialize any background activities the plugin shall perform.
- IptvConfig.SetConfigDirectory(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
+ IptvConfig.SetConfigDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
+ IptvConfig.SetResourceDirectory(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N));
return cIptvDevice::Initialize(deviceCountM);
}
@@ -109,7 +110,14 @@ bool cPluginIptv::Start(void)
// Start any background activities the plugin shall perform.
if (curl_global_init(CURL_GLOBAL_ALL) == CURLE_OK) {
curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- info("Using CURL %s", data->version);
+ cString info = cString::sprintf("Using CURL %s", data->version);
+ for (int i = 0; data->protocols[i]; ++i) {
+ // Supported protocols: HTTP(S), RTSP, FILE
+ if (startswith(data->protocols[i], "http") || startswith(data->protocols[i], "rtsp") ||
+ startswith(data->protocols[i], "file"))
+ info = cString::sprintf("%s %s", *info, data->protocols[i]);
+ }
+ info("%s", *info);
}
return true;
}
@@ -118,6 +126,7 @@ void cPluginIptv::Stop(void)
{
debug("cPluginIptv::%s()", __FUNCTION__);
// Stop any background activities the plugin is performing.
+ cIptvDevice::Shutdown();
curl_global_cleanup();
}
@@ -183,12 +192,8 @@ bool cPluginIptv::SetupParse(const char *nameP, const char *valueP)
{
debug("cPluginIptv::%s()", __FUNCTION__);
// Parse your own setup parameters and store their values.
- if (!strcasecmp(nameP, "TsBufferSize"))
- IptvConfig.SetTsBufferSize(atoi(valueP));
- else if (!strcasecmp(nameP, "TsBufferPrefill"))
- IptvConfig.SetTsBufferPrefillRatio(atoi(valueP));
- else if (!strcasecmp(nameP, "ExtProtocolBasePort"))
- IptvConfig.SetExtProtocolBasePort(atoi(valueP));
+ if (!strcasecmp(nameP, "ExtProtocolBasePort"))
+ IptvConfig.SetProtocolBasePort(atoi(valueP));
else if (!strcasecmp(nameP, "SectionFiltering"))
IptvConfig.SetSectionFiltering(atoi(valueP));
else if (!strcasecmp(nameP, "DisabledFilters")) {
diff --git a/pidscanner.c b/pidscanner.c
index fcc22c7..777a63a 100644
--- a/pidscanner.c
+++ b/pidscanner.c
@@ -39,7 +39,6 @@ void cPidScanner::SetChannel(const tChannelID &channelIdP)
aPidM = 0xFFFF;
numApidsM = 0;
processM = true;
- timeoutM.Set(PIDSCANNER_TIMEOUT_IN_MS);
}
void cPidScanner::Process(const uint8_t* bufP)
diff --git a/pidscanner.h b/pidscanner.h
index 738422c..e9125ec 100644
--- a/pidscanner.h
+++ b/pidscanner.h
@@ -13,6 +13,12 @@
class cPidScanner {
private:
+ enum {
+ PIDSCANNER_APID_COUNT = 5, /* minimum count of audio pid samples for pid detection */
+ PIDSCANNER_VPID_COUNT = 5, /* minimum count of video pid samples for pid detection */
+ PIDSCANNER_PID_DELTA_COUNT = 100, /* minimum count of pid samples for audio/video only pid detection */
+ PIDSCANNER_TIMEOUT_IN_MS = 15000 /* 15s timeout for detection */
+ };
cTimeMs timeoutM;
tChannelID channelIdM;
bool processM;
@@ -26,6 +32,8 @@ public:
~cPidScanner();
void SetChannel(const tChannelID &channelIdP);
void Process(const uint8_t* bufP);
+ void Open() { debug("cPidScanner::%s()", __FUNCTION__); timeoutM.Set(PIDSCANNER_TIMEOUT_IN_MS); }
+ void Close() { debug("cPidScanner::%s()", __FUNCTION__); timeoutM.Set(0); }
};
#endif // __PIDSCANNER_H
diff --git a/po/de_DE.po b/po/de_DE.po
index 5808f61..673536f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
# This file is distributed under the same license as the iptv package.
# Tobias <vdr at e-tobi.net>, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Tobias Grimm <tg at e-tobi.net>\n"
"Language-Team: German <vdr at linuxtv.org>\n"
"Language: de\n"
@@ -26,14 +26,8 @@ msgstr "NIT (0x40)"
msgid "SDT (0x42)"
msgstr "SDT (0x42)"
-msgid "EIT (0x4E/0x4F)"
-msgstr "EIT (0x4E/0x4F)"
-
-msgid "EIT (0x5X)"
-msgstr "EIT (0x5X)"
-
-msgid "EIT (0x6X)"
-msgstr "EIT (0x6X)"
+msgid "EIT (0x4E/0x4F/0x5X/0x6X)"
+msgstr "EIT (0x4E/0x4F/0x5X/0x6X)"
msgid "TDT (0x70)"
msgstr "TDT (0x70)"
@@ -59,31 +53,13 @@ msgstr "Bits/Bytes"
msgid "IPTV information not available!"
msgstr "IPTV Informationen nicht verfügbar!"
-msgid "TS buffer size [MB]"
-msgstr "TS Puffergröße [MB]"
-
-msgid ""
-"Define a ringbuffer size for transport streams in megabytes.\n"
-"\n"
-"Smaller sizes help memory consumption, but are more prone to buffer overflows."
-msgstr ""
-
-msgid "TS buffer prefill ratio [%]"
-msgstr "TS Puffer-Preload [%]"
+msgid "Protocol base port"
+msgstr "Protokoll Basisport"
msgid ""
-"Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
+"Define a base port used by CURL/EXT protocol.\n"
"\n"
-"This is useful if streaming media over a slow or unreliable connection."
-msgstr ""
-
-msgid "EXT protocol base port"
-msgstr "EXT Protokoll Basisport"
-
-msgid ""
-"Define a base port used by EXT protocol.\n"
-"\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
msgstr ""
msgid "Use section filtering"
@@ -130,12 +106,6 @@ msgstr "DATEI"
msgid "EXT"
msgstr "EXT"
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
msgid "Rid"
msgstr "Rid"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 1bf20e0..b1f6390 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
# This file is distributed under the same license as the iptv package.
# Rolf Ahrenberg
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr at linuxtv.org>\n"
"Language: fi\n"
@@ -25,14 +25,8 @@ msgstr "NIT (0x40)"
msgid "SDT (0x42)"
msgstr "SDT (0x42)"
-msgid "EIT (0x4E/0x4F)"
-msgstr "EIT (0x4E/0x4F)"
-
-msgid "EIT (0x5X)"
-msgstr "EIT (0x5X)"
-
-msgid "EIT (0x6X)"
-msgstr "EIT (0x6X)"
+msgid "EIT (0x4E/0x4F/0x5X/0x6X)"
+msgstr "EIT (0x4E/0x4F/0x5X/0x6X)"
msgid "TDT (0x70)"
msgstr "TDT (0x70)"
@@ -58,41 +52,17 @@ msgstr "Bitit/tavut"
msgid "IPTV information not available!"
msgstr "IPTV-tietoja ei saatavilla!"
-msgid "TS buffer size [MB]"
-msgstr "TS-puskurin koko [MB]"
-
-msgid ""
-"Define a ringbuffer size for transport streams in megabytes.\n"
-"\n"
-"Smaller sizes help memory consumption, but are more prone to buffer overflows."
-msgstr ""
-"Määritä rengaspuskurin koko TS-lähetteelle megatavuina.\n"
-"\n"
-"Pienempi rengaspuskuri vähentää muistinkulutusta, mutta on virhealttiimpi puskurin ylivuodolle."
-
-msgid "TS buffer prefill ratio [%]"
-msgstr "TS-puskurin esitäyttöaste [%]"
+msgid "Protocol base port"
+msgstr "Protokollan perusportti"
msgid ""
-"Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
+"Define a base port used by CURL/EXT protocol.\n"
"\n"
-"This is useful if streaming media over a slow or unreliable connection."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
msgstr ""
-"Määrittele TS-rengaspuskurin esitäyttöaste, jonka jälkeen lähetettä aletaan siirtämään eteenpäin VDR:lle.\n"
+"Määrittele protokollan käyttämä perusportti.\n"
"\n"
-"Puskurin esitäyttö parantaa suoratoistoa hitailla ja epäluotettavilla yhteyksillä."
-
-msgid "EXT protocol base port"
-msgstr "EXT-protokollan perusportti"
-
-msgid ""
-"Define a base port used by EXT protocol.\n"
-"\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
-msgstr ""
-"Määrittele EXT-protokollan käyttämä perusportti.\n"
-"\n"
-"Porttiavaruuden koko määräytyy käytettyjen IPTV-laitteiden mukaan. Laajennos lukee EXT-protokollan yhteydessä perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."
+"Porttiavaruuden koko määräytyy käytettyjen IPTV-laitteiden mukaan. Laajennos lukee CURL/EXT-protokollan yhteydessä perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."
msgid "Use section filtering"
msgstr "Käytä sektioiden suodatusta"
@@ -145,12 +115,6 @@ msgstr "FILE"
msgid "EXT"
msgstr "EXT"
-msgid "Nid"
-msgstr "Verkko-ID"
-
-msgid "Tid"
-msgstr "Lähete-ID"
-
msgid "Rid"
msgstr "Radio-ID"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 55201f2..e9b52d2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,15 +1,15 @@
# French translations for iptv package.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
# This file is distributed under the same license as the iptv package.
# Bruno ROUSSEL <bruno.roussel at free.fr>, 2007.
# NIVAL Michaël <mnival at club-internet.fr>, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: NIVAL Michaël <mnival at club-internet.fr>\n"
"Language-Team: French <vdr at linuxtv.org>\n"
"Language: fr\n"
@@ -27,14 +27,8 @@ msgstr "NIT (0x40)"
msgid "SDT (0x42)"
msgstr "SDT (0x42)"
-msgid "EIT (0x4E/0x4F)"
-msgstr "EIT (0x4E/0x4F)"
-
-msgid "EIT (0x5X)"
-msgstr "EIT (0x5X)"
-
-msgid "EIT (0x6X)"
-msgstr "EIT (0x6X)"
+msgid "EIT (0x4E/0x4F/0x5X/0x6X)"
+msgstr "EIT (0x4E/0x4F/0x5X/0x6X)"
msgid "TDT (0x70)"
msgstr "TDT (0x70)"
@@ -60,41 +54,17 @@ msgstr "Bits/Bytes"
msgid "IPTV information not available!"
msgstr "Information sur IPTV non disponible !"
-msgid "TS buffer size [MB]"
-msgstr "Taille du buffer TS [MB]"
-
-msgid ""
-"Define a ringbuffer size for transport streams in megabytes.\n"
-"\n"
-"Smaller sizes help memory consumption, but are more prone to buffer overflows."
-msgstr ""
-"Définit la taille du ringbuffer pour le transport du flux en megabytes.\n"
-"\n"
-"Une taille plus petite taille aide la consommation de mémoire, mais c'est sujet à plus de débordement de tampon."
-
-msgid "TS buffer prefill ratio [%]"
-msgstr "Taux du buffer de pré-remplissage TS [%]"
+msgid "Protocol base port"
+msgstr "Port de base du protocole"
msgid ""
-"Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
+"Define a base port used by CURL/EXT protocol.\n"
"\n"
-"This is useful if streaming media over a slow or unreliable connection."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
msgstr ""
-"Définit le ratio de pré-remplissage du ringbuffer pour le transport du flux avant transfert dans VDR.\n"
+"Définit le port de base utilisé par le protocole CURL/EXT.\n"
"\n"
-"Cette option est utile si le streaming est sur une connexion lente ou peu fiables."
-
-msgid "EXT protocol base port"
-msgstr "Port de base du protocole EXT"
-
-msgid ""
-"Define a base port used by EXT protocol.\n"
-"\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
-msgstr ""
-"Définit le port de base utilisé par le protocole EXT.\n"
-"\n"
-"La plage de port est défini par le nombre de dispositif IPTV. Ce paramètre défini le port qui est écouté pour les connexions à partir d'applications externes en utilisant le protocole EXT."
+"La plage de port est défini par le nombre de dispositif IPTV. Ce paramètre défini le port qui est écouté pour les connexions à partir d'applications externes en utilisant le protocole CURL/EXT."
msgid "Use section filtering"
msgstr "Utiliser le filtrage de section"
@@ -147,12 +117,6 @@ msgstr "FICHIER"
msgid "EXT"
msgstr "EXT"
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
msgid "Rid"
msgstr "Rid"
diff --git a/po/it_IT.po b/po/it_IT.po
index 302905a..40abaef 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
# This file is distributed under the same license as the iptv package.
# Diego Pierotto <vdr-italian at tiscali.it>, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Diego Pierotto <vdr-italian at tiscali.it>\n"
"Language-Team: Italian <vdr at linuxtv.org>\n"
"Language: it\n"
@@ -26,14 +26,8 @@ msgstr "NIT (0x40)"
msgid "SDT (0x42)"
msgstr "SDT (0x42)"
-msgid "EIT (0x4E/0x4F)"
-msgstr "EIT (0x4E/0x4F)"
-
-msgid "EIT (0x5X)"
-msgstr "EIT (0x5X)"
-
-msgid "EIT (0x6X)"
-msgstr "EIT (0x6X)"
+msgid "EIT (0x4E/0x4F/0x5X/0x6X)"
+msgstr "EIT (0x4E/0x4F/0x5X/0x6X)"
msgid "TDT (0x70)"
msgstr "TDT (0x70)"
@@ -59,41 +53,17 @@ msgstr "Bits/bytes"
msgid "IPTV information not available!"
msgstr "Informazione IPTV non disponibile!"
-msgid "TS buffer size [MB]"
-msgstr "Dimensione buffer TS [MB]"
-
-msgid ""
-"Define a ringbuffer size for transport streams in megabytes.\n"
-"\n"
-"Smaller sizes help memory consumption, but are more prone to buffer overflows."
-msgstr ""
-"Definisci una dimensione del buffer in MB per i flussi di trasporto.\n"
-"\n"
-"Dimensioni più piccole aiutano il consumo di memoria, ma sono più inclini a generare buffer overflows."
-
-msgid "TS buffer prefill ratio [%]"
-msgstr "Riempimento buffer TS [%]"
+msgid "Protocol base port"
+msgstr "Porta base protocollo"
msgid ""
-"Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
+"Define a base port used by CURL/EXT protocol.\n"
"\n"
-"This is useful if streaming media over a slow or unreliable connection."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
msgstr ""
-"Definisci un rapporto di riempimento del buffer per i flussi di trasporto prima che i dati siano trasferiti a VDR.\n"
+"Definisci una porta base usata dal protocollo CURL/EXT.\n"
"\n"
-"Questo è utile se si trasmette dati su una connessione lenta oppure inaffidabile."
-
-msgid "EXT protocol base port"
-msgstr "Porta base protocollo EXT"
-
-msgid ""
-"Define a base port used by EXT protocol.\n"
-"\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
-msgstr ""
-"Definisci una porta base usata dal protocollo EXT.\n"
-"\n"
-"Il range della porta è definito dal numero di periferiche IPTV. Questo parametro imposta la porta che è in ascolto per connessioni da applicazioni esterne quando si usa il protocollo EXT."
+"Il range della porta è definito dal numero di periferiche IPTV. Questo parametro imposta la porta che è in ascolto per connessioni da applicazioni esterne quando si usa il protocollo CURL/EXT."
msgid "Use section filtering"
msgstr "Utilizza sezione filtri"
@@ -146,12 +116,6 @@ msgstr "FILE"
msgid "EXT"
msgstr "EXT"
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
msgid "Rid"
msgstr "Rid"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 5004872..ab42367 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
# This file is distributed under the same license as the iptv package.
# Carel, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Carel\n"
"Language-Team: Dutch <vdr at linuxtv.org>\n"
"Language: nl\n"
@@ -26,14 +26,8 @@ msgstr "NIT (0x40)"
msgid "SDT (0x42)"
msgstr "SDT (0x42)"
-msgid "EIT (0x4E/0x4F)"
-msgstr "EIT (0x4E/0x4F)"
-
-msgid "EIT (0x5X)"
-msgstr "EIT (0x5X)"
-
-msgid "EIT (0x6X)"
-msgstr "EIT (0x6X)"
+msgid "EIT (0x4E/0x4F/0x5X/0x6X)"
+msgstr "EIT (0x4E/0x4F/0x5X/0x6X)"
msgid "TDT (0x70)"
msgstr "TDT (0x70)"
@@ -59,41 +53,17 @@ msgstr "Bits/Bytes"
msgid "IPTV information not available!"
msgstr "IPTV informatie niet beschikbaar!"
-msgid "TS buffer size [MB]"
-msgstr "TS buffergrootte [MB]"
-
-msgid ""
-"Define a ringbuffer size for transport streams in megabytes.\n"
-"\n"
-"Smaller sizes help memory consumption, but are more prone to buffer overflows."
-msgstr ""
-"Stel de grootte van de ringbuffer vast voor transportstreams in megabytes.\n"
-"\n"
-"Bij lage waarden zapt VDR sneller maar kunnen leiden tot bufferoverschreidingen en dus dropouts."
-
-msgid "TS buffer prefill ratio [%]"
-msgstr "TS buffer-preload [%]"
+msgid "Protocol base port"
+msgstr "Protocol basispoort"
msgid ""
-"Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
+"Define a base port used by CURL/EXT protocol.\n"
"\n"
-"This is useful if streaming media over a slow or unreliable connection."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
msgstr ""
-"Stel een 'prefil ratio' in voor de ringbuffer voor transportstreams voor de data naar VDR wordt verstuurd.\n"
+"Bepaal de basispoort voor het CURL/EXT protocol.\n"
"\n"
-"Dit is aan te bevelen bij onbetrouwbare of langzame verbindingen."
-
-msgid "EXT protocol base port"
-msgstr "EXT protocol basispoort"
-
-msgid ""
-"Define a base port used by EXT protocol.\n"
-"\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
-msgstr ""
-"Bepaal de basispoort voor het EXT protocol.\n"
-"\n"
-"De poortrange wordt bepaald door het aantal IPTV apparaten. Deze poort luistert naar inkomende verbindingen wanneer het EXT protocol wordt gebruikt."
+"De poortrange wordt bepaald door het aantal IPTV apparaten. Deze poort luistert naar inkomende verbindingen wanneer het CURL/EXT protocol wordt gebruikt."
msgid "Use section filtering"
msgstr "Benutze Abschnittsfilterung"
@@ -145,12 +115,6 @@ msgstr "BESTAND"
msgid "EXT"
msgstr "EXT"
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
msgid "Rid"
msgstr "Rid"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 9e6301e..f24f25c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# Copyright (C) 2007-2014 Rolf Ahrenberg & Antti Seppala
# This file is distributed under the same license as the iptv package.
# Alexander Gross <Bikalexander at gmail.com>, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.0\n"
+"Project-Id-Version: vdr-iptv 2.1.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-01 04:01+0200\n"
-"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"POT-Creation-Date: 2014-05-10 05:10+0200\n"
+"PO-Revision-Date: 2014-05-10 05:10+0200\n"
"Last-Translator: Alexander Gross <Bikalexander at gmail.com>\n"
"Language-Team: Russian <vdr at linuxtv.org>\n"
"Language: ru\n"
@@ -27,14 +27,8 @@ msgstr "NIT (0x40)"
msgid "SDT (0x42)"
msgstr "SDT (0x42)"
-msgid "EIT (0x4E/0x4F)"
-msgstr "EIT (0x4E/0x4F)"
-
-msgid "EIT (0x5X)"
-msgstr "EIT (0x5X)"
-
-msgid "EIT (0x6X)"
-msgstr "EIT (0x6X)"
+msgid "EIT (0x4E/0x4F/0x5X/0x6X)"
+msgstr "EIT (0x4E/0x4F/0x5X/0x6X)"
msgid "TDT (0x70)"
msgstr "TDT (0x70)"
@@ -60,31 +54,13 @@ msgstr "Биты / байт"
msgid "IPTV information not available!"
msgstr "IPTV информация отсутствует!"
-msgid "TS buffer size [MB]"
-msgstr "Размер TS буфера [MB]"
-
-msgid ""
-"Define a ringbuffer size for transport streams in megabytes.\n"
-"\n"
-"Smaller sizes help memory consumption, but are more prone to buffer overflows."
-msgstr ""
-
-msgid "TS buffer prefill ratio [%]"
-msgstr "Предварительный буфер TS [%]"
+msgid "Protocol base port"
+msgstr "Базисный порт протокола"
msgid ""
-"Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
+"Define a base port used by CURL/EXT protocol.\n"
"\n"
-"This is useful if streaming media over a slow or unreliable connection."
-msgstr ""
-
-msgid "EXT protocol base port"
-msgstr "Базисный порт EXT протокола"
-
-msgid ""
-"Define a base port used by EXT protocol.\n"
-"\n"
-"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."
msgstr ""
msgid "Use section filtering"
@@ -131,12 +107,6 @@ msgstr "ФАЙЛ"
msgid "EXT"
msgstr "EXT"
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
msgid "Rid"
msgstr "Rid"
diff --git a/protocolcurl.c b/protocolcurl.c
index b1ac20b..fc42429 100644
--- a/protocolcurl.c
+++ b/protocolcurl.c
@@ -15,25 +15,26 @@
#define iptv_curl_easy_setopt(X, Y, Z) \
if ((res = curl_easy_setopt((X), (Y), (Z))) != CURLE_OK) { \
- error("curl_easy_setopt(%s, %s, %s) failed: %d", #X, #Y, #Z, res); \
+ error("curl_easy_setopt(%s, %s) failed: %s (%d)", #Y, #Z, curl_easy_strerror(res), res); \
}
#define iptv_curl_easy_perform(X) \
if ((res = curl_easy_perform((X))) != CURLE_OK) { \
- error("curl_easy_perform(%s) failed: %d", #X, res); \
+ error("curl_easy_perform() failed: %s (%d)", curl_easy_strerror(res), res); \
}
cIptvProtocolCurl::cIptvProtocolCurl()
: streamUrlM(""),
streamParamM(0),
+ streamPortM(0),
mutexM(),
handleM(NULL),
multiM(NULL),
headerListM(NULL),
- ringBufferM(new cRingBufferLinear(MEGABYTE(IptvConfig.GetTsBufferSize()),
- 7 * TS_SIZE, false, "IPTV CURL")),
- rtspControlM(),
+ ringBufferM(new cRingBufferLinear(IPTV_BUFFER_SIZE, 7 * TS_SIZE, false, "IPTV CURL")),
+ rtspControlM(""),
modeM(eModeUnknown),
+ timeoutM(),
connectedM(false),
pausedM(false)
{
@@ -73,7 +74,7 @@ size_t cIptvProtocolCurl::WriteRtspCallback(void *ptrP, size_t sizeP, size_t nme
//debug("cIptvProtocolCurl::%s(%zu)", __FUNCTION__, len);
// Validate packet header ('$') and channel (0)
- if (obj && (p[0] == 0x24 ) && (p[1] == 0)) {
+ if (obj && (p[0] == 0x24) && (p[1] == 0)) {
int length = (p[2] << 8) | p[3];
if (length > 3) {
// Skip interleave header
@@ -114,17 +115,24 @@ size_t cIptvProtocolCurl::DescribeCallback(void *ptrP, size_t sizeP, size_t nmem
size_t len = sizeP * nmembP;
//debug("cIptvProtocolCurl::%s(%zu)", __FUNCTION__, len);
+ bool found = false;
cString control = "";
char *p = (char *)ptrP;
char *r = strtok(p, "\r\n");
while (r) {
//debug("cIptvProtocolCurl::%s(%zu): %s", __FUNCTION__, len, r);
- if (strstr(r, "a=control")) {
+ // Look for a media name: "video"
+ if (strstr(r, "m=video")) {
+ found = true;
+ }
+ // ... and find out its' attribute
+ if (found && strstr(r, "a=control")) {
char *s = NULL;
- if (sscanf(r, "a=control:%64ms", &s) == 1)
+ if (sscanf(r, "a=control:%255ms", &s) == 1)
control = compactspace(s);
free(s);
+ break;
}
r = strtok(NULL, "\r\n");
}
@@ -155,8 +163,14 @@ size_t cIptvProtocolCurl::HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP
void cIptvProtocolCurl::SetRtspControl(const char *controlP)
{
cMutexLock MutexLock(&mutexM);
- debug("cIptvProtocolCurl::%s(%s)", __FUNCTION__, controlP);
- rtspControlM = controlP;
+ //debug("cIptvProtocolCurl::%s(%s)", __FUNCTION__, controlP);
+ cString protocol = ChangeCase(controlP, false).Truncate(7);
+ if (startswith(*protocol, "rtsp://")) {
+ streamUrlM = controlP;
+ rtspControlM = "";
+ }
+ else
+ rtspControlM = controlP;
}
bool cIptvProtocolCurl::PutData(unsigned char *dataP, int lenP)
@@ -238,10 +252,8 @@ bool cIptvProtocolCurl::Connect()
// Initialize the curl session
if (!handleM)
handleM = curl_easy_init();
- if (!multiM)
- multiM = curl_multi_init();
- if (handleM && multiM && !isempty(*streamUrlM)) {
+ if (handleM && !isempty(*streamUrlM)) {
CURLcode res = CURLE_OK;
cString netrc = cString::sprintf("%s/netrc", IptvConfig.GetConfigDirectory());
@@ -264,7 +276,8 @@ bool cIptvProtocolCurl::Connect()
iptv_curl_easy_setopt(handleM, CURLOPT_NETRC, (long)CURL_NETRC_OPTIONAL);
iptv_curl_easy_setopt(handleM, CURLOPT_NETRC_FILE, *netrc);
- // Set timeout
+ // Set timeouts
+ iptv_curl_easy_setopt(handleM, CURLOPT_TIMEOUT, (long)eConnectTimeoutS);
iptv_curl_easy_setopt(handleM, CURLOPT_CONNECTTIMEOUT, (long)eConnectTimeoutS);
// Set user-agent
@@ -283,6 +296,10 @@ bool cIptvProtocolCurl::Connect()
{
cString uri, control, transport, range;
+ // Create the listening socket for UDP mode
+ if (!streamParamM)
+ OpenSocket(streamPortM);
+
// Request server options
uri = cString::sprintf("%s", *streamUrlM);
iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
@@ -300,8 +317,14 @@ bool cIptvProtocolCurl::Connect()
iptv_curl_easy_setopt(handleM, CURLOPT_WRITEDATA, NULL);
// Setup media stream
- uri = cString::sprintf("%s/%s", *streamUrlM, *rtspControlM);
- transport = "RTP/AVP/TCP;unicast;interleaved=0-1";
+ if (isempty(*rtspControlM))
+ uri = cString::sprintf("%s", *streamUrlM);
+ else
+ uri = cString::sprintf("%s/%s", *streamUrlM, *rtspControlM);
+ if (streamParamM)
+ transport = "RTP/AVP/TCP;unicast;interleaved=0-1";
+ else
+ transport = cString::sprintf("RTP/AVP;unicast;client_port=%d-%d", streamPortM, streamPortM + 1);
iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_TRANSPORT, *transport);
iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_SETUP);
@@ -311,15 +334,20 @@ bool cIptvProtocolCurl::Connect()
uri = cString::sprintf("%s/", *streamUrlM);
range = "0.000-";
iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
- iptv_curl_easy_setopt(handleM, CURLOPT_RANGE, *range);
+ //iptv_curl_easy_setopt(handleM, CURLOPT_RANGE, *range);
iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_PLAY);
iptv_curl_easy_perform(handleM);
// Start receiving
- iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEFUNCTION, cIptvProtocolCurl::WriteRtspCallback);
- iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEDATA, this);
- iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
- iptv_curl_easy_perform(handleM);
+ if (streamParamM) {
+ iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEFUNCTION, cIptvProtocolCurl::WriteRtspCallback);
+ iptv_curl_easy_setopt(handleM, CURLOPT_INTERLEAVEDATA, this);
+ iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
+ iptv_curl_easy_perform(handleM);
+ }
+
+ // Don't add handle into multi set
+ isActiveM = true;
}
break;
#endif
@@ -341,18 +369,34 @@ bool cIptvProtocolCurl::Connect()
headerListM = curl_slist_append(headerListM, "Pragma: no-cache");
headerListM = curl_slist_append(headerListM, "Expires: Mon, 26 Jul 1997 05:00:00 GMT");
iptv_curl_easy_setopt(handleM, CURLOPT_HTTPHEADER, headerListM);
+
+ // Initialize multi set and add handle into it
+ if (!multiM)
+ multiM = curl_multi_init();
+ if (multiM)
+ curl_multi_add_handle(multiM, handleM);
}
break;
case eModeFile:
+ {
+ // Set timeout
+ iptv_curl_easy_setopt(handleM, CURLOPT_TIMEOUT_MS, 10L);
+
+ // Initialize multi set and add handle into it
+ if (!multiM)
+ multiM = curl_multi_init();
+ if (multiM)
+ curl_multi_add_handle(multiM, handleM);
+ }
+ break;
+
case eModeUnknown:
default:
break;
}
- // Add handle into multi set
- curl_multi_add_handle(multiM, handleM);
-
+ timeoutM.Set(eKeepAliveIntervalMs);
connectedM = true;
return true;
}
@@ -368,7 +412,14 @@ bool cIptvProtocolCurl::Disconnect()
return true;
// Terminate curl session
- if (handleM && multiM) {
+ if (handleM) {
+ // Remove handle from multi set
+ if (multiM) {
+ curl_multi_remove_handle(multiM, handleM);
+ curl_multi_cleanup(multiM);
+ multiM = NULL;
+ }
+
// Mode specific tricks
switch (modeM) {
#ifdef USE_RTSP
@@ -381,6 +432,9 @@ bool cIptvProtocolCurl::Disconnect()
iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_TEARDOWN);
iptv_curl_easy_perform(handleM);
rtspControlM = "";
+ isActiveM = false;
+ // Close the listening socket
+ CloseSocket();
}
break;
#endif
@@ -397,11 +451,8 @@ bool cIptvProtocolCurl::Disconnect()
curl_slist_free_all(headerListM);
headerListM = NULL;
}
- curl_multi_remove_handle(multiM, handleM);
curl_easy_cleanup(handleM);
handleM = NULL;
- curl_multi_cleanup(multiM);
- multiM = NULL;
}
ClearData();
@@ -428,55 +479,70 @@ int cIptvProtocolCurl::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
int len = 0;
if (ringBufferM) {
// Fill up the buffer
- if (handleM && multiM) {
+ if (handleM) {
switch (modeM) {
#ifdef USE_RTSP
case eModeRtsp:
{
cMutexLock MutexLock(&mutexM);
CURLcode res = CURLE_OK;
- iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
- iptv_curl_easy_perform(handleM);
- // @todo - How to detect eof?
+
+ // Remember the heart beat
+ if (timeoutM.TimedOut()) {
+ debug("cIptvProtocolCurl::%s(): KeepAlive", __FUNCTION__);
+ cString uri = cString::sprintf("%s", *streamUrlM);
+ iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_STREAM_URI, *uri);
+ iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_OPTIONS);
+ iptv_curl_easy_perform(handleM);
+ timeoutM.Set(eKeepAliveIntervalMs);
+ }
+
+ // Check whether UDP or TCP mode used
+ if (streamParamM) {
+ iptv_curl_easy_setopt(handleM, CURLOPT_RTSP_REQUEST, (long)CURL_RTSPREQ_RECEIVE);
+ iptv_curl_easy_perform(handleM);
+ }
+ else
+ return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
}
break;
#endif
case eModeFile:
case eModeHttp:
case eModeHttps:
- {
- CURLMcode res;
- int running_handles;
-
- do {
- cMutexLock MutexLock(&mutexM);
- res = curl_multi_perform(multiM, &running_handles);
- } while (res == CURLM_CALL_MULTI_PERFORM);
-
- // Use 20% threshold before continuing to filling up the buffer.
- mutexM.Lock();
- if (pausedM && (ringBufferM->Available() < (MEGABYTE(IptvConfig.GetTsBufferSize()) / 5))) {
- debug("cIptvProtocolCurl::%s(continue): free=%d available=%d", __FUNCTION__,
- ringBufferM->Free(), ringBufferM->Available());
- pausedM = false;
- curl_easy_pause(handleM, CURLPAUSE_CONT);
- }
- mutexM.Unlock();
+ if (multiM) {
+ CURLMcode res;
+ int running_handles;
- // Check if end of file
- if (running_handles == 0) {
- int msgcount;
+ do {
+ cMutexLock MutexLock(&mutexM);
+ res = curl_multi_perform(multiM, &running_handles);
+ } while (res == CURLM_CALL_MULTI_PERFORM);
+
+ // Use 20% threshold before continuing to filling up the buffer.
mutexM.Lock();
- CURLMsg *msg = curl_multi_info_read(multiM, &msgcount);
+ if (pausedM && (ringBufferM->Available() < (IPTV_BUFFER_SIZE / 5))) {
+ debug("cIptvProtocolCurl::%s(continue): free=%d available=%d", __FUNCTION__,
+ ringBufferM->Free(), ringBufferM->Available());
+ pausedM = false;
+ curl_easy_pause(handleM, CURLPAUSE_CONT);
+ }
mutexM.Unlock();
- if (msg && (msg->msg == CURLMSG_DONE)) {
- debug("cIptvProtocolCurl::%s(done): %s (%d)", __FUNCTION__,
- curl_easy_strerror(msg->data.result), msg->data.result);
- Disconnect();
- Connect();
+
+ // Check if end of file
+ if (running_handles == 0) {
+ int msgcount;
+ mutexM.Lock();
+ CURLMsg *msg = curl_multi_info_read(multiM, &msgcount);
+ mutexM.Unlock();
+ if (msg && (msg->msg == CURLMSG_DONE)) {
+ debug("cIptvProtocolCurl::%s(done): %s (%d)", __FUNCTION__,
+ curl_easy_strerror(msg->data.result), msg->data.result);
+ Disconnect();
+ Connect();
+ }
}
}
- }
break;
case eModeUnknown:
@@ -498,7 +564,7 @@ int cIptvProtocolCurl::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
return len;
}
-bool cIptvProtocolCurl::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolCurl::SetSource(const char* locationP, const int parameterP, const int indexP)
{
debug("cIptvProtocolCurl::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
if (!isempty(locationP)) {
@@ -518,14 +584,22 @@ bool cIptvProtocolCurl::Set(const char* locationP, const int parameterP, const i
else
modeM = eModeUnknown;
debug("cIptvProtocolCurl::%s(): %s (%d)", __FUNCTION__, *protocol, modeM);
- // Update stream parameter
- streamParamM = parameterP;
+ // Update stream parameter - force UDP mode for RTSP
+ streamParamM = (modeM == eModeRtsp) ? 0 : parameterP;
+ // Update listen port
+ streamPortM = IptvConfig.GetProtocolBasePort() + indexP * 2;
// Reconnect
Connect();
}
return true;
}
+bool cIptvProtocolCurl::SetPid(int pidP, int typeP, bool onP)
+{
+ //debug("cIptvProtocolCurl::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+ return true;
+}
+
cString cIptvProtocolCurl::GetInformation(void)
{
//debug("cIptvProtocolCurl::%s()", __FUNCTION__);
diff --git a/protocolcurl.h b/protocolcurl.h
index ef6a464..a5a0cc4 100644
--- a/protocolcurl.h
+++ b/protocolcurl.h
@@ -16,8 +16,9 @@
#include <vdr/tools.h>
#include "protocolif.h"
+#include "socket.h"
-class cIptvProtocolCurl : public cIptvProtocolIf {
+class cIptvProtocolCurl : public cIptvUdpSocket, public cIptvProtocolIf {
private:
enum eModeType {
eModeUnknown = 0,
@@ -28,8 +29,9 @@ private:
eModeCount
};
enum {
- eConnectTimeoutS = 5, // in seconds
- eMaxDownloadSpeedMBits = 20 // in megabits per second
+ eConnectTimeoutS = 5, // in seconds
+ eMaxDownloadSpeedMBits = 20, // in megabits per second
+ eKeepAliveIntervalMs = 300000 // in milliseconds
};
static size_t WriteCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
@@ -39,6 +41,7 @@ private:
cString streamUrlM;
int streamParamM;
+ int streamPortM;
cMutex mutexM;
CURL *handleM;
CURLM *multiM;
@@ -46,6 +49,7 @@ private:
cRingBufferLinear *ringBufferM;
cString rtspControlM;
eModeType modeM;
+ cTimeMs timeoutM;
bool connectedM;
bool pausedM;
@@ -60,7 +64,8 @@ public:
cIptvProtocolCurl();
virtual ~cIptvProtocolCurl();
int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
- bool Set(const char* locationP, const int parameterP, const int indexP);
+ bool SetSource(const char* locationP, const int parameterP, const int indexP);
+ bool SetPid(int pidP, int typeP, bool onP);
bool Open(void);
bool Close(void);
cString GetInformation(void);
diff --git a/protocolext.c b/protocolext.c
index 556665c..59d69d3 100644
--- a/protocolext.c
+++ b/protocolext.c
@@ -152,24 +152,30 @@ int cIptvProtocolExt::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
}
-bool cIptvProtocolExt::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolExt::SetSource(const char* locationP, const int parameterP, const int indexP)
{
debug("cIptvProtocolExt::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
if (!isempty(locationP)) {
struct stat stbuf;
// Update script file and parameter
- scriptFileM = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), locationP);
+ scriptFileM = cString::sprintf("%s/%s", IptvConfig.GetResourceDirectory(), locationP);
if ((stat(*scriptFileM, &stbuf) != 0) || (strstr(*scriptFileM, "..") != 0)) {
error("Non-existent or relative path script '%s'", *scriptFileM);
return false;
}
scriptParameterM = parameterP;
// Update listen port
- streamPortM = IptvConfig.GetExtProtocolBasePort() + indexP;
+ streamPortM = IptvConfig.GetProtocolBasePort() + indexP * 2;
}
return true;
}
+bool cIptvProtocolExt::SetPid(int pidP, int typeP, bool onP)
+{
+ //debug("cIptvProtocolExt::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+ return true;
+}
+
cString cIptvProtocolExt::GetInformation(void)
{
//debug("cIptvProtocolExt::%s()", __FUNCTION__);
diff --git a/protocolext.h b/protocolext.h
index bd19feb..22c2833 100644
--- a/protocolext.h
+++ b/protocolext.h
@@ -27,7 +27,8 @@ public:
cIptvProtocolExt();
virtual ~cIptvProtocolExt();
int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
- bool Set(const char* locationP, const int parameterP, const int indexP);
+ bool SetSource(const char* locationP, const int parameterP, const int indexP);
+ bool SetPid(int pidP, int typeP, bool onP);
bool Open(void);
bool Close(void);
cString GetInformation(void);
diff --git a/protocolfile.c b/protocolfile.c
index 885d137..51cd746 100644
--- a/protocolfile.c
+++ b/protocolfile.c
@@ -95,7 +95,7 @@ bool cIptvProtocolFile::Close(void)
return true;
}
-bool cIptvProtocolFile::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolFile::SetSource(const char* locationP, const int parameterP, const int indexP)
{
debug("cIptvProtocolFile::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
if (!isempty(locationP)) {
@@ -110,6 +110,12 @@ bool cIptvProtocolFile::Set(const char* locationP, const int parameterP, const i
return true;
}
+bool cIptvProtocolFile::SetPid(int pidP, int typeP, bool onP)
+{
+ //debug("cIptvProtocolFile::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+ return true;
+}
+
cString cIptvProtocolFile::GetInformation(void)
{
//debug("cIptvProtocolFile::%s()", __FUNCTION__);
diff --git a/protocolfile.h b/protocolfile.h
index 97d4e13..90b770a 100644
--- a/protocolfile.h
+++ b/protocolfile.h
@@ -26,7 +26,8 @@ public:
cIptvProtocolFile();
virtual ~cIptvProtocolFile();
int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
- bool Set(const char* locationP, const int parameterP, const int indexP);
+ bool SetSource(const char* locationP, const int parameterP, const int indexP);
+ bool SetPid(int pidP, int typeP, bool onP);
bool Open(void);
bool Close(void);
cString GetInformation(void);
diff --git a/protocolhttp.c b/protocolhttp.c
index 5d85348..3d933aa 100644
--- a/protocolhttp.c
+++ b/protocolhttp.c
@@ -177,7 +177,7 @@ int cIptvProtocolHttp::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
return cIptvTcpSocket::Read(bufferAddrP, bufferLenP);
}
-bool cIptvProtocolHttp::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolHttp::SetSource(const char* locationP, const int parameterP, const int indexP)
{
debug("cIptvProtocolHttp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
if (!isempty(locationP)) {
@@ -199,6 +199,12 @@ bool cIptvProtocolHttp::Set(const char* locationP, const int parameterP, const i
return true;
}
+bool cIptvProtocolHttp::SetPid(int pidP, int typeP, bool onP)
+{
+ //debug("cIptvProtocolHttp::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+ return true;
+}
+
cString cIptvProtocolHttp::GetInformation(void)
{
//debug("cIptvProtocolHttp::%s()", __FUNCTION__);
diff --git a/protocolhttp.h b/protocolhttp.h
index 99bec0e..12f3772 100644
--- a/protocolhttp.h
+++ b/protocolhttp.h
@@ -28,7 +28,8 @@ public:
cIptvProtocolHttp();
virtual ~cIptvProtocolHttp();
int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
- bool Set(const char* locationP, const int parameterP, const int indexP);
+ bool SetSource(const char* locationP, const int parameterP, const int indexP);
+ bool SetPid(int pidP, int typeP, bool onP);
bool Open(void);
bool Close(void);
cString GetInformation(void);
diff --git a/protocolif.h b/protocolif.h
index a76f76a..d90cfc0 100644
--- a/protocolif.h
+++ b/protocolif.h
@@ -13,7 +13,8 @@ public:
cIptvProtocolIf() {}
virtual ~cIptvProtocolIf() {}
virtual int Read(unsigned char* bufferAddrP, unsigned int bufferLenP) = 0;
- virtual bool Set(const char* locationP, const int parameterP, const int indexP) = 0;
+ virtual bool SetSource(const char* locationP, const int parameterP, const int indexP) = 0;
+ virtual bool SetPid(int pidP, int typeP, bool onP) = 0;
virtual bool Open(void) = 0;
virtual bool Close(void) = 0;
virtual cString GetInformation(void) = 0;
diff --git a/protocoludp.c b/protocoludp.c
index 1b2869f..a83845e 100644
--- a/protocoludp.c
+++ b/protocoludp.c
@@ -70,7 +70,7 @@ int cIptvProtocolUdp::Read(unsigned char* bufferAddrP, unsigned int bufferLenP)
return cIptvUdpSocket::Read(bufferAddrP, bufferLenP);
}
-bool cIptvProtocolUdp::Set(const char* locationP, const int parameterP, const int indexP)
+bool cIptvProtocolUdp::SetSource(const char* locationP, const int parameterP, const int indexP)
{
debug("cIptvProtocolUdp::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
if (!isempty(locationP)) {
@@ -103,6 +103,12 @@ bool cIptvProtocolUdp::Set(const char* locationP, const int parameterP, const in
return true;
}
+bool cIptvProtocolUdp::SetPid(int pidP, int typeP, bool onP)
+{
+ //debug("cIptvProtocolUdp::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+ return true;
+}
+
cString cIptvProtocolUdp::GetInformation(void)
{
//debug("cIptvProtocolUdp::%s()", __FUNCTION__);
diff --git a/protocoludp.h b/protocoludp.h
index 15f2ca4..5674019 100644
--- a/protocoludp.h
+++ b/protocoludp.h
@@ -23,7 +23,8 @@ public:
cIptvProtocolUdp();
virtual ~cIptvProtocolUdp();
int Read(unsigned char* bufferAddrP, unsigned int bufferLenP);
- bool Set(const char* locationP, const int parameterP, const int indexP);
+ bool SetSource(const char* locationP, const int parameterP, const int indexP);
+ bool SetPid(int pidP, int typeP, bool onP);
bool Open(void);
bool Close(void);
cString GetInformation(void);
diff --git a/sectionfilter.c b/sectionfilter.c
index 375b7de..98a0fdf 100644
--- a/sectionfilter.c
+++ b/sectionfilter.c
@@ -17,6 +17,7 @@ cIptvSectionFilter::cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t
secLenM(0),
tsFeedpM(0),
pidM(pidP),
+ ringBufferM(new cRingBufferFrame(eDmxMaxSectionCount * eDmxMaxSectionSize)),
deviceIndexM(deviceIndexP)
{
//debug("cIptvSectionFilter::%s(%d, %d)", __FUNCTION__, deviceIndexM, pidM);
@@ -33,11 +34,11 @@ cIptvSectionFilter::cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t
filterMaskM[0] = maskP;
// Invert the filter
- for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i)
+ for (i = 0; i < eDmxMaxFilterSize; ++i)
filterValueM[i] ^= 0xFF;
uint8_t mask, mode, doneq = 0;
- for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
+ for (i = 0; i < eDmxMaxFilterSize; ++i) {
mode = filterModeM[i];
mask = filterMaskM[i];
maskAndModeM[i] = (uint8_t)(mask & mode);
@@ -48,7 +49,7 @@ cIptvSectionFilter::cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t
// Create sockets
socketM[0] = socketM[1] = -1;
- if (socketpair(AF_UNIX, SOCK_DGRAM, 0, socketM) != 0) {
+ if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, socketM) != 0) {
char tmp[64];
error("Opening section filter sockets failed (device=%d pid=%d): %s", deviceIndexM, pidM, strerror_r(errno, tmp, sizeof(tmp)));
}
@@ -70,6 +71,7 @@ cIptvSectionFilter::~cIptvSectionFilter()
if (tmp >= 0)
close(tmp);
secBufM = NULL;
+ DELETENULL(ringBufferM);
}
inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *dataP)
@@ -89,7 +91,7 @@ int cIptvSectionFilter::Filter(void)
int i;
uint8_t neq = 0;
- for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
+ for (i = 0; i < eDmxMaxFilterSize; ++i) {
uint8_t calcxor = (uint8_t)(filterValueM[i] ^ secBufM[i]);
if (maskAndModeM[i] & calcxor)
return 0;
@@ -99,13 +101,8 @@ int cIptvSectionFilter::Filter(void)
if (doneqM && !neq)
return 0;
- // There is no data in the read socket, more can be written
- if ((socketM[0] >= 0) && (socketM[1] >= 0) /*&& !select_single_desc(socketM[0], 0, false)*/) {
- ssize_t len = write(socketM[1], secBufM, secLenM);
- ERROR_IF(len < 0, "write()");
- // Update statistics
- AddSectionStatistic(len, 1);
- }
+ if (ringBufferM && (secLenM > 0))
+ ringBufferM->Put(new cFrame(secBufM, secLenM));
}
return 0;
}
@@ -122,11 +119,11 @@ int cIptvSectionFilter::CopyDump(const uint8_t *bufP, uint8_t lenP)
{
uint16_t limit, seclen, n;
- if (tsFeedpM >= DMX_MAX_SECFEED_SIZE)
+ if (tsFeedpM >= eDmxMaxSectionFeedSize)
return 0;
- if (tsFeedpM + lenP > DMX_MAX_SECFEED_SIZE)
- lenP = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsFeedpM);
+ if (tsFeedpM + lenP > eDmxMaxSectionFeedSize)
+ lenP = (uint8_t)(eDmxMaxSectionFeedSize - tsFeedpM);
if (lenP <= 0)
return 0;
@@ -135,7 +132,7 @@ int cIptvSectionFilter::CopyDump(const uint8_t *bufP, uint8_t lenP)
tsFeedpM = uint16_t(tsFeedpM + lenP);
limit = tsFeedpM;
- if (limit > DMX_MAX_SECFEED_SIZE)
+ if (limit > eDmxMaxSectionFeedSize)
return -1; // internal error should never happen
// Always set secbuf
@@ -143,7 +140,7 @@ int cIptvSectionFilter::CopyDump(const uint8_t *bufP, uint8_t lenP)
for (n = 0; secBufpM + 2 < limit; ++n) {
seclen = GetLength(secBufM);
- if ((seclen <= 0) || (seclen > DMX_MAX_SECTION_SIZE) || ((seclen + secBufpM) > limit))
+ if ((seclen <= 0) || (seclen > eDmxMaxSectionSize) || ((seclen + secBufpM) > limit))
return 0;
secLenM = seclen;
if (pusiSeenM)
@@ -211,13 +208,33 @@ void cIptvSectionFilter::Process(const uint8_t* dataP)
}
}
+bool cIptvSectionFilter::Send(void)
+{
+ bool result = false;
+ cFrame *section = ringBufferM->Get();
+ if (section) {
+ uchar *data = section->Data();
+ int count = section->Count();
+ if (data && (count > 0) && (socketM[1] >= 0) && (socketM[0] >= 0)) {
+ ssize_t len = send(socketM[1], data, count, MSG_EOR);
+ ERROR_IF(len < 0 && errno != EAGAIN, "send()");
+ if (len > 0) {
+ ringBufferM->Drop(section);
+ result = !!ringBufferM->Available();
+ // Update statistics
+ AddSectionStatistic(len, 1);
+ }
+ }
+ }
+ return result;
+}
+
cIptvSectionFilterHandler::cIptvSectionFilterHandler(int deviceIndexP, unsigned int bufferLenP)
-: cThread("IPTV section handler", true),
+: cThread("IPTV section handler"),
+ ringBufferM(new cRingBufferLinear(bufferLenP, TS_SIZE, false, *cString::sprintf("IPTV SECTION HANDLER %d", deviceIndexP))),
mutexM(),
- deviceIndexM(deviceIndexP),
- processedM(false),
- ringBufferM(new cRingBufferLinear(bufferLenP, TS_SIZE, false, *cString::sprintf("IPTV SECTION HANDLER %d", deviceIndexP)))
+ deviceIndexM(deviceIndexP)
{
debug("cIptvSectionFilterHandler::%s(%d)", __FUNCTION__, deviceIndexM);
@@ -241,6 +258,7 @@ cIptvSectionFilterHandler::~cIptvSectionFilterHandler()
// Stop thread
if (Running())
Cancel(3);
+ DELETE_POINTER(ringBufferM);
// Destroy all filters
cMutexLock MutexLock(&mutexM);
@@ -251,14 +269,25 @@ cIptvSectionFilterHandler::~cIptvSectionFilterHandler()
void cIptvSectionFilterHandler::Action(void)
{
debug("cIptvSectionFilterHandler::%s(%d): entering", __FUNCTION__, deviceIndexM);
+ bool processed = false;
// Do the thread loop
while (Running()) {
+ // Send demuxed section packets through all filters
+ bool retry = false;
+ mutexM.Lock();
+ for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
+ if (filtersM[i] && filtersM[i]->Send())
+ retry = true;
+ }
+ mutexM.Unlock();
+ if (retry)
+ continue;
// Read one TS packet
if (ringBufferM) {
int len = 0;
- if (processedM) {
+ if (processed) {
ringBufferM->Del(TS_SIZE);
- processedM = false;
+ processed = false;
}
uchar *p = ringBufferM->Get(len);
if (p && (len >= TS_SIZE)) {
@@ -280,7 +309,7 @@ void cIptvSectionFilterHandler::Action(void)
filtersM[i]->Process(p);
}
mutexM.Unlock();
- processedM = true;
+ processed = true;
continue;
}
}
@@ -349,7 +378,7 @@ int cIptvSectionFilterHandler::Open(u_short pidP, u_char tidP, u_char maskP)
for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
if (!filtersM[i]) {
filtersM[i] = new cIptvSectionFilter(deviceIndexM, pidP, tidP, maskP);
- debug("cIptvSectionFilterHandler::%s(%d): pid=%d tid=%02X mask=%02X handle=%d index=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP, filtersM[i]->GetFd(), i);
+ //debug("cIptvSectionFilterHandler::%s(%d): pid=%d tid=%02X mask=%02X handle=%d index=%u", __FUNCTION__, deviceIndexM, pidP, tidP, maskP, filtersM[i]->GetFd(), i);
return filtersM[i]->GetFd();
}
}
@@ -371,6 +400,20 @@ void cIptvSectionFilterHandler::Close(int handleP)
}
}
+int cIptvSectionFilterHandler::GetPid(int handleP)
+{
+ // Lock
+ cMutexLock MutexLock(&mutexM);
+ // Search the filter for data
+ for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
+ if (filtersM[i] && (handleP == filtersM[i]->GetFd())) {
+ debug("cIptvSectionFilterHandler::%s(%d): pid=%d handle=%d index=%d", __FUNCTION__, deviceIndexM, filtersM[i]->GetPid(), filtersM[i]->GetFd(), i);
+ return filtersM[i]->GetPid();
+ }
+ }
+ return -1;
+}
+
void cIptvSectionFilterHandler::Write(uchar *bufferP, int lengthP)
{
//debug("cIptvSectionFilterHandler::%s(%d): length=%d", __FUNCTION__, deviceIndexM, lengthP);
@@ -381,4 +424,3 @@ void cIptvSectionFilterHandler::Write(uchar *bufferP, int lengthP)
ringBufferM->ReportOverflow(lengthP - len);
}
}
-
diff --git a/sectionfilter.h b/sectionfilter.h
index 935ed5e..cb24d25 100644
--- a/sectionfilter.h
+++ b/sectionfilter.h
@@ -18,10 +18,11 @@
class cIptvSectionFilter : public cIptvSectionStatistics {
private:
- enum dmx_limits {
- DMX_MAX_FILTER_SIZE = 18,
- DMX_MAX_SECTION_SIZE = 4096,
- DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + TS_SIZE)
+ enum {
+ eDmxMaxFilterSize = 18,
+ eDmxMaxSectionCount = 64,
+ eDmxMaxSectionSize = 4096,
+ eDmxMaxSectionFeedSize = (eDmxMaxSectionSize + TS_SIZE)
};
int pusiSeenM;
@@ -29,21 +30,22 @@ private:
int doneqM;
uint8_t *secBufM;
- uint8_t secBufBaseM[DMX_MAX_SECFEED_SIZE];
+ uint8_t secBufBaseM[eDmxMaxSectionFeedSize];
uint16_t secBufpM;
uint16_t secLenM;
uint16_t tsFeedpM;
uint16_t pidM;
+ cRingBufferFrame *ringBufferM;
int deviceIndexM;
int socketM[2];
- uint8_t filterValueM[DMX_MAX_FILTER_SIZE];
- uint8_t filterMaskM[DMX_MAX_FILTER_SIZE];
- uint8_t filterModeM[DMX_MAX_FILTER_SIZE];
+ uint8_t filterValueM[eDmxMaxFilterSize];
+ uint8_t filterMaskM[eDmxMaxFilterSize];
+ uint8_t filterModeM[eDmxMaxFilterSize];
- uint8_t maskAndModeM[DMX_MAX_FILTER_SIZE];
- uint8_t maskAndNotModeM[DMX_MAX_FILTER_SIZE];
+ uint8_t maskAndModeM[eDmxMaxFilterSize];
+ uint8_t maskAndNotModeM[eDmxMaxFilterSize];
inline uint16_t GetLength(const uint8_t *dataP);
void New(void);
@@ -56,6 +58,7 @@ public:
cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t tidP, uint8_t maskP);
virtual ~cIptvSectionFilter();
void Process(const uint8_t* dataP);
+ bool Send(void);
int GetFd(void) { return socketM[0]; }
uint16_t GetPid(void) const { return pidM; }
};
@@ -65,10 +68,9 @@ private:
enum {
eMaxSecFilterCount = 32
};
+ cRingBufferLinear *ringBufferM;
cMutex mutexM;
int deviceIndexM;
- bool processedM;
- cRingBufferLinear *ringBufferM;
cIptvSectionFilter *filtersM[eMaxSecFilterCount];
bool Delete(unsigned int indexP);
@@ -83,6 +85,7 @@ public:
cString GetInformation(void);
int Open(u_short pidP, u_char tidP, u_char maskP);
void Close(int handleP);
+ int GetPid(int handleP);
void Write(u_char *bufferP, int lengthP);
};
diff --git a/setup.c b/setup.c
index 1fc9bef..b7f84a3 100644
--- a/setup.c
+++ b/setup.c
@@ -113,9 +113,7 @@ eOSState cIptvMenuInfo::ProcessKey(eKeys keyP)
cIptvPluginSetup::cIptvPluginSetup()
{
debug("cIptvPluginSetup::%s()", __FUNCTION__);
- tsBufferSizeM = IptvConfig.GetTsBufferSize();
- tsBufferPrefillM = IptvConfig.GetTsBufferPrefillRatio();
- extProtocolBasePortM = IptvConfig.GetExtProtocolBasePort();
+ protocolBasePortM = IptvConfig.GetProtocolBasePort();
sectionFilteringM = IptvConfig.GetSectionFiltering();
numDisabledFiltersM = IptvConfig.GetDisabledFiltersCount();
if (numDisabledFiltersM > SECTION_FILTER_TABLE_SIZE)
@@ -136,20 +134,14 @@ void cIptvPluginSetup::Setup(void)
Clear();
helpM.Clear();
- Add(new cMenuEditIntItem( tr("TS buffer size [MB]"), &tsBufferSizeM, 1, 4));
- helpM.Append(tr("Define a ringbuffer size for transport streams in megabytes.\n\nSmaller sizes help memory consumption, but are more prone to buffer overflows."));
-
- Add(new cMenuEditIntItem( tr("TS buffer prefill ratio [%]"), &tsBufferPrefillM, 0, 40));
- helpM.Append(tr("Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n\nThis is useful if streaming media over a slow or unreliable connection."));
-
- Add(new cMenuEditIntItem( tr("EXT protocol base port"), &extProtocolBasePortM, 0, 0xFFF7));
- helpM.Append(tr("Define a base port used by EXT protocol.\n\nThe port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."));
+ Add(new cMenuEditIntItem(tr("Protocol base port"), &protocolBasePortM, 0, 0xFFFF - MAXDEVICES * 2));
+ helpM.Append(tr("Define a base port used by CURL/EXT protocol.\n\nThe port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the CURL/EXT protocol."));
Add(new cMenuEditBoolItem(tr("Use section filtering"), §ionFilteringM));
helpM.Append(tr("Define whether the section filtering shall be used.\n\nSection filtering means that IPTV plugin tries to parse and provide VDR with secondary data about the currently active stream. VDR can then use this data for providing various functionalities such as automatic pid change detection and EPG etc.\nEnabling this feature does not affect streams that do not contain section data."));
if (sectionFilteringM) {
- Add(new cMenuEditIntItem( tr("Disable filters"), &numDisabledFiltersM, 0, SECTION_FILTER_TABLE_SIZE));
+ Add(new cMenuEditIntItem(tr("Disable filters"), &numDisabledFiltersM, 0, SECTION_FILTER_TABLE_SIZE));
helpM.Append(tr("Define number of section filters to be disabled.\n\nCertain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."));
for (int i = 0; i < numDisabledFiltersM; ++i) {
@@ -217,15 +209,11 @@ void cIptvPluginSetup::StoreFilters(const char *nameP, int *valuesP)
void cIptvPluginSetup::Store(void)
{
// Store values into setup.conf
- SetupStore("TsBufferSize", tsBufferSizeM);
- SetupStore("TsBufferPrefill", tsBufferPrefillM);
- SetupStore("ExtProtocolBasePort", extProtocolBasePortM);
+ SetupStore("ExtProtocolBasePort", protocolBasePortM);
SetupStore("SectionFiltering", sectionFilteringM);
StoreFilters("DisabledFilters", disabledFilterIndexesM);
// Update global config
- IptvConfig.SetTsBufferSize(tsBufferSizeM);
- IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefillM);
- IptvConfig.SetExtProtocolBasePort(extProtocolBasePortM);
+ IptvConfig.SetProtocolBasePort(protocolBasePortM);
IptvConfig.SetSectionFiltering(sectionFilteringM);
for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i)
IptvConfig.SetDisabledFilters(i, disabledFilterIndexesM[i]);
diff --git a/setup.h b/setup.h
index 3399e91..bbc9ed6 100644
--- a/setup.h
+++ b/setup.h
@@ -15,9 +15,7 @@
class cIptvPluginSetup : public cMenuSetupPage
{
private:
- int tsBufferSizeM;
- int tsBufferPrefillM;
- int extProtocolBasePortM;
+ int protocolBasePortM;
int sectionFilteringM;
int numDisabledFiltersM;
int disabledFilterIndexesM[SECTION_FILTER_TABLE_SIZE];
diff --git a/sidscanner.c b/sidscanner.c
index c989561..fc626ea 100644
--- a/sidscanner.c
+++ b/sidscanner.c
@@ -71,15 +71,21 @@ void cSidScanner::Process(u_short pidP, u_char tidP, const u_char *dataP, int le
if (ts.getTransportStreamId() != channelIdM.Tid()) {
debug("cSidScanner::%s(): tsid=%d", __FUNCTION__, ts.getTransportStreamId());
newTid = ts.getTransportStreamId();
+ tidFoundM = true;
+ }
+ if (ts.getOriginalNetworkId() != channelIdM.Nid()) {
+ debug("cSidScanner::%s(): onid=%d", __FUNCTION__, ts.getOriginalNetworkId());
+ newNid = ts.getOriginalNetworkId();
+ nidFoundM = true;
}
- tidFoundM = true;
break; // default to the first one
}
- if (nit.getNetworkId() != channelIdM.Nid()) {
- debug("cSidScanner::%s(): nid=%d", __FUNCTION__, ts.getTransportStreamId());
+ // fallback for network id if not found already
+ if (!nidFoundM && (nit.getNetworkId() != channelIdM.Nid())) {
+ debug("cSidScanner::%s(): nid=%d", __FUNCTION__, nit.getNetworkId());
newNid = nit.getNetworkId();
+ nidFoundM = true;
}
- nidFoundM = true;
}
}
if ((newSid >= 0) || (newNid >= 0) || (newTid >= 0)) {
diff --git a/socket.c b/socket.c
index afbf28a..8137719 100644
--- a/socket.c
+++ b/socket.c
@@ -21,6 +21,9 @@
cIptvSocket::cIptvSocket()
: socketPortM(0),
socketDescM(-1),
+ lastErrorReportM(0),
+ packetErrorsM(0),
+ sequenceNumberM(-1),
isActiveM(false)
{
debug("cIptvSocket::%s()", __FUNCTION__);
@@ -36,7 +39,7 @@ cIptvSocket::~cIptvSocket()
bool cIptvSocket::OpenSocket(const int portP, const bool isUdpP)
{
- debug("cIptvSocket::%s()", __FUNCTION__);
+ debug("cIptvSocket::%s(%d, %d)", __FUNCTION__, portP, isUdpP);
// If socket is there already and it is bound to a different port, it must
// be closed first
if (portP != socketPortM) {
@@ -87,6 +90,11 @@ void cIptvSocket::CloseSocket(void)
socketPortM = 0;
memset(&sockAddrM, 0, sizeof(sockAddrM));
}
+ if (packetErrorsM) {
+ info("detected %d RTP packet errors", packetErrorsM);
+ packetErrorsM = 0;
+ lastErrorReportM = time(NULL);
+ }
}
bool cIptvSocket::CheckAddress(const char *addrP, in_addr_t *inAddrP)
@@ -274,6 +282,21 @@ int cIptvUdpSocket::Read(unsigned char *bufferAddrP, unsigned int bufferLenP)
unsigned int cc = bufferAddrP[0] & 0x0F;
// Payload type: MPEG2 TS = 33
//unsigned int pt = bufferAddrP[1] & 0x7F;
+ // Sequence number
+ int seq = ((bufferAddrP[2] & 0xFF) << 8) | (bufferAddrP[3] & 0xFF);
+ if ((((sequenceNumberM + 1) % 0xFFFF) == 0) && (seq == 0xFFFF))
+ sequenceNumberM = -1;
+ else if ((sequenceNumberM >= 0) && (((sequenceNumberM + 1) % 0xFFFF) != seq)) {
+ packetErrorsM++;
+ if (time(NULL) - lastErrorReportM > eReportIntervalS) {
+ info("detected %d RTP packet errors", packetErrorsM);
+ packetErrorsM = 0;
+ lastErrorReportM = time(NULL);
+ }
+ sequenceNumberM = seq;
+ }
+ else
+ sequenceNumberM = seq;
// Header lenght
unsigned int headerlen = (3 + cc) * (unsigned int)sizeof(uint32_t);
// Check if extension
@@ -401,7 +424,7 @@ bool cIptvTcpSocket::Write(const char *bufferAddrP, unsigned int bufferLenP)
//debug("cIptvTcpSocket::%s()", __FUNCTION__);
// Error out if socket not initialized
if (socketDescM <= 0) {
- error("Invalid socket in cIptvTcpSocket::%s()", __FUNCTION__);
+ error("cIptvTcpSocket::%s(): Invalid socket", __FUNCTION__);
return false;
}
ERROR_IF_RET(send(socketDescM, bufferAddrP, bufferLenP, 0) < 0, "send()", return false);
diff --git a/socket.h b/socket.h
index 19caedc..1f7d14e 100644
--- a/socket.h
+++ b/socket.h
@@ -18,8 +18,14 @@ private:
int socketPortM;
protected:
+ enum {
+ eReportIntervalS = 300 // in seconds
+ };
int socketDescM;
struct sockaddr_in sockAddrM;
+ time_t lastErrorReportM;
+ int packetErrorsM;
+ int sequenceNumberM;
bool isActiveM;
protected:
diff --git a/source.c b/source.c
index cf078e2..6ccab65 100644
--- a/source.c
+++ b/source.c
@@ -58,6 +58,7 @@ bool cIptvTransponderParameters::Parse(const char *strP)
if (strP && *strP) {
const char *delim = "|";
char *str = strdup(strP);
+ char *p = str;
char *saveptr = NULL;
char *token = NULL;
bool found_s = false;
@@ -120,9 +121,9 @@ bool cIptvTransponderParameters::Parse(const char *strP)
if (found_s && found_p && found_f && found_u && found_a)
result = true;
else
- error("Invalid channel parameters: %s", str);
+ error("Invalid channel parameters: %s", p);
- free(str);
+ free(p);
}
return (result);
@@ -135,8 +136,6 @@ const char *cIptvSourceParam::allowedProtocolCharsS = " abcdefghijklmnopqrstuvwx
cIptvSourceParam::cIptvSourceParam(char sourceP, const char *descriptionP)
: cSourceParam(sourceP, descriptionP),
paramM(0),
- nidM(0),
- tidM(0),
ridM(0),
dataM(),
itpM()
@@ -154,8 +153,6 @@ void cIptvSourceParam::SetData(cChannel *channelP)
{
debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
dataM = *channelP;
- nidM = dataM.Nid();
- tidM = dataM.Tid();
ridM = dataM.Rid();
itpM.Parse(dataM.Parameters());
paramM = 0;
@@ -165,21 +162,19 @@ void cIptvSourceParam::GetData(cChannel *channelP)
{
debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
channelP->SetTransponderData(channelP->Source(), channelP->Frequency(), dataM.Srate(), itpM.ToString(Source()), true);
- channelP->SetId(nidM, tidM, channelP->Sid(), ridM);
+ channelP->SetId(channelP->Nid(), channelP->Tid(), channelP->Sid(), ridM);
}
cOsdItem *cIptvSourceParam::GetOsdItem(void)
{
debug("cIptvSourceParam::%s()", __FUNCTION__);
switch (paramM++) {
- case 0: return new cMenuEditIntItem( tr("Nid"), &nidM, 0);
- case 1: return new cMenuEditIntItem( tr("Tid"), &tidM, 0);
- case 2: return new cMenuEditIntItem( tr("Rid"), &ridM, 0);
- case 3: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM);
- case 4: return new cMenuEditBoolItem(tr("Scan pids"), &itpM.pidScanM);
- case 5: return new cMenuEditStraItem(tr("Protocol"), &itpM.protocolM, ELEMENTS(protocolsM), protocolsM);
- case 6: return new cMenuEditStrItem( tr("Address"), itpM.addressM, sizeof(itpM.addressM), allowedProtocolCharsS);
- case 7: return new cMenuEditIntItem( tr("Parameter"), &itpM.parameterM, 0, 0xFFFF);
+ case 0: return new cMenuEditIntItem( tr("Rid"), &ridM, 0);
+ case 1: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM);
+ case 2: return new cMenuEditBoolItem(tr("Scan pids"), &itpM.pidScanM);
+ case 3: return new cMenuEditStraItem(tr("Protocol"), &itpM.protocolM, ELEMENTS(protocolsM), protocolsM);
+ case 4: return new cMenuEditStrItem( tr("Address"), itpM.addressM, sizeof(itpM.addressM), allowedProtocolCharsS);
+ case 5: return new cMenuEditIntItem( tr("Parameter"), &itpM.parameterM, 0, 0xFFFF);
default: return NULL;
}
return NULL;
diff --git a/source.h b/source.h
index 5e8ca13..5f3f1e8 100644
--- a/source.h
+++ b/source.h
@@ -51,8 +51,6 @@ class cIptvSourceParam : public cSourceParam
{
private:
int paramM;
- int nidM;
- int tidM;
int ridM;
cChannel dataM;
cIptvTransponderParameters itpM;
diff --git a/statistics.c b/statistics.c
index 2d3a6bd..139cd3b 100644
--- a/statistics.c
+++ b/statistics.c
@@ -58,7 +58,11 @@ cIptvPidStatistics::cIptvPidStatistics()
mutexM()
{
debug("cIptvPidStatistics::%s()", __FUNCTION__);
- memset(mostActivePidsM, 0, sizeof(mostActivePidsM));
+ const int numberOfElements = sizeof(mostActivePidsM) / sizeof(pidStruct);
+ for (int i = 0; i < numberOfElements; ++i) {
+ mostActivePidsM[i].pid = -1;
+ mostActivePidsM[i].dataAmount = 0L;
+ }
}
cIptvPidStatistics::~cIptvPidStatistics()
@@ -70,12 +74,13 @@ cString cIptvPidStatistics::GetPidStatistic()
{
//debug("cIptvPidStatistics::%s()", __FUNCTION__);
cMutexLock MutexLock(&mutexM);
+ const int numberOfElements = sizeof(mostActivePidsM) / sizeof(pidStruct);
uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
timerM.Set();
cString s("Active pids:\n");
- for (unsigned int i = 0; i < IPTV_STATS_ACTIVE_PIDS_COUNT; ++i) {
- if (mostActivePidsM[i].pid) {
- long bitrate = elapsed ? (long)(1000.0L * mostActivePidsM[i].DataAmount / KILOBYTE(1) / elapsed) : 0L;
+ for (int i = 0; i < numberOfElements; ++i) {
+ if (mostActivePidsM[i].pid >= 0) {
+ long bitrate = elapsed ? (long)(1000.0L * mostActivePidsM[i].dataAmount / KILOBYTE(1) / elapsed) : 0L;
if (!IptvConfig.GetUseBytes())
bitrate *= 8;
s = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *s, i,
@@ -83,7 +88,10 @@ cString cIptvPidStatistics::GetPidStatistic()
IptvConfig.GetUseBytes() ? "B" : "bit");
}
}
- memset(mostActivePidsM, 0, sizeof(mostActivePidsM));
+ for (int i = 0; i < numberOfElements; ++i) {
+ mostActivePidsM[i].pid = -1;
+ mostActivePidsM[i].dataAmount = 0L;
+ }
return s;
}
@@ -92,14 +100,14 @@ int cIptvPidStatistics::SortPids(const void* data1P, const void* data2P)
//debug("cIptvPidStatistics::%s()", __FUNCTION__);
const pidStruct *comp1 = reinterpret_cast<const pidStruct*>(data1P);
const pidStruct *comp2 = reinterpret_cast<const pidStruct*>(data2P);
- if (comp1->DataAmount > comp2->DataAmount)
+ if (comp1->dataAmount > comp2->dataAmount)
return -1;
- if (comp1->DataAmount < comp2->DataAmount)
+ if (comp1->dataAmount < comp2->dataAmount)
return 1;
return 0;
}
-void cIptvPidStatistics::AddPidStatistic(u_short pidP, long payloadP)
+void cIptvPidStatistics::AddPidStatistic(int pidP, long payloadP)
{
//debug("cIptvPidStatistics::%s(%ld, %ld)", __FUNCTION__, pidP, payloadP);
cMutexLock MutexLock(&mutexM);
@@ -107,7 +115,7 @@ void cIptvPidStatistics::AddPidStatistic(u_short pidP, long payloadP)
// If our statistic already is in the array, update it and quit
for (int i = 0; i < numberOfElements; ++i) {
if (mostActivePidsM[i].pid == pidP) {
- mostActivePidsM[i].DataAmount += payloadP;
+ mostActivePidsM[i].dataAmount += payloadP;
// Now re-sort the array and quit
qsort(mostActivePidsM, numberOfElements, sizeof(pidStruct), SortPids);
return;
@@ -115,9 +123,9 @@ void cIptvPidStatistics::AddPidStatistic(u_short pidP, long payloadP)
}
// Apparently our pid isn't in the array. Replace the last element with this
// one if new payload is greater
- if (mostActivePidsM[numberOfElements - 1].DataAmount < payloadP) {
+ if (mostActivePidsM[numberOfElements - 1].dataAmount < payloadP) {
mostActivePidsM[numberOfElements - 1].pid = pidP;
- mostActivePidsM[numberOfElements - 1].DataAmount = payloadP;
+ mostActivePidsM[numberOfElements - 1].dataAmount = payloadP;
// Re-sort
qsort(mostActivePidsM, numberOfElements, sizeof(pidStruct), SortPids);
}
@@ -184,7 +192,7 @@ cString cIptvBufferStatistics::GetBufferStatistic()
uint64_t elapsed = timerM.Elapsed(); /* in milliseconds */
timerM.Set();
long bitrate = elapsed ? (long)(1000.0L * dataBytesM / KILOBYTE(1) / elapsed) : 0L;
- long totalSpace = MEGABYTE(IptvConfig.GetTsBufferSize());
+ long totalSpace = IPTV_BUFFER_SIZE;
float percentage = (float)((float)usedSpaceM / (float)totalSpace * 100.0);
long totalKilos = totalSpace / KILOBYTE(1);
long usedKilos = usedSpaceM / KILOBYTE(1);
diff --git a/statistics.h b/statistics.h
index 2cfa955..7c4b4d4 100644
--- a/statistics.h
+++ b/statistics.h
@@ -35,12 +35,12 @@ public:
cString GetPidStatistic();
protected:
- void AddPidStatistic(u_short pidP, long payloadP);
+ void AddPidStatistic(int pidP, long payloadP);
private:
struct pidStruct {
- u_short pid;
- long DataAmount;
+ int pid;
+ long dataAmount;
};
pidStruct mostActivePidsM[IPTV_STATS_ACTIVE_PIDS_COUNT];
cTimeMs timerM;
diff --git a/streamer.c b/streamer.c
index 0434336..2afffb1 100644
--- a/streamer.c
+++ b/streamer.c
@@ -79,7 +79,7 @@ bool cIptvStreamer::Close(void)
return true;
}
-bool cIptvStreamer::Set(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP)
+bool cIptvStreamer::SetSource(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP)
{
debug("cIptvStreamer::%s(%s, %d, %d)", __FUNCTION__, locationP, parameterP, indexP);
if (!isempty(locationP)) {
@@ -89,16 +89,24 @@ bool cIptvStreamer::Set(const char* locationP, const int parameterP, const int i
protocolM->Close();
protocolM = protocolP;
if (protocolM) {
- protocolM->Set(locationP, parameterP, indexP);
+ protocolM->SetSource(locationP, parameterP, indexP);
protocolM->Open();
}
}
else if (protocolM)
- protocolM->Set(locationP, parameterP, indexP);
+ protocolM->SetSource(locationP, parameterP, indexP);
}
return true;
}
+bool cIptvStreamer::SetPid(int pidP, int typeP, bool onP)
+{
+ debug("cIptvStreamer::%s(%d, %d, %d)", __FUNCTION__, pidP, typeP, onP);
+ if (protocolM)
+ return protocolM->SetPid(pidP, typeP, onP);
+ return true;
+}
+
cString cIptvStreamer::GetInformation(void)
{
//debug("cIptvStreamer::%s()", __FUNCTION__);
diff --git a/streamer.h b/streamer.h
index d43232b..9a08499 100644
--- a/streamer.h
+++ b/streamer.h
@@ -30,7 +30,8 @@ protected:
public:
cIptvStreamer(cIptvDeviceIf &deviceP, unsigned int packetLenP);
virtual ~cIptvStreamer();
- bool Set(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP);
+ bool SetSource(const char* locationP, const int parameterP, const int indexP, cIptvProtocolIf* protocolP);
+ bool SetPid(int pidP, int typeP, bool onP);
bool Open(void);
bool Close(void);
cString GetInformation(void);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-iptv.git
More information about the pkg-vdr-dvb-changes
mailing list