#else
#include <linux/dvb/dmx.h>
+
+#define HAVE_ADD_PID
+
+#ifdef HAVE_ADD_PID
+#define DMX_ADD_PID _IO('o', 51)
+#define DMX_REMOVE_PID _IO('o', 52)
+
+typedef enum {
+ DMX_TAP_TS = 0,
+ DMX_TAP_PES = DMX_PES_OTHER, /* for backward binary compat. */
+} dmx_tap_type_t;
+
+#endif
+
#endif
#include "crc32.h"
return res;
}
+RESULT eDVBDemux::createPESReader(eMainloop *context, ePtr<iDVBPESReader> &reader)
+{
+ RESULT res;
+ reader = new eDVBPESReader(this, context, res);
+ if (res)
+ reader = 0;
+ return res;
+}
+
RESULT eDVBDemux::createTSRecorder(ePtr<iDVBTSRecorder> &recorder)
{
if (m_dvr_busy)
return 0;
}
-RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder)
+RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder, int primary)
{
- decoder = new eTSMPEGDecoder(this, 0);
+ decoder = new eTSMPEGDecoder(this, primary ? 0 : 1);
return 0;
}
if (ioctl(fd, DMX_GET_STC, &stc) < 0)
{
+ eDebug("DMX_GET_STC failed!");
::close(fd);
return -1;
}
pts = stc.stc;
+ eDebug("DMX_GET_STC - %lld", pts);
+
::close(fd);
return 0;
}
return 0;
}
+void eDVBPESReader::data(int)
+{
+ while (1)
+ {
+ __u8 buffer[16384];
+ int r;
+ r = ::read(m_fd, buffer, 16384);
+ if (!r)
+ return;
+ if(r < 0)
+ {
+ if (errno == EAGAIN || errno == EINTR) /* ok */
+ return;
+ eWarning("ERROR reading PES (fd=%d) - %m", m_fd);
+ return;
+ }
+
+ if (m_active)
+ m_read(buffer, r);
+ else
+ eWarning("PES reader not active");
+ if (r != 16384)
+ break;
+ }
+}
+
+eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res): m_demux(demux)
+{
+ char filename[128];
+ m_fd = m_demux->openDemux();
+
+ if (m_fd >= 0)
+ {
+ ::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
+ ::fcntl(m_fd, F_SETFL, O_NONBLOCK);
+ m_notifier = new eSocketNotifier(context, m_fd, eSocketNotifier::Read, false);
+ CONNECT(m_notifier->activated, eDVBPESReader::data);
+ res = 0;
+ } else
+ {
+ perror(filename);
+ res = errno;
+ }
+}
+
+DEFINE_REF(eDVBPESReader)
+
+eDVBPESReader::~eDVBPESReader()
+{
+ if (m_notifier)
+ delete m_notifier;
+ if (m_fd >= 0)
+ ::close(m_fd);
+}
+
+RESULT eDVBPESReader::start(int pid)
+{
+ RESULT res;
+ if (m_fd < 0)
+ return -ENODEV;
+
+ m_notifier->start();
+
+#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_TAP;
+
+ flt.flags = DMX_IMMEDIATE_START;
+
+ res = ::ioctl(m_fd, DMX_SET_PES_FILTER, &flt);
+
+ if (res)
+ eWarning("PES filter: DMX_SET_PES_FILTER - %m");
+ if (!res)
+ m_active = 1;
+ return res;
+}
+
+RESULT eDVBPESReader::stop()
+{
+ if (!m_active)
+ return -1;
+
+ m_active=0;
+ ::ioctl(m_fd, DMX_STOP);
+ m_notifier->stop();
+
+ return 0;
+}
+
+RESULT eDVBPESReader::connectRead(const Slot2<void,const __u8*,int> &r, ePtr<eConnection> &conn)
+{
+ conn = new eConnection(this, m_read.connect(r));
+ return 0;
+}
+
class eDVBRecordFileThread: public eFilePushThread
{
public:
void saveTimingInformation(const std::string &filename);
protected:
- void filterRecordData(const unsigned char *data, int len);
+ int filterRecordData(const unsigned char *data, int len, size_t ¤t_span_remaining);
private:
eMPEGStreamParserTS m_ts_parser;
eMPEGStreamInformation m_stream_info;
};
eDVBRecordFileThread::eDVBRecordFileThread()
- : m_ts_parser(m_stream_info)
+ :eFilePushThread(IOPRIO_CLASS_RT, 7), m_ts_parser(m_stream_info)
{
m_current_offset = 0;
}
m_stream_info.save(filename.c_str());
}
-void eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len)
+int eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len, size_t ¤t_span_remaining)
{
m_ts_parser.parseData(m_current_offset, data, len);
m_current_offset += len;
+
+ return len;
}
DEFINE_REF(eDVBTSRecorder);
m_running = 0;
m_target_fd = -1;
m_thread = new eDVBRecordFileThread();
+ CONNECT(m_thread->m_event, eDVBTSRecorder::filepushEvent);
+#ifndef HAVE_ADD_PID
m_demux->m_dvr_busy = 1;
+#endif
}
eDVBTSRecorder::~eDVBTSRecorder()
{
stop();
delete m_thread;
+#ifndef HAVE_ADD_PID
m_demux->m_dvr_busy = 0;
+#endif
}
RESULT eDVBTSRecorder::start()
if (m_target_fd == -1)
return -2;
-
+
char filename[128];
+#ifndef HAVE_ADD_PID
#if HAVE_DVB_API_VERSION < 3
snprintf(filename, 128, "/dev/dvb/card%d/dvr%d", m_demux->adapter, m_demux->demux);
#else
eDebug("FAILED to open dvr (%s) in ts recoder (%m)", filename);
return -3;
}
+#else
+ snprintf(filename, 128, "/dev/dvb/adapter%d/demux%d", m_demux->adapter, m_demux->demux);
+
+ m_source_fd = ::open(filename, O_RDONLY);
+
+ if (m_source_fd < 0)
+ {
+ eDebug("FAILED to open demux (%s) in ts recoder (%m)", filename);
+ return -3;
+ }
+
+ ::ioctl(m_source_fd, DMX_SET_BUFFER_SIZE, 1024*1024);
+
+ dmx_pes_filter_params flt;
+ flt.pes_type = (dmx_pes_type_t)DMX_TAP_TS;
+ flt.pid = (__u16)-1;
+ flt.input = DMX_IN_FRONTEND;
+ flt.output = DMX_OUT_TAP;
+ flt.flags = 0;
+ int res = ::ioctl(m_source_fd, DMX_SET_PES_FILTER, &flt);
+ if (res)
+ {
+ eDebug("DMX_SET_PES_FILTER: %m");
+ ::close(m_source_fd);
+ return -3;
+ }
+
+ ::ioctl(m_source_fd, DMX_START);
+
+#endif
m_thread->start(m_source_fd, m_target_fd);
m_running = 1;
RESULT eDVBTSRecorder::setTargetFilename(const char *filename)
{
m_target_filename = filename;
+ return 0;
}
RESULT eDVBTSRecorder::setBoundary(off_t max)
m_thread->stop();
close(m_source_fd);
+ m_source_fd = -1;
if (m_target_filename != "")
m_thread->saveTimingInformation(m_target_filename + ".ap");
RESULT eDVBTSRecorder::startPID(int pid)
{
+#ifndef HAVE_ADD_PID
int fd = m_demux->openDemux();
if (fd < 0)
{
return -1;
}
m_pids[pid] = fd;
-
+#else
+ bool retry=false;
+ while(true) {
+ if (::ioctl(m_source_fd, DMX_ADD_PID, pid) < 0) {
+ perror("DMX_ADD_PID");
+ if (errno == EAGAIN || errno == EINTR) {
+ eDebug("retry!");
+ continue;
+ }
+ } else
+ m_pids[pid] = 1;
+ break;
+ }
+#endif
return 0;
}
void eDVBTSRecorder::stopPID(int pid)
{
+#ifndef HAVE_ADD_PID
if (m_pids[pid] != -1)
::close(m_pids[pid]);
+#else
+ if (m_pids[pid] != -1)
+ {
+ while(true) {
+ if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid) < 0) {
+ perror("DMX_REMOVE_PID");
+ if (errno == EAGAIN || errno == EINTR) {
+ eDebug("retry!");
+ continue;
+ }
+ }
+ break;
+ }
+ }
+#endif
m_pids[pid] = -1;
}
+
+void eDVBTSRecorder::filepushEvent(int event)
+{
+ switch (event)
+ {
+ case eFilePushThread::evtWriteError:
+ m_event(eventWriteError);
+ break;
+ }
+}
git.cweiske.de / enigma2.git / blobdiff