From 7fd4f3d49a6d2f93cae4769cf8678358ebd1abce Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sat, 30 Apr 2005 17:59:17 +0000 Subject: [PATCH] - add ts recorder - rename: isection.h -> idemux.h --- lib/dvb/demux.cpp | 258 +++++++++++++++++++++++++++++++++++++++++++++ lib/dvb/demux.h | 41 ++++++- lib/dvb/eit.h | 2 +- lib/dvb/esection.h | 2 +- lib/dvb/pmt.cpp | 2 + lib/dvb/pmt.h | 2 +- lib/dvb/scan.h | 2 +- lib/dvb/specs.h | 2 +- 8 files changed, 305 insertions(+), 6 deletions(-) diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp index f24fcddc..f6bdbd7b 100644 --- a/lib/dvb/demux.cpp +++ b/lib/dvb/demux.cpp @@ -4,6 +4,9 @@ #include #include #include +#include + +#include #if HAVE_DVB_API_VERSION < 3 #include @@ -24,6 +27,7 @@ eDVBDemux::eDVBDemux(int adapter, int demux): adapter(adapter), demux(demux) { + m_dvr_busy = 0; } eDVBDemux::~eDVBDemux() @@ -41,6 +45,14 @@ RESULT eDVBDemux::createSectionReader(eMainloop *context, ePtr &recorder) +{ + if (m_dvr_busy) + return -EBUSY; + recorder = new eDVBTSRecorder(this); + return 0; +} + RESULT eDVBDemux::getMPEGDecoder(ePtr &decoder) { decoder = new eTSMPEGDecoder(this, 0); @@ -165,3 +177,249 @@ RESULT eDVBSectionReader::connectRead(const Slot1 &r, ePtrm_dvr_busy = 1; +} + +eDVBTSRecorder::~eDVBTSRecorder() +{ + stop(); + delete m_thread; + m_demux->m_dvr_busy = 0; +} + +RESULT eDVBTSRecorder::start() +{ + if (m_running) + return -1; + + if (m_target_fd == -1) + return -2; + + char filename[128]; +#if HAVE_DVB_API_VERSION < 3 + snprintf(filename, 128, "/dev/dvb/card%d/dvr%d", m_demux->adapter, m_demux->demux); +#else + snprintf(filename, 128, "/dev/dvb/adapter%d/dvr%d", m_demux->adapter, m_demux->demux); +#endif + m_source_fd = ::open(filename, O_RDONLY); + + if (m_source_fd < 0) + { + eDebug("FAILED to open dvr (%s) in ts recoder (%m)", filename); + return -3; + } + + m_thread->start(m_source_fd, m_target_fd); + m_running = 1; + + for (std::map::iterator i(m_pids.begin()); i != m_pids.end(); ++i) + startPID(i->first); + + return 0; +} + +RESULT eDVBTSRecorder::addPID(int pid) +{ + if (m_pids.find(pid) != m_pids.end()) + return -1; + + m_pids.insert(std::pair(pid, -1)); + if (m_running) + startPID(pid); + return 0; +} + +RESULT eDVBTSRecorder::removePID(int pid) +{ + if (m_pids.find(pid) == m_pids.end()) + return -1; + + if (m_running) + stopPID(pid); + + m_pids.erase(pid); + return 0; +} + +RESULT eDVBTSRecorder::setFormat(int format) +{ + if (m_running) + return -1; + m_format = format; + return 0; +} + +RESULT eDVBTSRecorder::setTargetFD(int fd) +{ + m_target_fd = fd; + return 0; +} + +RESULT eDVBTSRecorder::setBoundary(off_t max) +{ + return -1; // not yet implemented +} + +RESULT eDVBTSRecorder::stop() +{ + for (std::map::iterator i(m_pids.begin()); i != m_pids.end(); ++i) + stopPID(i->first); + + if (!m_running) + return -1; + m_thread->stop(); + + close(m_source_fd); + + return 0; +} + +RESULT eDVBTSRecorder::connectEvent(const Slot1 &event, ePtr &conn) +{ + conn = new eConnection(this, m_event.connect(event)); + return 0; +} + +RESULT eDVBTSRecorder::startPID(int pid) +{ + char filename[128]; +#if HAVE_DVB_API_VERSION < 3 + snprintf(filename, 128, "/dev/dvb/card%d/demux%d", m_demux->adapter, m_demux->demux); +#else + snprintf(filename, 128, "/dev/dvb/adapter%d/demux%d", m_demux->adapter, m_demux->demux); +#endif + int fd = ::open(filename, O_RDWR); + if (fd < 0) + { + eDebug("FAILED to open demux (%s) in ts recoder (%m)", filename); + return -1; + } + +#if HAVE_DVB_API_VERSION < 3 + dmxPesFilterParams flt; + + flt.pesType = DMX_PES_OTHER; +#else + dmx_pes_filter_params flt; + + flt.pes_type = DMX_PES_OTHER; +#endif + + flt.pid = pid; + flt.input = DMX_IN_FRONTEND; + flt.output = DMX_OUT_TS_TAP; + + flt.flags = DMX_IMMEDIATE_START; + + int res = ::ioctl(fd, DMX_SET_PES_FILTER, &flt); + if (res < 0) + { + eDebug("set pes filter failed!"); + ::close(fd); + return -1; + } + m_pids[pid] = fd; + + return 0; +} + +void eDVBTSRecorder::stopPID(int pid) +{ + ::close(m_pids[pid]); + m_pids[pid] = -1; +} diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h index d8c1078e..b2d571ac 100644 --- a/lib/dvb/demux.h +++ b/lib/dvb/demux.h @@ -2,19 +2,23 @@ #define __dvb_demux_h #include -#include +#include class eDVBDemux: public iDVBDemux { int adapter, demux; + + int m_dvr_busy; friend class eDVBSectionReader; friend class eDVBAudio; friend class eDVBVideo; + friend class eDVBTSRecorder; public: DECLARE_REF(eDVBDemux); eDVBDemux(int adapter, int demux); virtual ~eDVBDemux(); RESULT createSectionReader(eMainloop *context, ePtr &reader); + RESULT createTSRecorder(ePtr &recorder); RESULT getMPEGDecoder(ePtr &reader); }; @@ -38,4 +42,39 @@ public: RESULT connectRead(const Slot1 &read, ePtr &conn); }; +class eDVBTSRecorderThread; + +class eDVBTSRecorder: public iDVBTSRecorder, public Object +{ + DECLARE_REF(eDVBTSRecorder); +public: + eDVBTSRecorder(eDVBDemux *demux); + ~eDVBTSRecorder(); + + RESULT start(); + RESULT addPID(int pid); + RESULT removePID(int pid); + + RESULT setFormat(int pid); + + RESULT setTargetFD(int fd); + RESULT setBoundary(off_t max); + + RESULT stop(); + + RESULT connectEvent(const Slot1 &event, ePtr &conn); +private: + RESULT startPID(int pid); + void stopPID(int pid); + + eDVBTSRecorderThread *m_thread; + + std::map m_pids; + Signal1 m_event; + + ePtr m_demux; + + int m_running, m_format, m_target_fd, m_source_fd; +}; + #endif diff --git a/lib/dvb/eit.h b/lib/dvb/eit.h index 7ec16bc8..a026773c 100644 --- a/lib/dvb/eit.h +++ b/lib/dvb/eit.h @@ -1,7 +1,7 @@ #ifndef __lib_dvb_eit_h #define __lib_dvb_eit_h -#include +#include #include #include #include diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h index df0b93e5..2d71eef8 100644 --- a/lib/dvb/esection.h +++ b/lib/dvb/esection.h @@ -1,7 +1,7 @@ #ifndef __esection_h #define __esection_h -#include +#include #include class eGTable: public iObject, public Object diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index 8c4388a4..3f9ac7f7 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -44,6 +44,7 @@ void eDVBServicePMTHandler::PMTready(int error) void eDVBServicePMTHandler::PATready(int) { + eDebug("got PAT"); ePtr > ptr; if (!m_PAT.getCurrent(ptr)) { @@ -67,6 +68,7 @@ void eDVBServicePMTHandler::PATready(int) int eDVBServicePMTHandler::getProgramInfo(struct program &program) { + eDebug("got PMT"); ePtr > ptr; program.videoStreams.clear(); diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 03df198b..136c1673 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h index 2f75291b..bfd3add9 100644 --- a/lib/dvb/scan.h +++ b/lib/dvb/scan.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/dvb/specs.h b/lib/dvb/specs.h index 1a0353e5..5c26bfad 100644 --- a/lib/dvb/specs.h +++ b/lib/dvb/specs.h @@ -2,7 +2,7 @@ #define __lib_dvb_specs_h #include -#include +#include #include #include #include -- 2.30.2