X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f6fc97e1d61e3701f3cde099979da716c3afa28d..234d47bc1ddd3f1129159cc18c59d44e154f4f9d:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index ad865c08..e643f272 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -685,13 +685,13 @@ 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);
 				
 				if (abs(m_skipmode_m) < abs(m_skipmode_n))
 				{
-					eFatal("damn, something is wrong with this calculation");
+					eWarning("something is wrong with this calculation");
 					m_skipmode_n = m_skipmode_m = 0;
 				}
 				
@@ -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!");
@@ -996,39 +1004,30 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in
 	if (!decoding_demux)
 		return -1;
 	
-	off_t begin = 0;
-		/* getPTS for offset 0 is cached, so it doesn't harm. */
-	int r = m_tstools.getPTS(begin, pos);
-	if (r)
-	{
-		eDebug("tstools getpts(0) failed!");
-		return r;
-	}
-	
 	pts_t now;
 	
-			/* TODO: this is a gross hack. */
-	r = decoding_demux->getSTC(now, mode ? 128 : 0);
-
-	if (r)
+	int r;
+	
+	if (mode == 0) /* demux */
 	{
-		eDebug("demux getSTC failed");
-		return -1;
-	}
+		r = decoding_demux->getSTC(now, 0);
+		if (r)
+		{
+			eDebug("demux getSTC failed");
+			return -1;
+		}
+	} else
+		now = pos; /* fixup supplied */
 	
-//	eDebug("STC: %08llx PTS: %08llx, diff %lld", now, pos, now - pos);
-		/* when we are less than 10 seconds before the start, return 0. */
-		/* (we're just waiting for the timespam to start) */
-	if ((now < pos) && ((pos - now) < 90000 * 10))
+	off_t off = 0; /* TODO: fixme */
+	r = m_tstools.fixupPTS(off, now);
+	if (r)
 	{
-		pos = 0;
-		return 0;
+		eDebug("fixup PTS failed");
+		return -1;
 	}
 	
-	if (now < pos) /* wrap around */
-		pos = now + 0x200000000LL - pos;
-	else
-		pos = now - pos;
+	pos = now;
 	
 	return 0;
 }
@@ -1101,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)