X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7544e052e6ed6a5d1e0fd783bd04f4b8aa0d45ce..0ecfa70938499a3386c282577e28625d04d4626b:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 5f528b82..b7118558 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -92,6 +92,12 @@ void eDVBAudio::stopPid()
 		eWarning("audio: DMX_STOP: %m");
 }
 #endif
+
+void eDVBAudio::flush()
+{
+	if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)
+		eDebug("audio: AUDIO_CLEAR_BUFFER: %m");
+}
 	
 eDVBAudio::~eDVBAudio()
 {
@@ -171,6 +177,12 @@ void eDVBVideo::stopPid()
 }
 #endif
 
+void eDVBVideo::flush()
+{
+	if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0)
+		eDebug("video: VIDEO_CLEAR_BUFFER: %m");
+}
+	
 eDVBVideo::~eDVBVideo()
 {
 	if (m_fd >= 0)
@@ -293,11 +305,14 @@ int eTSMPEGDecoder::setState()
 		if (m_pcr)
 			m_pcr->stop();
 		m_pcr = 0;
-		m_pcr = new eDVBPCR(m_demux);
-		if (m_pcr->startPid(m_pcrpid))
+		if ((m_pcrpid >= 0) && (m_pcrpid < 0x1FFF))
 		{
-			eWarning("video: startpid failed!");
-			res = -1;
+			m_pcr = new eDVBPCR(m_demux);
+			if (m_pcr->startPid(m_pcrpid))
+			{
+				eWarning("video: startpid failed!");
+				res = -1;
+			}
 		}
 		m_changed &= ~changePCR;
 	}
@@ -306,11 +321,14 @@ int eTSMPEGDecoder::setState()
 		if (m_video)
 			m_video->stop();
 		m_video = 0;
-		m_video = new eDVBVideo(m_demux, 0);
-		if (m_video->startPid(m_vpid))
+		if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
 		{
-			eWarning("video: startpid failed!");
-			res = -1;
+			m_video = new eDVBVideo(m_demux, 0);
+			if (m_video->startPid(m_vpid))
+			{
+				eWarning("video: startpid failed!");
+				res = -1;
+			}
 		}
 		m_changed &= ~changeVideo;
 	}
@@ -319,11 +337,14 @@ int eTSMPEGDecoder::setState()
 		if (m_audio)
 			m_audio->stop();
 		m_audio = 0;
-		m_audio = new eDVBAudio(m_demux, 0);
-		if (m_audio->startPid(m_apid))
+		if ((m_apid >= 0) && (m_apid < 0x1FFF))
 		{
-			eWarning("audio: startpid failed!");
-			res = -1;
+			m_audio = new eDVBAudio(m_demux, 0);
+			if (m_audio->startPid(m_apid))
+			{
+				eWarning("audio: startpid failed!");
+				res = -1;
+			}
 		}
 		m_changed &= ~changeAudio;
 	}
@@ -333,6 +354,7 @@ int eTSMPEGDecoder::setState()
 
 eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0)
 {
+	demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event);
 }
 
 eTSMPEGDecoder::~eTSMPEGDecoder()
@@ -370,7 +392,7 @@ RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
 		m_changed |= changePCR;
 		m_pcrpid = pcrpid;
 	}
-	return -1;
+	return 0;
 }
 
 RESULT eTSMPEGDecoder::setSyncMaster(int who)
@@ -412,3 +434,24 @@ RESULT eTSMPEGDecoder::setZoom(int what)
 {
 	return -1;
 }
+
+RESULT eTSMPEGDecoder::flush()
+{
+	if (m_audio)
+		m_audio->flush();
+	if (m_video)
+		m_video->flush();
+	return 0;
+}
+
+void eTSMPEGDecoder::demux_event(int event)
+{
+	switch (event)
+	{
+	case eDVBDemux::evtFlush:
+		flush();
+		break;
+	default:
+		break;
+	}
+}