X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6696994da0d59a3b483eda65d1dc8b1a9df67cc0..638123eeac3874577ca1454c3420b15dd4ccdbc0:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index f163230e..7b05feb4 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -61,7 +61,7 @@ ePtr<eDVBResourceManager> NewResourceManagerPtr(void)
 }
 
 eDVBResourceManager::eDVBResourceManager()
-	:m_releaseCachedChannelTimer(eApp)
+	:m_releaseCachedChannelTimer(eTimer::create(eApp))
 {
 	avail = 1;
 	busy = 0;
@@ -86,7 +86,7 @@ eDVBResourceManager::eDVBResourceManager()
 
 	eDVBCAService::registerChannelCallback(this);
 
-	CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
+	CONNECT(m_releaseCachedChannelTimer->timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
 void eDVBResourceManager::feStateChanged()
@@ -541,7 +541,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 		}
 		m_cached_channel_state_changed_conn.disconnect();
 		m_cached_channel=0;
-		m_releaseCachedChannelTimer.stop();
+		m_releaseCachedChannelTimer->stop();
 	}
 
 	eDebugNoSimulate("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
@@ -580,8 +580,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 		return err;
 
 	RESULT res;
-	ePtr<eDVBChannel> ch;
-	ch = new eDVBChannel(this, fe);
+	ePtr<eDVBChannel> ch = new eDVBChannel(this, fe);
 
 	res = ch->setChannel(channelid, feparm);
 	if (res)
@@ -612,13 +611,13 @@ void eDVBResourceManager::DVBChannelStateChanged(iDVBChannel *chan)
 		case iDVBChannel::state_ok:
 		{
 			eDebug("stop release channel timer");
-			m_releaseCachedChannelTimer.stop();
+			m_releaseCachedChannelTimer->stop();
 			break;
 		}
 		case iDVBChannel::state_last_instance:
 		{
 			eDebug("start release channel timer");
-			m_releaseCachedChannelTimer.start(3000, true);
+			m_releaseCachedChannelTimer->start(3000, true);
 			break;
 		}
 		default: // ignore all other events
@@ -640,17 +639,14 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
 	{
 		m_cached_channel_state_changed_conn.disconnect();
 		m_cached_channel=0;
-		m_releaseCachedChannelTimer.stop();
+		m_releaseCachedChannelTimer->stop();
 	}
 
 	int err = allocateFrontendByIndex(fe, slot_index);
 	if (err)
 		return err;
 
-	eDVBChannel *ch;
-	ch = new eDVBChannel(this, fe);
-
-	channel = ch;
+	channel = new eDVBChannel(this, fe);
 	return 0;
 }
 
@@ -659,17 +655,14 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
 	ePtr<eDVBAllocatedDemux> demux;
 
-	if (m_cached_channel && m_releaseCachedChannelTimer.isActive())
+	if (m_cached_channel && m_releaseCachedChannelTimer->isActive())
 	{
 		m_cached_channel_state_changed_conn.disconnect();
 		m_cached_channel=0;
-		m_releaseCachedChannelTimer.stop();
+		m_releaseCachedChannelTimer->stop();
 	}
 
-	eDVBChannel *ch;
-	ch = new eDVBChannel(this, 0);
-
-	channel = ch;
+	channel = new eDVBChannel(this, 0);
 	return 0;
 }
 
@@ -992,9 +985,9 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 		unsigned char *ts = data + ts_offset;
 		int pid = ((ts[1] << 8) | ts[2]) & 0x1FFF;
 
-		if ((d[3] == 0) && (m_pid == pid))  /* picture start */
+		if ((d[3] == 0 || d[3] == 0x09 && d[-1] == 0 && (ts[1] & 0x40)) && (m_pid == pid))  /* picture start */
 		{
-			int picture_type = (d[5] >> 3) & 7;
+			int picture_type = (d[3]==0 ? (d[5] >> 3) & 7 : (d[4] >> 5) + 1);
 			d += 4;
 
 //			eDebug("%d-frame at %d, offset in TS packet: %d, pid=%04x", picture_type, offset, offset % 188, pid);
@@ -1202,7 +1195,7 @@ void eDVBChannel::cueSheetEvent(int event)
 		{
 			off_t offset_in, offset_out;
 			pts_t pts_in = i->first, pts_out = i->second;
-			if (m_tstools.getOffset(offset_in, pts_in) || m_tstools.getOffset(offset_out, pts_out))
+			if (m_tstools.getOffset(offset_in, pts_in, -1) || m_tstools.getOffset(offset_out, pts_out, 1))
 			{
 				eDebug("span translation failed.\n");
 				continue;
@@ -1330,13 +1323,13 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				eDebug("AP relative seeking failed!");
 			} else
 			{
-				eDebug("next ap is %llx\n", pts);
 				pts = nextap;
+				eDebug("next ap is %llx\n", pts);
 			}
 		}
 		
 		off_t offset = 0;
-		if (m_tstools.getOffset(offset, pts))
+		if (m_tstools.getOffset(offset, pts, -1))
 		{
 			eDebug("get offset for pts=%lld failed!", pts);
 			continue;
@@ -1410,16 +1403,29 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		}
 	}
 
-	if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
-	{
-		eDebug("reached SOF");
-		m_skipmode_m = 0;
-		m_pvr_thread->sendEvent(eFilePushThread::evtUser);
+	if (m_source_span.empty()) {
+		if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
+		{
+			eDebug("reached SOF");
+			m_skipmode_m = 0;
+			m_pvr_thread->sendEvent(eFilePushThread::evtUser);
+		}
+		start = current_offset;
+		size = max;
+	} else {
+		off_t tmp2, tmp = align(m_source_span.rbegin()->second, blocksize);
+		pts_t len;
+		getLength(len);
+		m_tstools.getOffset(tmp2, len, 1);
+		if (current_offset == tmp || current_offset == tmp2) {
+			start = tmp2;
+			size = max;
+		} else {
+			start = tmp - align(512*1024, blocksize);
+			size = align(512*1024, blocksize);
+		}
 	}
 
-	start = current_offset;
-	size = max;
-
 	eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
 	return;
 }