#include <lib/base/ebase.h>
#include <lib/base/eerror.h>
#include <lib/dvb/decoder.h>
-#if HAVE_DVB_API_VERSION < 3
-#define audioStatus audio_status
-#define videoStatus video_status
-#define pesType pes_type
-#define playState play_state
-#define audioStreamSource_t audio_stream_source_t
-#define videoStreamSource_t video_stream_source_t
-#define streamSource stream_source
-#define dmxPesFilterParams dmx_pes_filter_params
-#define DMX_PES_VIDEO0 DMX_PES_VIDEO
-#define DMX_PES_AUDIO0 DMX_PES_AUDIO
-#define DMX_PES_PCR0 DMX_PES_PCR
-#define DMX_PES_TELETEXT0 DMX_PES_TELETEXT
-#define DMX_PES_VIDEO1 DMX_PES_VIDEO
-#define DMX_PES_AUDIO1 DMX_PES_AUDIO
-#define DMX_PES_PCR1 DMX_PES_PCR
-#define DMX_PES_TELETEXT1 DMX_PES_TELETEXT
-#include <ost/dmx.h>
-#include <ost/video.h>
-#include <ost/audio.h>
-#else
#include <linux/dvb/audio.h>
#include <linux/dvb/video.h>
#include <linux/dvb/dmx.h>
-#endif
#include <unistd.h>
#include <fcntl.h>
#define VIDEO_GET_PTS _IOR('o', 57, __u64)
#endif
+#ifndef VIDEO_SOURCE_HDMI
+#define VIDEO_SOURCE_HDMI 2
+#endif
+#ifndef AUDIO_SOURCE_HDMI
+#define AUDIO_SOURCE_HDMI 2
+#endif
+
DEFINE_REF(eDVBAudio);
eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev)
:m_demux(demux), m_dev(dev)
{
char filename[128];
-#if HAVE_DVB_API_VERSION < 3
- sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev);
-#else
- sprintf(filename, "/dev/dvb/adapter%d/audio%d", demux->adapter, dev);
-#endif
+ sprintf(filename, "/dev/dvb/adapter%d/audio%d", demux ? demux->adapter : 0, dev);
m_fd = ::open(filename, O_RDWR);
if (m_fd < 0)
eWarning("%s: %m", filename);
-#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
- m_fd_demux = ::open(filename, O_RDWR);
- if (m_fd_demux < 0)
- eWarning("%s: %m", filename);
-}
-
-#if HAVE_DVB_API_VERSION < 3
-int eDVBAudio::setPid(int pid, int type)
-{
- if ((m_fd < 0) || (m_fd_demux < 0))
- return -1;
-
- int bypass = 0;
-
- switch (type)
+ if (demux)
{
- case aMPEG:
- bypass = 1;
- break;
- case aAC3:
- bypass = 0;
- break;
- /*
- case aDTS:
- bypass = 2;
- break;
- */
+ sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);
+ m_fd_demux = ::open(filename, O_RDWR);
+ if (m_fd_demux < 0)
+ eWarning("%s: %m", filename);
}
-
- if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
- eDebug("failed (%m)");
-
- dmx_pes_filter_params pes;
-
- pes.pid = pid;
- pes.input = DMX_IN_FRONTEND;
- pes.output = DMX_OUT_DECODER;
- pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */
- pes.flags = 0;
- eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - audio - ", pid);
- if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+ else
{
- eDebug("failed (%m)");
- return -errno;
+ m_fd_demux = -1;
}
- eDebug("ok");
- return 0;
-}
-
-int eDVBAudio::startPid()
-{
- eDebugNoNewLine("DEMUX_START - audio - ");
- if (::ioctl(m_fd_demux, DMX_START) < 0)
+ if (m_fd >= 0)
{
- eDebug("failed (%m)");
- return -errno;
+ ::ioctl(m_fd, AUDIO_SELECT_SOURCE, demux ? AUDIO_SOURCE_DEMUX : AUDIO_SOURCE_HDMI);
}
- eDebug("ok");
- return 0;
}
-int eDVBAudio::start()
+int eDVBAudio::startPid(int pid, int type)
{
- eDebugNoNewLine("AUDIO_PLAY - ");
- if (::ioctl(m_fd, AUDIO_PLAY) < 0)
+ if (m_fd_demux >= 0)
{
- eDebug("failed (%m)");
- return -errno;
- }
- eDebug("ok");
- return 0;
-}
+ dmx_pes_filter_params pes;
-int eDVBAudio::stopPid()
-{
- eDebugNoNewLine("DEMUX_STOP - audio - ");
- if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- {
- eDebug("failed (%m)");
- return -errno;
+ pes.pid = pid;
+ pes.input = DMX_IN_FRONTEND;
+ pes.output = DMX_OUT_DECODER;
+ switch (m_dev)
+ {
+ case 0:
+ pes.pes_type = DMX_PES_AUDIO0;
+ break;
+ case 1:
+ pes.pes_type = DMX_PES_AUDIO1;
+ break;
+ case 2:
+ pes.pes_type = DMX_PES_AUDIO2;
+ break;
+ case 3:
+ pes.pes_type = DMX_PES_AUDIO3;
+ break;
+ }
+ pes.flags = 0;
+ eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - audio - ", pid);
+ if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ eDebugNoNewLine("DEMUX_START - audio - ");
+ if (::ioctl(m_fd_demux, DMX_START) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
}
- eDebug("ok");
- return 0;
-}
-int eDVBAudio::setAVSync(int val)
-{
- eDebugNoNewLine("AUDIO_SET_AV_SYNC - ");
- if (::ioctl(m_fd, AUDIO_SET_AV_SYNC, val) < 0)
+ if (m_fd >= 0)
{
- eDebug("failed (%m)");
- return -errno;
- }
- eDebug("ok");
- return 0;
-}
-#else
-int eDVBAudio::startPid(int pid, int type)
-{
- if ((m_fd < 0) || (m_fd_demux < 0))
- return -1;
- dmx_pes_filter_params pes;
+ int bypass = 0;
- pes.pid = pid;
- pes.input = DMX_IN_FRONTEND;
- pes.output = DMX_OUT_DECODER;
- pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */
- pes.flags = 0;
- eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - audio - ", pid);
- if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
- {
- eDebug("failed (%m)");
- return -errno;
- }
- eDebug("ok");
- eDebugNoNewLine("DEMUX_START - audio - ");
- if (::ioctl(m_fd_demux, DMX_START) < 0)
- {
- eDebug("failed (%m)");
- return -errno;
- }
- eDebug("ok");
- int bypass = 0;
+ switch (type)
+ {
+ case aMPEG:
+ bypass = 1;
+ break;
+ case aAC3:
+ bypass = 0;
+ break;
+ case aDTS:
+ bypass = 2;
+ break;
+ case aAAC:
+ bypass = 8;
+ break;
+ case aAACHE:
+ bypass = 9;
+ break;
+ case aLPCM:
+ bypass = 6;
+ break;
+ case aDTSHD:
+ bypass = 0x10;
+ break;
+ case aDDP:
+ bypass = 0x22;
+ break;
- switch (type)
- {
- case aMPEG:
- bypass = 1;
- break;
- case aAC3:
- bypass = 0;
- break;
- case aDTS:
- bypass = 2;
- break;
- case aAAC:
- bypass = 8;
- break;
- case aAACHE:
- bypass = 9;
- break;
- case aLPCM:
- bypass = 6;
- break;
- case aDTSHD:
- bypass = 0x10;
- break;
- case aDDP:
- bypass = 0x22;
- break;
+ }
+ eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
+ if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ freeze(); // why freeze here?!? this is a problem when only a pid change is requested... because of the unfreeze logic in Decoder::setState
+ eDebugNoNewLine("AUDIO_PLAY - ");
+ if (::ioctl(m_fd, AUDIO_PLAY) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
-
- eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
- if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
- freeze(); // why freeze here?!? this is a problem when only a pid change is requested... because of the unfreeze logic in Decoder::setState
- eDebugNoNewLine("AUDIO_PLAY - ");
- if (::ioctl(m_fd, AUDIO_PLAY) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
return 0;
}
-#endif
void eDVBAudio::stop()
{
- eDebugNoNewLine("AUDIO_STOP - ");
- if (::ioctl(m_fd, AUDIO_STOP) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
-#if HAVE_DVB_API_VERSION > 2
- eDebugNoNewLine("DEMUX_STOP - audio - ");
- if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
-#endif
+ if (m_fd >= 0)
+ {
+ eDebugNoNewLine("AUDIO_STOP - ");
+ if (::ioctl(m_fd, AUDIO_STOP) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ }
+
+ if (m_fd_demux >= 0)
+ {
+ eDebugNoNewLine("DEMUX_STOP - audio - ");
+ if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ }
}
void eDVBAudio::flush()
m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1)
{
char filename[128];
-#if HAVE_DVB_API_VERSION < 3
- sprintf(filename, "/dev/dvb/card%d/video%d", demux->adapter, dev);
- m_fd_video = ::open("/dev/video", O_RDWR);
- if (m_fd_video < 0)
- eWarning("/dev/video: %m");
-#else
- sprintf(filename, "/dev/dvb/adapter%d/video%d", demux->adapter, dev);
-#endif
+ sprintf(filename, "/dev/dvb/adapter%d/video%d", demux ? demux->adapter : 0, dev);
m_fd = ::open(filename, O_RDWR);
if (m_fd < 0)
eWarning("%s: %m", filename);
CONNECT(m_sn->activated, eDVBVideo::video_event);
}
eDebug("Video Device: %s", filename);
-#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
- m_fd_demux = ::open(filename, O_RDWR);
- if (m_fd_demux < 0)
- eWarning("%s: %m", filename);
- eDebug("demux device: %s", filename);
-}
-// not finally values i think.. !!
-#define VIDEO_STREAMTYPE_MPEG2 0
-#define VIDEO_STREAMTYPE_MPEG4_H264 1
-#define VIDEO_STREAMTYPE_VC1 3
-#define VIDEO_STREAMTYPE_MPEG4_Part2 4
-#define VIDEO_STREAMTYPE_VC1_SM 5
-#define VIDEO_STREAMTYPE_MPEG1 6
-#define VIDEO_STREAMTYPE_H265_HEVC 7
-#if HAVE_DVB_API_VERSION < 3
-int eDVBVideo::setPid(int pid)
-{
- if ((m_fd < 0) || (m_fd_demux < 0))
- return -1;
- dmx_pes_filter_params pes;
- pes.pid = pid;
- pes.input = DMX_IN_FRONTEND;
- pes.output = DMX_OUT_DECODER;
- pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */
- pes.flags = 0;
- eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - video - ", pid);
- if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+ if (demux)
{
- eDebug("failed (%m)");
- return -errno;
+ sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);
+ m_fd_demux = ::open(filename, O_RDWR);
+ if (m_fd_demux < 0)
+ eWarning("%s: %m", filename);
+ eDebug("demux device: %s", filename);
}
- eDebug("ok");
- return 0;
-}
-
-int eDVBVideo::startPid()
-{
- eDebugNoNewLine("DEMUX_START - video - ");
- if (::ioctl(m_fd_demux, DMX_START) < 0)
+ else
{
- eDebug("failed (%m)");
- return -errno;
+ m_fd_demux = -1;
}
- eDebug("ok");
- return 0;
-}
-int eDVBVideo::start()
-{
- eDebugNoNewLine("VIDEO_PLAY - ");
- if (::ioctl(m_fd, VIDEO_PLAY) < 0)
+ if (m_fd >= 0)
{
- eDebug("failed (%m)");
- return -errno;
+ ::ioctl(m_fd, VIDEO_SELECT_SOURCE, demux ? VIDEO_SOURCE_DEMUX : VIDEO_SOURCE_HDMI);
}
- eDebug("ok");
- return 0;
}
-int eDVBVideo::stopPid()
-{
- eDebugNoNewLine("DEMUX_STOP - video - ");
- if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- {
- eDebug("failed (%m)");
- return -errno;
- }
- eDebug("ok");
- return 0;
-}
-#else
+// not finally values i think.. !!
+#define VIDEO_STREAMTYPE_MPEG2 0
+#define VIDEO_STREAMTYPE_MPEG4_H264 1
+#define VIDEO_STREAMTYPE_VC1 3
+#define VIDEO_STREAMTYPE_MPEG4_Part2 4
+#define VIDEO_STREAMTYPE_VC1_SM 5
+#define VIDEO_STREAMTYPE_MPEG1 6
+#define VIDEO_STREAMTYPE_H265_HEVC 7
+
int eDVBVideo::startPid(int pid, int type)
{
- int streamtype = VIDEO_STREAMTYPE_MPEG2;
-
if (m_fcc_enable)
return 0;
- if ((m_fd < 0) || (m_fd_demux < 0))
- return -1;
- dmx_pes_filter_params pes;
-
- switch(type)
+ if (m_fd >= 0)
{
- default:
- case MPEG2:
- break;
- case MPEG4_H264:
- streamtype = VIDEO_STREAMTYPE_MPEG4_H264;
- break;
- case MPEG1:
- streamtype = VIDEO_STREAMTYPE_MPEG1;
- break;
- case MPEG4_Part2:
- streamtype = VIDEO_STREAMTYPE_MPEG4_Part2;
- break;
- case VC1:
- streamtype = VIDEO_STREAMTYPE_VC1;
- break;
- case VC1_SM:
- streamtype = VIDEO_STREAMTYPE_VC1_SM;
- break;
- case H265_HEVC:
- streamtype = VIDEO_STREAMTYPE_H265_HEVC;
- break;
- }
+ int streamtype = VIDEO_STREAMTYPE_MPEG2;
+ switch(type)
+ {
+ default:
+ case MPEG2:
+ break;
+ case MPEG4_H264:
+ streamtype = VIDEO_STREAMTYPE_MPEG4_H264;
+ break;
+ case MPEG1:
+ streamtype = VIDEO_STREAMTYPE_MPEG1;
+ break;
+ case MPEG4_Part2:
+ streamtype = VIDEO_STREAMTYPE_MPEG4_Part2;
+ break;
+ case VC1:
+ streamtype = VIDEO_STREAMTYPE_VC1;
+ break;
+ case VC1_SM:
+ streamtype = VIDEO_STREAMTYPE_VC1_SM;
+ break;
+ case H265_HEVC:
+ streamtype = VIDEO_STREAMTYPE_H265_HEVC;
+ break;
+ }
- eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ", streamtype);
- if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE, streamtype) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
+ eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ", streamtype);
+ if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE, streamtype) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+
+ }
- pes.pid = pid;
- pes.input = DMX_IN_FRONTEND;
- pes.output = DMX_OUT_DECODER;
- pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */
- pes.flags = 0;
- eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - video - ", pid);
- if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+ if (m_fd_demux >= 0)
{
- eDebug("failed (%m)");
- return -errno;
+ dmx_pes_filter_params pes;
+
+ pes.pid = pid;
+ pes.input = DMX_IN_FRONTEND;
+ pes.output = DMX_OUT_DECODER;
+ switch (m_dev)
+ {
+ case 0:
+ pes.pes_type = DMX_PES_VIDEO0;
+ break;
+ case 1:
+ pes.pes_type = DMX_PES_VIDEO1;
+ break;
+ case 2:
+ pes.pes_type = DMX_PES_VIDEO2;
+ break;
+ case 3:
+ pes.pes_type = DMX_PES_VIDEO3;
+ break;
+ }
+ pes.flags = 0;
+ eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - video - ", pid);
+ if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ eDebugNoNewLine("DEMUX_START - video - ");
+ if (::ioctl(m_fd_demux, DMX_START) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
}
- eDebug("ok");
- eDebugNoNewLine("DEMUX_START - video - ");
- if (::ioctl(m_fd_demux, DMX_START) < 0)
+
+ if (m_fd >= 0)
{
- eDebug("failed (%m)");
- return -errno;
+ freeze(); // why freeze here?!? this is a problem when only a pid change is requested... because of the unfreeze logic in Decoder::setState
+ eDebugNoNewLine("VIDEO_PLAY - ");
+ if (::ioctl(m_fd, VIDEO_PLAY) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
- eDebug("ok");
- freeze(); // why freeze here?!? this is a problem when only a pid change is requested... because of the unfreeze logic in Decoder::setState
- eDebugNoNewLine("VIDEO_PLAY - ");
- if (::ioctl(m_fd, VIDEO_PLAY) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
return 0;
}
-#endif
void eDVBVideo::stop()
{
if (m_fcc_enable)
return;
-#if HAVE_DVB_API_VERSION > 2
- eDebugNoNewLine("DEMUX_STOP - video - ");
- if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
-#endif
- eDebugNoNewLine("VIDEO_STOP - ");
- if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
+ if (m_fd_demux >= 0)
+ {
+ eDebugNoNewLine("DEMUX_STOP - video - ");
+ if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ }
+
+ if (m_fd >= 0)
+ {
+ eDebugNoNewLine("VIDEO_STOP - ");
+ if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ }
}
void eDVBVideo::flush()
int eDVBVideo::getPTS(pts_t &now)
{
-#if HAVE_DVB_API_VERSION < 3
- #define VIDEO_GET_PTS_OLD _IOR('o', 1, unsigned int*)
- unsigned int pts;
- int ret = ::ioctl(m_fd_video, VIDEO_GET_PTS_OLD, &pts);
- now = pts;
- now *= 2;
-#else
int ret = ::ioctl(m_fd, VIDEO_GET_PTS, &now);
-#endif
if (ret < 0)
eDebug("VIDEO_GET_PTS failed(%m)");
return ret;
::close(m_fd);
if (m_fd_demux >= 0)
::close(m_fd_demux);
-#if HAVE_DVB_API_VERSION < 3
- if (m_fd_video >= 0)
- ::close(m_fd_video);
-#endif
}
void eDVBVideo::video_event(int)
{
-#if HAVE_DVB_API_VERSION >= 3
struct video_event evt;
eDebugNoNewLine("VIDEO_GET_EVENT - ");
if (::ioctl(m_fd, VIDEO_GET_EVENT, &evt) < 0)
else
eDebug("unhandled DVBAPI Video Event %d", evt.type);
}
-#else
-#warning "FIXMEE!! Video Events not implemented for old api"
-#endif
}
RESULT eDVBVideo::connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEvent> &event, ePtr<eConnection> &conn)
static int readApiSize(int fd, int &xres, int &yres, int &aspect)
{
-#if HAVE_DVB_API_VERSION >= 3
video_size_t size;
if (!::ioctl(fd, VIDEO_GET_SIZE, &size))
{
return 0;
}
// eDebug("VIDEO_GET_SIZE failed (%m)");
-#endif
return -1;
}
static int readApiFrameRate(int fd, int &framerate)
{
-#if HAVE_DVB_API_VERSION >= 3
unsigned int frate;
if (!::ioctl(fd, VIDEO_GET_FRAME_RATE, &frate))
{
return 0;
}
// eDebug("VIDEO_GET_FRAME_RATE failed (%m)");
-#endif
return -1;
}
eDVBPCR::eDVBPCR(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
{
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
m_fd_demux = ::open(filename, O_RDWR);
if (m_fd_demux < 0)
eWarning("%s: %m", filename);
}
-#if HAVE_DVB_API_VERSION < 3
-int eDVBPCR::setPid(int pid)
+int eDVBPCR::startPid(int pid)
{
if (m_fd_demux < 0)
return -1;
pes.pid = pid;
pes.input = DMX_IN_FRONTEND;
pes.output = DMX_OUT_DECODER;
- pes.pes_type = DMX_PES_PCR;
- pes.flags = 0;
-
- eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - pcr - ", pid);
- if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
- {
- eDebug("failed (%m)");
- return -errno;
- }
- eDebug("ok");
- return 0;
-}
-
-int eDVBPCR::startPid()
-{
- if (m_fd_demux < 0)
- return -1;
- eDebugNoNewLine("DEMUX_START - pcr - ");
- if (::ioctl(m_fd_demux, DMX_START) < 0)
+ switch (m_dev)
{
- eDebug("failed (%m)");
- return -errno;
+ case 0:
+ pes.pes_type = DMX_PES_PCR0;
+ break;
+ case 1:
+ pes.pes_type = DMX_PES_PCR1;
+ break;
+ case 2:
+ pes.pes_type = DMX_PES_PCR2;
+ break;
+ case 3:
+ pes.pes_type = DMX_PES_PCR3;
+ break;
}
- eDebug("ok");
- return 0;
-}
-#else
-int eDVBPCR::startPid(int pid)
-{
- if (m_fd_demux < 0)
- return -1;
- dmx_pes_filter_params pes;
-
- pes.pid = pid;
- pes.input = DMX_IN_FRONTEND;
- pes.output = DMX_OUT_DECODER;
- pes.pes_type = m_dev ? DMX_PES_PCR1 : DMX_PES_PCR0; /* FIXME */
pes.flags = 0;
eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - pcr - ", pid);
if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
eDebug("ok");
return 0;
}
-#endif
void eDVBPCR::stop()
{
:m_demux(demux), m_dev(dev)
{
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
m_fd_demux = ::open(filename, O_RDWR);
if (m_fd_demux < 0)
eWarning("%s: %m", filename);
eDebug("decoder state: %s, vpid=%d, apid=%d", decoder_states[m_state], m_vpid, m_apid);
int changed = m_changed;
-#if HAVE_DVB_API_VERSION < 3
- bool checkAVSync = m_changed & (changeAudio|changeVideo|changePCR);
- if (m_changed & changeAudio && m_audio)
- m_audio->stopPid();
- if (m_changed & changeVideo && m_video)
- m_video->stopPid();
- if (m_changed & changePCR && m_pcr)
- {
- m_pcr->stop();
- m_pcr=0;
- if (!(m_pcrpid >= 0 && m_pcrpid < 0x1ff))
- m_changed &= ~changePCR;
- }
- if (m_changed & changeAudio && m_audio)
- {
- m_audio->stop();
- m_audio=0;
- if (!(m_apid >= 0 && m_apid < 0x1ff))
- m_changed &= ~changeAudio;
- }
- if (m_changed & changeVideo && m_video)
- {
- m_video->stop();
- m_video=0;
- m_video_event_conn=0;
- if (!(m_vpid >= 0 && m_vpid < 0x1ff))
- m_changed &= ~changeVideo;
- }
- if (m_changed & changeVideo)
- {
- m_video = new eDVBVideo(m_demux, m_decoder);
- m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
- if (m_video->setPid(m_vpid))
- res -1;
- }
- if (m_changed & changePCR)
- {
- m_pcr = new eDVBPCR(m_demux, m_decoder);
- if (m_pcr->setPid(m_pcrpid))
- res = -1;
- }
- if (m_changed & changeAudio)
- {
- m_audio = new eDVBAudio(m_demux, m_decoder);
- if (m_audio->setPid(m_apid, m_atype))
- res = -1;
- }
- if (m_changed & changePCR)
- {
- if (m_pcr->startPid())
- res = -1;
- m_changed &= ~changePCR;
- }
- else if (checkAVSync && m_audio && m_video)
- {
- if (m_audio->setAVSync(1))
- res = -1;
- }
- if (m_changed & changeVideo)
- {
- if (m_video->startPid() || m_video->start())
- res = -1;
- m_changed &= ~changeVideo;
- }
- if (m_changed & changeAudio)
- {
- if (m_audio->start() || m_audio->startPid())
- res = -1;
- m_changed &= ~changeAudio;
- }
-#else
if (m_changed & changePCR)
{
if (m_pcr)
}
m_changed &= ~changeText;
}
-#endif
if (changed & (changeState|changeVideo|changeAudio))
{
m_changed(0), m_decoder(decoder), m_video_clip_fd(-1), m_showSinglePicTimer(eTimer::create(eApp)),
m_fcc_fd(-1), m_fcc_enable(false), m_fcc_state(fcc_state_stop), m_fcc_feid(-1), m_fcc_vpid(-1), m_fcc_vtype(-1), m_fcc_pcrpid(-1)
{
- demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event_conn);
+ if (m_demux)
+ {
+ demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event_conn);
+ }
CONNECT(m_showSinglePicTimer->timeout, eTSMPEGDecoder::finishShowSinglePic);
m_state = stateStop;
}
projects / vuplus_dvbapp / blobdiff