X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d7010ab56f9b823d56a5a5fa3ba7f7764bbfece4..40d11af2de7aed77c90970ba2b61dd754a225117:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index bf0014d8..0e6f86d3 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/base/eerror.h>
 #include <lib/dvb/decoder.h>
 #if HAVE_DVB_API_VERSION < 3 
@@ -26,6 +25,12 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
+	/* these are quite new... */
+#ifndef AUDIO_GET_PTS
+#define AUDIO_GET_PTS              _IOR('o', 19, __u64)
+#define VIDEO_GET_PTS              _IOR('o', 57, __u64)
+#endif
+
 DEFINE_REF(eDVBAudio);
 
 eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux)
@@ -131,7 +136,12 @@ void eDVBAudio::unfreeze()
 	if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
 		eDebug("video: AUDIO_CONTINUE: %m");
 }
-	
+
+int eDVBAudio::getPTS(pts_t &now)
+{
+	return ::ioctl(m_fd, AUDIO_GET_PTS, &now);
+}
+
 eDVBAudio::~eDVBAudio()
 {
 	if (m_fd >= 0)
@@ -237,6 +247,11 @@ int eDVBVideo::setFastForward(int skip)
 	m_is_fast_forward = skip;
 	return ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip);
 }
+
+int eDVBVideo::getPTS(pts_t &now)
+{
+	return ::ioctl(m_fd, VIDEO_GET_PTS, &now);
+}
 	
 eDVBVideo::~eDVBVideo()
 {
@@ -301,9 +316,9 @@ eDVBPCR::~eDVBPCR()
 		::close(m_fd_demux);
 }
 
-DEFINE_REF(eDVBVText);
+DEFINE_REF(eDVBTText);
 
-eDVBVText::eDVBVText(eDVBDemux *demux): m_demux(demux)
+eDVBTText::eDVBTText(eDVBDemux *demux): m_demux(demux)
 {
 	char filename[128];
 #if HAVE_DVB_API_VERSION < 3
@@ -316,7 +331,7 @@ eDVBVText::eDVBVText(eDVBDemux *demux): m_demux(demux)
 		eWarning("%s: %m", filename);
 }
 
-int eDVBVText::startPid(int pid)
+int eDVBTText::startPid(int pid)
 {
 	if (m_fd_demux < 0)
 		return -1;
@@ -340,13 +355,13 @@ int eDVBVText::startPid(int pid)
 	return 0;
 }
 
-void eDVBVText::stop()
+void eDVBTText::stop()
 {
 	if (::ioctl(m_fd_demux, DMX_STOP) < 0)
 		eWarning("video: DMX_STOP: %m");
 }
 
-eDVBVText::~eDVBVText()
+eDVBTText::~eDVBTText()
 {
 	if (m_fd_demux >= 0)
 		::close(m_fd_demux);
@@ -359,10 +374,14 @@ int eTSMPEGDecoder::setState()
 	int res = 0;
 	
 	int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
-	
+	int nott = noaudio; /* actually same conditions */
+
 	if ((noaudio && m_audio) || (!m_audio && !noaudio))
 		m_changed |= changeAudio;
 	
+	if ((nott && m_text) || (!m_text && !nott))
+		m_changed |= changeText;
+	
 #if HAVE_DVB_API_VERSION < 3
 	if (m_changed & changeAudio && m_audio)
 		m_audio->stopPid();
@@ -472,9 +491,9 @@ int eTSMPEGDecoder::setState()
 		if (m_text)
 			m_text->stop();
 		m_text = 0;
-		if ((m_textpid >= 0) && (m_textpid < 0x1FFF))
+		if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott)
 		{
-			m_text = new eDVBVText(m_demux);
+			m_text = new eDVBTText(m_demux);
 			if (m_text->startPid(m_textpid))
 			{
 				eWarning("text: startpid failed!");
@@ -639,3 +658,27 @@ RESULT eTSMPEGDecoder::setTrickmode(int what)
 	setState();
 	return 0;
 }
+
+RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts)
+{
+	if (what == 0) /* auto */
+		what = m_video ? 1 : 2;
+
+	if (what == 1) /* video */
+	{
+		if (m_video)
+			return m_video->getPTS(pts);
+		else
+			return -1;
+	}
+
+	if (what == 2) /* audio */
+	{
+		if (m_audio)
+			return m_audio->getPTS(pts);
+		else
+			return -1;
+	}
+
+	return -1;
+}