aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Navigation.py4
-rw-r--r--lib/base/elock.h13
-rw-r--r--lib/dvb/dvb.cpp2
-rw-r--r--lib/dvb/idvb.h2
-rw-r--r--lib/dvb/pmt.cpp3
-rw-r--r--lib/dvb/pmt.h1
-rw-r--r--lib/dvb/tstools.cpp83
-rw-r--r--lib/dvb/tstools.h6
-rw-r--r--lib/python/Plugins/Extensions/CutListEditor/plugin.py2
-rw-r--r--lib/service/servicedvb.cpp4
10 files changed, 102 insertions, 18 deletions
diff --git a/Navigation.py b/Navigation.py
index 2ca87f6f..2437bbf5 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -50,9 +50,9 @@ class Navigation:
for x in self.record_event:
x(rec_service, event)
- def playService(self, ref, checkParentalControl = True):
+ def playService(self, ref, checkParentalControl = True, forceRestart = False):
oldref = self.currentlyPlayingServiceReference
- if ref and oldref and ref == oldref:
+ if ref and oldref and ref == oldref and not forceRestart:
print "ignore request to play already running service"
return 0
print "playing", ref and ref.toString()
diff --git a/lib/base/elock.h b/lib/base/elock.h
index 51582e67..01757182 100644
--- a/lib/base/elock.h
+++ b/lib/base/elock.h
@@ -83,9 +83,18 @@ class eSingleLock
pthread_mutex_t m_lock;
eSingleLock(eSingleLock &);
public:
- eSingleLock()
+ eSingleLock(bool recursive=false)
{
- pthread_mutex_init(&m_lock, 0);
+ if (recursive)
+ {
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init(&attr);
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ pthread_mutex_init(&m_lock, &attr);
+ pthread_mutexattr_destroy(&attr);
+ }
+ else
+ pthread_mutex_init(&m_lock, 0);
}
~eSingleLock()
{
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index a8dfb193..6eaadb04 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -1766,6 +1766,8 @@ RESULT eDVBChannel::playFile(const char *file)
m_pvr_thread->setStreamMode(1);
m_pvr_thread->setScatterGather(this);
+ m_event(this, evtPreStart);
+
if (m_pvr_thread->start(file, m_pvr_fd_dst))
{
delete m_pvr_thread;
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index cff4dbb9..4ef7efad 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -522,7 +522,7 @@ public:
virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
enum
{
- evtEOF, evtSOF, evtFailed
+ evtPreStart, evtEOF, evtSOF, evtFailed
};
virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
virtual RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection)=0;
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 9bd065b3..ee89a3a4 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -75,6 +75,9 @@ void eDVBServicePMTHandler::channelEvent(iDVBChannel *channel, int event)
{
switch (event)
{
+ case iDVBChannel::evtPreStart:
+ serviceEvent(eventPreStart);
+ break;
case iDVBChannel::evtEOF:
serviceEvent(eventEOF);
break;
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index a9ca23f2..483c06b1 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -123,6 +123,7 @@ public:
eventNewProgramInfo, // we just received a PMT
eventTuned, // a channel was sucessfully (re-)tuned in, you may start additional filters now
+ eventPreStart, // before start filepush thread
eventSOF, // seek pre start
eventEOF, // a file playback did end
diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index b7ea945f..d5ad2494 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -7,6 +7,7 @@
#include <stdio.h>
eDVBTSTools::eDVBTSTools()
+ :m_file_lock(true)
{
m_pid = -1;
m_maxrange = 256*1024;
@@ -47,6 +48,7 @@ int eDVBTSTools::openFile(const char *filename, int nostreaminfo)
m_samples_taken = 0;
+ eSingleLocker l(m_file_lock);
if (m_file.open(filename, 1) < 0)
return -1;
return 0;
@@ -54,6 +56,7 @@ int eDVBTSTools::openFile(const char *filename, int nostreaminfo)
void eDVBTSTools::closeFile()
{
+ eSingleLocker l(m_file_lock);
m_file.close();
}
@@ -78,7 +81,8 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts, int fixed)
return -1;
offset -= offset % 188;
-
+
+ eSingleLocker l(m_file_lock);
if (m_file.lseek(offset, SEEK_SET) < 0)
{
eDebug("lseek failed");
@@ -144,24 +148,83 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts, int fixed)
} else
payload = packet + 4;
-
/* if (m_pid >= 0)
if (pid != m_pid)
continue; */
if (!pusi)
continue;
-
-
+
/* somehow not a startcode. (this is invalid, since pusi was set.) ignore it. */
if (payload[0] || payload[1] || (payload[2] != 1))
continue;
-
+
+ if (payload[3] == 0xFD)
+ { // stream use extension mechanism defined in ISO 13818-1 Amendment 2
+ if (payload[7] & 1) // PES extension flag
+ {
+ int offs = 0;
+ if (payload[7] & 0x80) // pts avail
+ offs += 5;
+ if (payload[7] & 0x40) // dts avail
+ offs += 5;
+ if (payload[7] & 0x20) // escr avail
+ offs += 6;
+ if (payload[7] & 0x10) // es rate
+ offs += 3;
+ if (payload[7] & 0x8) // dsm trickmode
+ offs += 1;
+ if (payload[7] & 0x4) // additional copy info
+ offs += 1;
+ if (payload[7] & 0x2) // crc
+ offs += 2;
+ if (payload[8] < offs)
+ continue;
+ uint8_t pef = payload[9+offs++]; // pes extension field
+ if (pef & 1) // pes extension flag 2
+ {
+ if (pef & 0x80) // private data flag
+ offs += 16;
+ if (pef & 0x40) // pack header field flag
+ offs += 1;
+ if (pef & 0x20) // program packet sequence counter flag
+ offs += 2;
+ if (pef & 0x10) // P-STD buffer flag
+ offs += 2;
+ if (payload[8] < offs)
+ continue;
+ uint8_t stream_id_extension_len = payload[9+offs++] & 0x7F;
+ if (stream_id_extension_len >= 1)
+ {
+ if (payload[8] < (offs + stream_id_extension_len) )
+ continue;
+ if (payload[9+offs] & 0x80) // stream_id_extension_bit (should not set)
+ continue;
+ switch (payload[9+offs])
+ {
+ case 0x55 ... 0x5f: // VC-1
+ break;
+ case 0x71: // AC3 / DTS
+ break;
+ default:
+ eDebug("skip unknwn stream_id_extension %02x\n", payload[9+offs]);
+ continue;
+ }
+ }
+ else
+ continue;
+ }
+ else
+ continue;
+ }
+ else
+ continue;
+ }
/* drop non-audio, non-video packets because other streams
can be non-compliant.*/
- if (((payload[3] & 0xE0) != 0xC0) && // audio
- ((payload[3] & 0xF0) != 0xE0)) // video
+ else if (((payload[3] & 0xE0) != 0xC0) && // audio
+ ((payload[3] & 0xF0) != 0xE0)) // video
continue;
-
+
if (payload[7] & 0x80) /* PTS */
{
pts = ((unsigned long long)(payload[ 9]&0xE)) << 29;
@@ -358,7 +421,8 @@ void eDVBTSTools::calcEnd()
{
if (!m_file.valid())
return;
-
+
+ eSingleLocker l(m_file_lock);
off_t end = m_file.lseek(0, SEEK_END);
if (llabs(end - m_last_filelength) > 1*1024*1024)
@@ -515,6 +579,7 @@ int eDVBTSTools::findPMT(int &pmt_pid, int &service_id)
return -1;
}
+ eSingleLocker l(m_file_lock);
if (m_file.lseek(0, SEEK_SET) < 0)
{
eDebug("seek failed");
diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index c230a341..ed8b9241 100644
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -4,6 +4,7 @@
#include <sys/types.h>
#include <lib/dvb/pvrparse.h>
#include <lib/base/rawfile.h>
+#include <lib/base/elock.h>
/*
* Note: we're interested in PTS values, not STC values.
@@ -75,9 +76,10 @@ public:
private:
int m_pid;
int m_maxrange;
-
+
+ eSingleLock m_file_lock;
eRawFile m_file;
-
+
int m_begin_valid, m_end_valid;
pts_t m_pts_begin, m_pts_end;
off_t m_offset_begin, m_offset_end;
diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
index efe9f761..abd606d6 100644
--- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py
+++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
@@ -195,7 +195,7 @@ class CutListEditor(Screen, InfoBarBase, InfoBarSeek, InfoBarCueSheetSupport, He
self.onClose.append(self.__onClose)
def __onClose(self):
- self.session.nav.playService(self.old_service)
+ self.session.nav.playService(self.old_service, forceRestart=True)
def updateStateLabel(self, state):
self["SeekState"].setText(state[3].strip())
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index a6b6cc6f..b5e2651f 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1029,6 +1029,9 @@ void eDVBServicePlay::serviceEvent(int event)
m_event((iPlayableService*)this, evUpdatedInfo);
break;
}
+ case eDVBServicePMTHandler::eventPreStart:
+ loadCuesheet();
+ break;
case eDVBServicePMTHandler::eventEOF:
m_event((iPlayableService*)this, evEOF);
break;
@@ -1095,7 +1098,6 @@ RESULT eDVBServicePlay::start()
m_event_handler.inject(event, 0);
m_event_handler.inject(empty, 1);
}
- loadCuesheet();
m_event(this, evStart);
}
return 0;
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 00:12:30 +0000