X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3cddda083f4ace59e279f9f4f6ae12bad079d33b..defa1a765f48ec880b36b14a247b89649553c2ec:/lib/service/servicedvbrecord.cpp

diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp
index 368adb70..773aeb39 100644
--- a/lib/service/servicedvbrecord.cpp
+++ b/lib/service/servicedvbrecord.cpp
@@ -1,17 +1,20 @@
 #include <lib/service/servicedvbrecord.h>
 #include <lib/base/eerror.h>
 
+#include <fcntl.h>
 
 DEFINE_REF(eDVBServiceRecord);
 
 eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref): m_ref(ref)
 {
 	CONNECT(m_service_handler.serviceEvent, eDVBServiceRecord::serviceEvent);
+	m_state = stateIdle;
+	m_want_record = 0;
 }
 
 void eDVBServiceRecord::serviceEvent(int event)
 {
-	eDebug("service event %d", event);
+	eDebug("RECORD service event %d", event);
 	switch (event)
 	{
 	case eDVBServicePMTHandler::eventTuned:
@@ -21,64 +24,163 @@ void eDVBServiceRecord::serviceEvent(int event)
 	}
 	case eDVBServicePMTHandler::eventNewProgramInfo:
 	{
-		int vpid = -1, apid = -1, pcrpid = -1;
-		eDVBServicePMTHandler::program program;
-		if (m_service_handler.getProgramInfo(program))
-			eDebug("getting program info failed.");
-		else
-		{
-			eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size());
-			if (!program.videoStreams.empty())
-			{
-				eDebugNoNewLine(" (");
-				for (std::vector<eDVBServicePMTHandler::videoStream>::const_iterator
-					i(program.videoStreams.begin()); 
-					i != program.videoStreams.end(); ++i)
-				{
-					if (vpid == -1)
-						vpid = i->pid;
-					if (i != program.videoStreams.begin())
-						eDebugNoNewLine(", ");
-					eDebugNoNewLine("%04x", i->pid);
-				}
-				eDebugNoNewLine(")");
-			}
-			eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
-			if (!program.audioStreams.empty())
-			{
-				eDebugNoNewLine(" (");
-				for (std::vector<eDVBServicePMTHandler::audioStream>::const_iterator
-					i(program.audioStreams.begin()); 
-					i != program.audioStreams.end(); ++i)
-				{
-					if (apid == -1)
-						apid = i->pid;
-					if (i != program.audioStreams.begin())
-						eDebugNoNewLine(", ");
-					eDebugNoNewLine("%04x", i->pid);
-				}
-				eDebugNoNewLine(")");
-			}
-			eDebug(", and the pcr pid is %04x", program.pcrPid);
-			if (program.pcrPid != 0x1fff)
-				pcrpid = program.pcrPid;
-		}
-		
-				// notify record thread...		
+		if (m_state == stateIdle)
+			doPrepare();
+		else if (m_want_record) /* doRecord can be called from Prepared and Recording state */
+			doRecord();
 		break;
 	}
 	}
 }
 
+
+RESULT eDVBServiceRecord::prepare()
+{
+	if (m_state == stateIdle)
+		return m_service_handler.tune(m_ref);
+	else
+		return -1;
+}
+
 RESULT eDVBServiceRecord::start()
 {
-	eDebug("starting recording..");
-	return m_service_handler.tune(m_ref);
+	m_want_record = 1;
+		/* when tune wasn't yet successfully, doRecord stays in "prepared"-state which is fine. */
+	return doRecord();
 }
 
+
 RESULT eDVBServiceRecord::stop()
 {
 	eDebug("stop recording!!");
+	if (m_state == stateRecording)
+	{
+		m_record->stop();
+		m_state = statePrepared;
+	}
+	
+	if (m_state == statePrepared)
+	{
+		m_record = 0;
+		m_state = stateIdle;
+	}
 	return 0;
 }
 
+
+int eDVBServiceRecord::doPrepare()
+{
+		/* allocate a ts recorder if we don't already have one. */
+	if (m_state == stateIdle)
+	{
+		::remove("recordings.ts");
+		int fd = ::open("recording.ts", O_WRONLY|O_CREAT, 0644);
+		if (fd == -1)
+		{
+			eDebug("eDVBServiceRecord - can't open hardcoded recording file!");
+			return -1;
+		}
+		ePtr<iDVBDemux> demux;
+		if (m_service_handler.getDemux(demux))
+		{
+			eDebug("eDVBServiceRecord - NO DEMUX available!");
+			return -2;
+		}
+		demux->createTSRecorder(m_record);
+		if (!m_record)
+		{
+			eDebug("eDVBServiceRecord - no ts recorder available.");
+			return -3;
+		}
+		m_record->setTargetFD(fd);
+		m_pids_active.clear();
+		m_state = statePrepared;
+	} else if ((m_state == statePrepared) || (m_state == stateRecording))
+	{
+			/* when we're already recording, we already have a recorder allocated. */
+		assert(m_record);
+	}
+	return 0;
+}
+
+int eDVBServiceRecord::doRecord()
+{
+	int err = doPrepare();
+	if (err)
+		return err;
+	
+	eDebug("starting recording..");
+	
+	eDVBServicePMTHandler::program program;
+	if (m_service_handler.getProgramInfo(program))
+		eDebug("getting program info failed.");
+	else
+	{
+		std::set<int> pids_to_record;
+		
+		eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size());
+		if (!program.videoStreams.empty())
+		{
+			eDebugNoNewLine(" (");
+			for (std::vector<eDVBServicePMTHandler::videoStream>::const_iterator
+				i(program.videoStreams.begin()); 
+				i != program.videoStreams.end(); ++i)
+			{
+				pids_to_record.insert(i->pid);
+				if (i != program.videoStreams.begin())
+					eDebugNoNewLine(", ");
+				eDebugNoNewLine("%04x", i->pid);
+			}
+			eDebugNoNewLine(")");
+		}
+		eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+		if (!program.audioStreams.empty())
+		{
+			eDebugNoNewLine(" (");
+			for (std::vector<eDVBServicePMTHandler::audioStream>::const_iterator
+				i(program.audioStreams.begin()); 
+				i != program.audioStreams.end(); ++i)
+			{
+				pids_to_record.insert(i->pid);
+				if (i != program.audioStreams.begin())
+					eDebugNoNewLine(", ");
+				eDebugNoNewLine("%04x", i->pid);
+			}
+			eDebugNoNewLine(")");
+		}
+		eDebug(", and the pcr pid is %04x", program.pcrPid);
+		if (program.pcrPid != 0x1fff)
+			pids_to_record.insert(program.pcrPid);
+		
+			/* find out which pids are NEW and which pids are obsolete.. */
+		std::set<int> new_pids, obsolete_pids;
+		
+		std::set_difference(pids_to_record.begin(), pids_to_record.end(), 
+				m_pids_active.begin(), m_pids_active.end(),
+				std::inserter(new_pids, new_pids.begin()));
+		
+		std::set_difference(
+				m_pids_active.begin(), m_pids_active.end(),
+				pids_to_record.begin(), pids_to_record.end(), 
+				std::inserter(new_pids, new_pids.begin())
+				);
+		
+		for (std::set<int>::iterator i(new_pids.begin()); i != new_pids.end(); ++i)
+		{
+			eDebug("ADD PID: %04x", *i);
+			m_record->addPID(*i);
+		}
+		for (std::set<int>::iterator i(obsolete_pids.begin()); i != obsolete_pids.end(); ++i)
+		{
+			eDebug("REMOVED PID: %04x", *i);
+			m_record->removePID(*i);
+		}
+		
+		if (m_state != stateRecording)
+		{
+			m_record->start();
+			m_state = stateRecording;
+		}
+	}
+	return 0;
+}