#include <unistd.h>
#include <signal.h>
+// #define FUZZING 1
+
+#if FUZZING
+ /* change every 1:FUZZING_PROPABILITY byte */
+#define FUZZING_PROPABILITY 100
+#endif
+
#if HAVE_DVB_API_VERSION < 3
#include <ost/dmx.h>
#else
#include <linux/dvb/dmx.h>
-// #define HAVE_ADD_PID
+#define HAVE_ADD_PID
#ifdef HAVE_ADD_PID
#define DMX_ADD_PID _IO('o', 51)
{
#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");
+ else
+ source = fenum;
::close(fd);
return res;
#endif
int fd = openDemux();
int n = DMX_SOURCE_DVR0 + pvrnum;
int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+ source = -1;
::close(fd);
return res;
#endif
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)
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;
}
__u8 data[4096]; // max. section size
int r;
r = ::read(fd, data, 4096);
+#if FUZZING
+ int j;
+ for (j = 0; j < r; ++j)
+ {
+ if (!(rand()%FUZZING_PROPABILITY))
+ data[j] ^= rand();
+ }
+#endif
if(r < 0)
{
eWarning("ERROR reading section - %m\n");
if (fd >= 0)
{
- notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read, false);
+ notifier=eSocketNotifier::create(context, fd, eSocketNotifier::Read, false);
CONNECT(notifier->activated, eDVBSectionReader::data);
res = 0;
} else
eDVBSectionReader::~eDVBSectionReader()
{
- if (notifier)
- delete notifier;
if (fd >= 0)
::close(fd);
}
#else
sct.flags = DMX_IMMEDIATE_START;
#endif
+#if !FUZZING
if (mask.flags & eDVBSectionFilterMask::rfCRC)
{
sct.flags |= DMX_CHECK_CRC;
checkcrc = 1;
} else
+#endif
checkcrc = 0;
memcpy(sct.filter.filter, mask.data, DMX_FILTER_SIZE);
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 = eSocketNotifier::create(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_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:
eDVBRecordFileThread();
- void setTimingPID(int pid);
+ void setTimingPID(int pid, int type);
- void saveTimingInformation(const std::string &filename);
+ void startSaveMetaInformation(const std::string &filename);
+ void stopSaveMetaInformation();
+ int getLastPTS(pts_t &pts);
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;
off_t m_current_offset;
+ pts_t m_last_pcr; /* very approximate.. */
int m_pid;
};
eDVBRecordFileThread::eDVBRecordFileThread()
- : m_ts_parser(m_stream_info)
+ :eFilePushThread(IOPRIO_CLASS_RT, 7), m_ts_parser(m_stream_info)
{
m_current_offset = 0;
}
-void eDVBRecordFileThread::setTimingPID(int pid)
+void eDVBRecordFileThread::setTimingPID(int pid, int type)
{
- m_ts_parser.setPid(pid);
+ m_ts_parser.setPid(pid, type);
}
-void eDVBRecordFileThread::saveTimingInformation(const std::string &filename)
+void eDVBRecordFileThread::startSaveMetaInformation(const std::string &filename)
{
- m_stream_info.save(filename.c_str());
+ m_stream_info.startSave(filename.c_str());
}
-void eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len)
+void eDVBRecordFileThread::stopSaveMetaInformation()
+{
+ m_stream_info.stopSave();
+}
+
+int eDVBRecordFileThread::getLastPTS(pts_t &pts)
+{
+ return m_ts_parser.getLastPTS(pts);
+}
+
+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
dmx_pes_filter_params flt;
flt.pes_type = (dmx_pes_type_t)DMX_TAP_TS;
- flt.pid = 0x1234; /* FIXME */
+ flt.pid = (__u16)-1;
flt.input = DMX_IN_FRONTEND;
flt.output = DMX_OUT_TAP;
flt.flags = 0;
::ioctl(m_source_fd, DMX_START);
#endif
+
+ if (m_target_filename != "")
+ m_thread->startSaveMetaInformation(m_target_filename);
m_thread->start(m_source_fd, m_target_fd);
m_running = 1;
return 0;
}
-RESULT eDVBTSRecorder::setTimingPID(int pid)
+RESULT eDVBTSRecorder::setTimingPID(int pid, int type)
{
if (m_running)
return -1;
- m_thread->setTimingPID(pid);
+ m_thread->setTimingPID(pid, type);
return 0;
}
m_thread->stop();
close(m_source_fd);
+ m_source_fd = -1;
- if (m_target_filename != "")
- m_thread->saveTimingInformation(m_target_filename + ".ap");
+ m_thread->stopSaveMetaInformation();
return 0;
}
+RESULT eDVBTSRecorder::getCurrentPCR(pts_t &pcr)
+{
+ if (!m_running)
+ return 0;
+ if (!m_thread)
+ return 0;
+ /* XXX: we need a lock here */
+
+ /* we don't filter PCR data, so just use the last received PTS, which is not accurate, but better than nothing */
+ return m_thread->getLastPTS(pcr);
+}
+
RESULT eDVBTSRecorder::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
{
conn = new eConnection(this, m_event.connect(event));
}
m_pids[pid] = fd;
#else
- eDebug("add pid: %08x", pid);
- if (::ioctl(m_source_fd, DMX_ADD_PID, pid))
- perror("DMX_ADD_PID");
- eDebug("ok");
+ 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;
}
#ifndef HAVE_ADD_PID
if (m_pids[pid] != -1)
::close(m_pids[pid]);
- m_pids[pid] = -1;
#else
- if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid))
- perror("DMX_REMOVE_PID");
+ 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