X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b96f203b700c91e463eff20889d734119530bce0..0192baee767d36a7819ca95b27abea1a8d91a15e:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 4a3adf55..2c2376d3 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -685,7 +685,7 @@ void eDVBChannel::cueSheetEvent(int event)
 				eDebug("skipmode ratio is %lld:90000, bitrate is %d bit/s", m_cue->m_skipmode_ratio, bitrate);
 						/* i agree that this might look a bit like black magic. */
 				m_skipmode_n = 512*1024; /* must be 1 iframe at least. */
-				m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio;
+				m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio / 8;
 	
 				eDebug("resolved to: %d %d", m_skipmode_m, m_skipmode_n);
 				
@@ -766,8 +766,16 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		if (relative)
 		{
 			pts_t now;
-					/* we're using the decoder's timestamp here. this 
-					   won't work for radio (ouch). */
+			if (!m_cue->m_decoder)
+			{
+				eDebug("no decoder - can't seek relative");
+				continue;
+			}
+			if (m_cue->m_decoder->getPTS(0, now))
+			{
+				eDebug("decoder getPTS failed, can't seek relative");
+				continue;
+			}
 			if (getCurrentPosition(m_cue->m_decoding_demux, now, 1))
 			{
 				eDebug("seekTo: getCurrentPosition failed!");
@@ -1092,9 +1100,10 @@ void eCueSheet::setSkipmode(const pts_t &ratio)
 	m_event(evtSkipmode);
 }
 
-void eCueSheet::setDecodingDemux(iDVBDemux *demux)
+void eCueSheet::setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder)
 {
 	m_decoding_demux = demux;
+	m_decoder = decoder;
 }
 
 RESULT eCueSheet::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection)