-#include <config.h>
#include <stdio.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <signal.h>
-#include <lib/base/thread.h>
-
#if HAVE_DVB_API_VERSION < 3
#include <ost/dmx.h>
+
#ifndef DMX_SET_NEGFILTER_MASK
#define DMX_SET_NEGFILTER_MASK _IOW('o',48,uint8_t *)
#endif
+
+#ifndef DMX_GET_STC
+ struct dmx_stc
+ {
+ unsigned int num; /* input : which STC? O..N */
+ unsigned int base; /* output: divisor for stc to get 90 kHz clock */
+ unsigned long long stc; /* output: src in 'base'*90 kHz units */
+ };
+ #define DMX_GET_STC _IOR('o', 50, struct dmx_stc)
+#endif
+
#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"
#include <lib/base/eerror.h>
+#include <lib/base/filepush.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/demux.h>
#include <lib/dvb/esection.h>
#include <lib/dvb/decoder.h>
+#include <lib/dvb/pvrparse.h>
eDVBDemux::eDVBDemux(int adapter, int demux): adapter(adapter), demux(demux)
{
{
}
+int eDVBDemux::openDemux(void)
+{
+ char filename[128];
+#if HAVE_DVB_API_VERSION < 3
+ snprintf(filename, 128, "/dev/dvb/card%d/demux%d", adapter, demux);
+#else
+ snprintf(filename, 128, "/dev/dvb/adapter%d/demux%d", adapter, demux);
+#endif
+ return ::open(filename, O_RDWR);
+}
+
DEFINE_REF(eDVBDemux)
+RESULT eDVBDemux::setSourceFrontend(int fenum)
+{
+#if HAVE_DVB_API_VERSION >= 3
+ int fd = openDemux();
+
+ int n = DMX_SOURCE_FRONT0 + fenum;
+ int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+ if (res)
+ eDebug("DMX_SET_SOURCE failed! - %m");
+ ::close(fd);
+ return res;
+#endif
+ return 0;
+}
+
+RESULT eDVBDemux::setSourcePVR(int pvrnum)
+{
+#if HAVE_DVB_API_VERSION >= 3
+ int fd = openDemux();
+ int n = DMX_SOURCE_DVR0 + pvrnum;
+ int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+ ::close(fd);
+ return res;
+#endif
+ return 0;
+}
+
RESULT eDVBDemux::createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)
{
RESULT res;
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, primary ? 0 : 1);
+ return 0;
+}
+
+RESULT eDVBDemux::getSTC(pts_t &pts, int num)
+{
+ int fd = openDemux();
+
+ if (fd < 0)
+ return -ENODEV;
+
+ struct dmx_stc stc;
+ stc.num = num;
+ stc.base = 1;
+
+ if (ioctl(fd, DMX_GET_STC, &stc) < 0)
+ {
+ ::close(fd);
+ return -1;
+ }
+
+ pts = stc.stc;
+
+ ::close(fd);
+ return 0;
+}
+
+RESULT eDVBDemux::flush()
+{
+ // FIXME: implement flushing the PVR queue here.
+
+ m_event(evtFlush);
+ return 0;
+}
+
+RESULT eDVBDemux::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
{
- decoder = new eTSMPEGDecoder(this, 0);
+ conn = new eConnection(this, m_event.connect(event));
return 0;
}
// this check should never happen unless the driver is crappy!
unsigned int c;
if ((c = crc32((unsigned)-1, data, r)))
- eFatal("crc32 failed! is %x\n", c);
+ {
+ eDebug("crc32 failed! is %x\n", c);
+ return;
+ }
}
if (active)
read(data);
eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res): demux(demux)
{
char filename[128];
-#if HAVE_DVB_API_VERSION < 3
- sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
-#else
- sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);
-#endif
- fd = ::open(filename, O_RDWR);
-
- eDebug("eDVBSectionReader has fd %d", fd);
+ fd = demux->openDemux();
if (fd >= 0)
{
- notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read);
+ notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read, false);
CONNECT(notifier->activated, eDVBSectionReader::data);
res = 0;
} else
if (fd < 0)
return -ENODEV;
+ notifier->start();
#if HAVE_DVB_API_VERSION < 3
dmxSctFilterParams sct;
#else
memcpy(sct.filter.mask, mask.mask, DMX_FILTER_SIZE);
#if HAVE_DVB_API_VERSION >= 3
memcpy(sct.filter.mode, mask.mode, DMX_FILTER_SIZE);
+ if (::ioctl(fd, DMX_SET_BUFFER_SIZE, 8192*8) < 0)
+ eDebug("DMX_SET_BUFFER_SIZE failed(%m)");
#endif
res = ::ioctl(fd, DMX_SET_FILTER, &sct);
active=0;
::ioctl(fd, DMX_STOP);
-
+ notifier->stop();
+
return 0;
}
return 0;
}
-DEFINE_REF(eDVBTSRecorder);
-
-class eDVBTSRecorderThread: public eThread
+void eDVBPESReader::data(int)
{
-public:
- eDVBTSRecorderThread();
- void thread();
- void stop();
- void start(int sourcefd, int destfd);
-private:
- int m_stop;
- unsigned char m_buffer[65536];
- int m_buf_start, m_buf_end;
- int m_fd_source, m_fd_dest;
-};
+ while (1)
+ {
+ __u8 buffer[16384];
+ int r;
+ r = ::read(m_fd, buffer, 16384);
+ if (!r)
+ return;
+ if(r < 0)
+ {
+ if (errno == EAGAIN) /* 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");
+ }
+}
-eDVBTSRecorderThread::eDVBTSRecorderThread()
+eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res): m_demux(demux)
{
- m_stop = 0;
- m_buf_start = m_buf_end = 0;
+ 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;
+ }
}
-static void signal_handler(int x)
+DEFINE_REF(eDVBPESReader)
+
+eDVBPESReader::~eDVBPESReader()
{
+ if (m_notifier)
+ delete m_notifier;
+ if (m_fd >= 0)
+ ::close(m_fd);
}
-void eDVBTSRecorderThread::thread()
+RESULT eDVBPESReader::start(int pid)
{
- eDebug("RECORDING THREAD START");
- // this is race. FIXME.
+ RESULT res;
+ if (m_fd < 0)
+ return -ENODEV;
+
+ m_notifier->start();
+
+#if HAVE_DVB_API_VERSION < 3
+ dmxPesFilterParams flt;
- /* we set the signal to not restart syscalls, so we can detect our signal. */
- struct sigaction act;
- act.sa_handler = signal_handler; // no, SIG_IGN doesn't do it :/
- act.sa_flags = 0;
- sigaction(SIGUSR1, &act, 0);
+ flt.pesType = DMX_PES_OTHER;
+#else
+ dmx_pes_filter_params flt;
- /* m_stop must be evaluated after each syscall. */
- while (!m_stop)
- {
- /* first try flushing the bufptr */
- if (m_buf_start != m_buf_end)
- {
- // TODO: take care of boundaries.
- int w = write(m_fd_dest, m_buffer + m_buf_start, m_buf_end - m_buf_start);
- if (w <= 0)
- {
- if (errno == -EINTR)
- continue;
- eDebug("eDVBTSRecorder *write error* - not yet handled");
- // ... we would stop the thread
- }
- printf("TSRECORD: wrote %d bytes\n", w);
- m_buf_start += w;
- continue;
- }
-
- /* now fill our buffer. */
- m_buf_start = 0;
- m_buf_end = read(m_fd_source, m_buffer, sizeof(m_buffer));
- if (m_buf_end < 0)
- {
- m_buf_end = 0;
- if (errno == EINTR)
- continue;
- eDebug("eDVBTSRecorder *read error* - not yet handled");
- }
- printf("TSRECORD: read %d bytes\n", m_buf_end);
- }
+ 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:
+ eDVBRecordFileThread();
+ void setTimingPID(int pid);
- eDebug("RECORDING THREAD STOP");
+ void saveTimingInformation(const std::string &filename);
+protected:
+ void filterRecordData(const unsigned char *data, int len);
+private:
+ eMPEGStreamParserTS m_ts_parser;
+ eMPEGStreamInformation m_stream_info;
+ off_t m_current_offset;
+ int m_pid;
+};
+
+eDVBRecordFileThread::eDVBRecordFileThread()
+ :eFilePushThread(IOPRIO_CLASS_RT, 7), m_ts_parser(m_stream_info)
+{
+ m_current_offset = 0;
+}
+
+void eDVBRecordFileThread::setTimingPID(int pid)
+{
+ m_ts_parser.setPid(pid);
}
-void eDVBTSRecorderThread::start(int fd_source, int fd_dest)
+void eDVBRecordFileThread::saveTimingInformation(const std::string &filename)
{
- m_fd_source = fd_source;
- m_fd_dest = fd_dest;
- m_stop = 0;
- run();
+ m_stream_info.save(filename.c_str());
}
-void eDVBTSRecorderThread::stop()
+void eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len)
{
- m_stop = 1;
- sendSignal(SIGUSR1);
- kill();
+ m_ts_parser.parseData(m_current_offset, data, len);
+
+ m_current_offset += len;
}
+DEFINE_REF(eDVBTSRecorder);
+
eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
{
m_running = 0;
- m_format = 0;
m_target_fd = -1;
- m_thread = new eDVBTSRecorderThread();
+ m_thread = new eDVBRecordFileThread();
+#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;
return 0;
}
-RESULT eDVBTSRecorder::setFormat(int format)
+RESULT eDVBTSRecorder::setTimingPID(int pid)
{
if (m_running)
return -1;
- m_format = format;
+ m_thread->setTimingPID(pid);
return 0;
}
return 0;
}
+RESULT eDVBTSRecorder::setTargetFilename(const char *filename)
+{
+ m_target_filename = filename;
+ return 0;
+}
+
RESULT eDVBTSRecorder::setBoundary(off_t max)
{
return -1; // not yet implemented
m_thread->stop();
close(m_source_fd);
+ m_source_fd = -1;
+
+ if (m_target_filename != "")
+ m_thread->saveTimingInformation(m_target_filename + ".ap");
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);
+#ifndef HAVE_ADD_PID
+ int fd = m_demux->openDemux();
if (fd < 0)
{
- eDebug("FAILED to open demux (%s) in ts recoder (%m)", filename);
+ eDebug("FAILED to open demux in ts recoder (%m)");
return -1;
}
return -1;
}
m_pids[pid] = fd;
-
+#else
+ if (::ioctl(m_source_fd, DMX_ADD_PID, pid))
+ perror("DMX_ADD_PID");
+ else
+ m_pids[pid] = 1;
+#endif
return 0;
}
void eDVBTSRecorder::stopPID(int pid)
{
- ::close(m_pids[pid]);
+#ifndef HAVE_ADD_PID
+ if (m_pids[pid] != -1)
+ ::close(m_pids[pid]);
+#else
+ if (m_pids[pid] != -1)
+ {
+ if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid))
+ perror("DMX_REMOVE_PID");
+ }
+#endif
m_pids[pid] = -1;
}
git.cweiske.de / enigma2.git / blobdiff