#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
#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>
{
}
+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 0;
}
+RESULT eDVBDemux::getSTC(pts_t &pts)
+{
+ int fd = openDemux();
+
+ if (fd < 0)
+ return -ENODEV;
+
+ struct dmx_stc stc;
+ stc.num = 0;
+ 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)
+{
+ conn = new eConnection(this, m_event.connect(event));
+ return 0;
+}
+
void eDVBSectionReader::data(int)
{
__u8 data[4096]; // max. section size
// 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;
+ }
}
- read(data);
+ if (active)
+ read(data);
+ else
+ eDebug("data.. but not active");
}
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);
{
if (!active)
return -1;
-
+
+ active=0;
::ioctl(fd, DMX_STOP);
-
+ notifier->stop();
+
return 0;
}
DEFINE_REF(eDVBTSRecorder);
-class eDVBTSRecorderThread: public eThread
-{
-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;
-};
-
-eDVBTSRecorderThread::eDVBTSRecorderThread()
-{
- m_stop = 0;
- m_buf_start = m_buf_end = 0;
-}
-
-static void signal_handler(int x)
-{
-}
-
-void eDVBTSRecorderThread::thread()
-{
- eDebug("RECORDING THREAD START");
- // this is race. FIXME.
-
- /* 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);
-
- /* 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);
- }
-
- eDebug("RECORDING THREAD STOP");
-}
-
-void eDVBTSRecorderThread::start(int fd_source, int fd_dest)
-{
- m_fd_source = fd_source;
- m_fd_dest = fd_dest;
- m_stop = 0;
- run();
-}
-
-void eDVBTSRecorderThread::stop()
-{
- m_stop = 1;
- sendSignal(SIGUSR1);
- kill();
-}
-
eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
{
m_running = 0;
m_format = 0;
m_target_fd = -1;
- m_thread = new eDVBTSRecorderThread();
+ m_thread = new eFilePushThread();
m_demux->m_dvr_busy = 1;
}
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);
+ 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;
}
git.cweiske.de / enigma2.git / blobdiff