X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/52eb0cac0affc9c39a7a15a5e90bb87ad3a60481..033a2333874297c1c388ecf4532de2bc2b11fb30:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 8d1a4b12..26172e0c 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -49,12 +49,12 @@ eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux)
 		eWarning("%s: %m", filename);
 }
 	
-int eDVBAudio::startPid(int pid)
+int eDVBAudio::startPid(int pid, int type)
 {	
-	eDebug("setting audio pid to %x", pid);
 	if ((m_fd < 0) || (m_fd_demux < 0))
 		return -1;
 	dmx_pes_filter_params pes;
+
 	pes.pid      = pid;
 	pes.input    = DMX_IN_FRONTEND;
 	pes.output   = DMX_OUT_DECODER;
@@ -65,12 +65,32 @@ int eDVBAudio::startPid(int pid)
 		eWarning("audio: DMX_SET_PES_FILTER: %m");
 		return -errno;
 	}
-	if (::ioctl(m_fd_demux, DMX_START, &pes) < 0)
+	if (::ioctl(m_fd_demux, DMX_START) < 0)
 	{
 		eWarning("audio: DMX_START: %m");
 		return -errno;
 	}
 	
+	int bypass = 0;
+	
+	switch (type)
+	{
+	case aMPEG:
+		bypass = 1;
+		break;
+	case aAC3:
+		bypass = 0;
+		break;
+		/*
+	case aDTS:
+		bypass = 2;
+		break;
+		*/
+	}
+	
+	if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
+		eWarning("audio: AUDIO_SET_BYPASS_MODE: %m");
+	
 	if (::ioctl(m_fd, AUDIO_PLAY) < 0)
 		eWarning("audio: AUDIO_PLAY: %m");
 	return 0;
@@ -80,9 +100,37 @@ void eDVBAudio::stop()
 {
 	if (::ioctl(m_fd, AUDIO_STOP) < 0)
 		eWarning("audio: AUDIO_STOP: %m");
+#if HAVE_DVB_API_VERSION > 2
+	if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+		eWarning("audio: DMX_STOP: %m");
+#endif
+}
+	
+#if HAVE_DVB_API_VERSION < 3
+void eDVBAudio::stopPid()
+{
 	if (::ioctl(m_fd_demux, DMX_STOP) < 0)
 		eWarning("audio: DMX_STOP: %m");
 }
+#endif
+
+void eDVBAudio::flush()
+{
+	if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)
+		eDebug("audio: AUDIO_CLEAR_BUFFER: %m");
+}
+
+void eDVBAudio::freeze()
+{
+	if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
+		eDebug("video: AUDIO_PAUSE: %m");
+}
+	
+void eDVBAudio::unfreeze()
+{
+	if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
+		eDebug("video: AUDIO_CONTINUE: %m");
+}
 	
 eDVBAudio::~eDVBAudio()
 {
@@ -120,7 +168,7 @@ int eDVBVideo::startPid(int pid)
 	if ((m_fd < 0) || (m_fd_demux < 0))
 		return -1;
 	dmx_pes_filter_params pes;
-	
+
 	pes.pid      = pid;
 	pes.input    = DMX_IN_FRONTEND;
 	pes.output   = DMX_OUT_DECODER;
@@ -131,25 +179,50 @@ int eDVBVideo::startPid(int pid)
 		eWarning("video: DMX_SET_PES_FILTER: %m");
 		return -errno;
 	}
-	if (::ioctl(m_fd_demux, DMX_START, &pes) < 0)
+	if (::ioctl(m_fd_demux, DMX_START) < 0)
 	{
 		eWarning("video: DMX_START: %m");
 		return -errno;
 	}
-	
 	if (::ioctl(m_fd, VIDEO_PLAY) < 0)
 		eWarning("video: VIDEO_PLAY: %m");
-	else
-		eDebug("video ok");
 	return 0;
 }
 	
 void eDVBVideo::stop()
 {
-	if (::ioctl(m_fd, VIDEO_STOP) < 0)
+	if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
 		eWarning("video: VIDEO_STOP: %m");
+#if HAVE_DVB_API_VERSION > 2
 	if (::ioctl(m_fd_demux, DMX_STOP) < 0)
 		eWarning("video: DMX_STOP: %m");
+#endif
+}
+
+#if HAVE_DVB_API_VERSION < 3
+void eDVBVideo::stopPid()
+{
+	if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+		eWarning("video: DMX_STOP: %m");
+}
+#endif
+
+void eDVBVideo::flush()
+{
+	if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0)
+		eDebug("video: VIDEO_CLEAR_BUFFER: %m");
+}
+	
+void eDVBVideo::freeze()
+{
+	if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
+		eDebug("video: VIDEO_FREEZE: %m");
+}
+	
+void eDVBVideo::unfreeze()
+{
+	if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
+		eDebug("video: VIDEO_CONTINUE: %m");
 }
 	
 eDVBVideo::~eDVBVideo()
@@ -191,7 +264,7 @@ int eDVBPCR::startPid(int pid)
 		eWarning("video: DMX_SET_PES_FILTER: %m");
 		return -errno;
 	}
-	if (::ioctl(m_fd_demux, DMX_START, &pes) < 0)
+	if (::ioctl(m_fd_demux, DMX_START) < 0)
 	{
 		eWarning("video: DMX_START: %m");
 		return -errno;
@@ -216,26 +289,38 @@ DEFINE_REF(eTSMPEGDecoder);
 int eTSMPEGDecoder::setState()
 {
 	int res = 0;
-	eDebug("changed %x", m_changed);
-
+#if HAVE_DVB_API_VERSION < 3
+	if (m_changed & changeAudio && m_audio)
+		m_audio->stopPid();
+	if (m_changed & changeVideo && m_video)
+		m_video->stopPid();
+	if (m_changed & changePCR && m_pcr)
+	{
+		m_pcr->stop();
+		m_pcr=0;
+	}
+	if (m_changed & changeAudio && m_audio)
+	{
+		m_audio->stop();
+		m_audio=0;
+	}
+	if (m_changed & changeVideo && m_video)
+	{
+		m_video->stop();
+		m_video=0;
+	}
 	if (m_changed & changePCR)
 	{
-		if (m_pcr)
-			m_pcr->stop();
-		m_pcr = 0;
 		m_pcr = new eDVBPCR(m_demux);
 		if (m_pcr->startPid(m_pcrpid))
 		{
-			eWarning("video: startpid failed!");
+			eWarning("pcr: startpid failed!");
 			res = -1;
 		}
 		m_changed &= ~changePCR;
 	}
 	if (m_changed & changeVideo)
 	{
-		if (m_video)
-			m_video->stop();
-		m_video = 0;
 		m_video = new eDVBVideo(m_demux, 0);
 		if (m_video->startPid(m_vpid))
 		{
@@ -246,22 +331,70 @@ int eTSMPEGDecoder::setState()
 	}
 	if (m_changed & changeAudio)
 	{
-		if (m_audio)
-			m_audio->stop();
-		m_audio = 0;
 		m_audio = new eDVBAudio(m_demux, 0);
-		if (m_audio->startPid(m_apid))
+		if (m_audio->startPid(m_apid, m_atype))
 		{
 			eWarning("audio: startpid failed!");
 			res = -1;
 		}
 		m_changed &= ~changeAudio;
 	}
+#else
+	if (m_changed & changePCR)
+	{
+		if (m_pcr)
+			m_pcr->stop();
+		m_pcr = 0;
+		if ((m_pcrpid >= 0) && (m_pcrpid < 0x1FFF))
+		{
+			m_pcr = new eDVBPCR(m_demux);
+			if (m_pcr->startPid(m_pcrpid))
+			{
+				eWarning("pcr: startpid failed!");
+				res = -1;
+			}
+		}
+		m_changed &= ~changePCR;
+	}
+	if (m_changed & changeVideo)
+	{
+		if (m_video)
+			m_video->stop();
+		m_video = 0;
+		if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
+		{
+			m_video = new eDVBVideo(m_demux, 0);
+			if (m_video->startPid(m_vpid))
+			{
+				eWarning("video: startpid failed!");
+				res = -1;
+			}
+		}
+		m_changed &= ~changeVideo;
+	}
+	if (m_changed & changeAudio)
+	{
+		if (m_audio)
+			m_audio->stop();
+		m_audio = 0;
+		if ((m_apid >= 0) && (m_apid < 0x1FFF))
+		{
+			m_audio = new eDVBAudio(m_demux, 0);
+			if (m_audio->startPid(m_apid, m_atype))
+			{
+				eWarning("audio: startpid failed!");
+				res = -1;
+			}
+		}
+		m_changed &= ~changeAudio;
+	}
+#endif
 	return res;
 }
 
-eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux)
+eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0)
 {
+	demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event);
 }
 
 eTSMPEGDecoder::~eTSMPEGDecoder()
@@ -299,7 +432,7 @@ RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
 		m_changed |= changePCR;
 		m_pcrpid = pcrpid;
 	}
-	return -1;
+	return 0;
 }
 
 RESULT eTSMPEGDecoder::setSyncMaster(int who)
@@ -314,12 +447,24 @@ RESULT eTSMPEGDecoder::start()
 
 RESULT eTSMPEGDecoder::freeze(int cont)
 {
-	return -1;
+	if (m_video)
+		m_video->freeze();
+
+	if (m_audio)
+		m_audio->freeze();
+	
+	return 0;
 }
 
 RESULT eTSMPEGDecoder::unfreeze()
 {
-	return -1;
+	if (m_video)
+		m_video->unfreeze();
+
+	if (m_audio)
+		m_audio->unfreeze();
+	
+	return 0;
 }
 
 RESULT eTSMPEGDecoder::setSinglePictureMode(int when)
@@ -341,3 +486,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;
+	}
+}