+ conn = new eConnection(this, read.connect(r));
+ 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 saveTimingInformation(const std::string &filename);
+protected:
+ 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;
+ 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 eDVBRecordFileThread::saveTimingInformation(const std::string &filename)
+{
+ m_stream_info.save(filename.c_str());
+}
+
+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);
+
+eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
+{
+ 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_running)
+ return -1;
+
+ 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
+ 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;
+ }
+#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;
+
+ for (std::map<int,int>::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<int,int>(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::setTimingPID(int pid)
+{
+ if (m_running)
+ return -1;
+ m_thread->setTimingPID(pid);
+ return 0;
+}
+
+RESULT eDVBTSRecorder::setTargetFD(int fd)
+{
+ m_target_fd = fd;
+ 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
+}
+
+RESULT eDVBTSRecorder::stop()
+{
+ for (std::map<int,int>::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);
+ m_source_fd = -1;
+
+ if (m_target_filename != "")
+ m_thread->saveTimingInformation(m_target_filename + ".ap");
+
+ return 0;
+}
+
+RESULT eDVBTSRecorder::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
+{
+ conn = new eConnection(this, m_event.connect(event));