+#include <lib/base/ebase.h>
#include <lib/base/eerror.h>
#include <lib/dvb/decoder.h>
#if HAVE_DVB_API_VERSION < 3
#define videoStreamSource_t video_stream_source_t
#define streamSource stream_source
#define dmxPesFilterParams dmx_pes_filter_params
-#define DMX_PES_VIDEO DMX_PES_VIDEO0
-#define DMX_PES_AUDIO DMX_PES_AUDIO0
+#define DMX_PES_VIDEO0 DMX_PES_VIDEO
+#define DMX_PES_AUDIO0 DMX_PES_AUDIO
+#define DMX_PES_VIDEO1 DMX_PES_VIDEO
+#define DMX_PES_AUDIO1 DMX_PES_AUDIO
#include <ost/dmx.h>
#include <ost/video.h>
#include <ost/audio.h>
DEFINE_REF(eDVBAudio);
-eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
+eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev)
+ :m_demux(demux), m_dev(dev), m_is_freezed(0)
{
char filename[128];
#if HAVE_DVB_API_VERSION < 3
- sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev);
+ 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/card%d/demux%d", demux->adapter, demux->demux);
#else
sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);
-#endif
+#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)
+ {
+ case aMPEG:
+ bypass = 1;
+ break;
+ case aAC3:
+ bypass = 0;
+ break;
+ /*
+ case aDTS:
+ bypass = 2;
+ break;
+ */
+ }
+
+ 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)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+
+ return 0;
+}
+
+int eDVBAudio::startPid()
+{
+ eDebugNoNewLine("DEMUX_START - audio - ");
+ if (::ioctl(m_fd_demux, DMX_START) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ return 0;
+}
+
+int eDVBAudio::start()
+{
+ eDebugNoNewLine("AUDIO_PLAY - ");
+ if (::ioctl(m_fd, AUDIO_PLAY) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ return 0;
+}
+
+int eDVBAudio::stopPid()
+{
+ eDebugNoNewLine("DEMUX_STOP - audio - ");
+ if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ return 0;
+}
+
+int eDVBAudio::setAVSync(int val)
+{
+ eDebugNoNewLine("AUDIO_SET_AV_SYNC - ");
+ if (::ioctl(m_fd, AUDIO_SET_AV_SYNC, val) < 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;
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)
{
- eWarning("audio: DMX_SET_PES_FILTER: %m");
+ eDebug("failed (%m)");
return -errno;
}
+ eDebug("ok");
+ eDebugNoNewLine("DEMUX_START - audio - ");
if (::ioctl(m_fd_demux, DMX_START) < 0)
{
- eWarning("audio: DMX_START: %m");
+ eDebug("failed (%m)");
return -errno;
}
-
+ eDebug("ok");
int bypass = 0;
-
+
switch (type)
{
case aMPEG:
break;
*/
}
-
+
+ eDebugNoNewLine("AUDIO_SET_BYPASS - ");
if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
- eWarning("audio: AUDIO_SET_BYPASS_MODE: %m");
-
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ freeze();
+
+ eDebugNoNewLine("AUDIO_PLAY - ");
if (::ioctl(m_fd, AUDIO_PLAY) < 0)
- eWarning("audio: AUDIO_PLAY: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
return 0;
}
-
+#endif
+
void eDVBAudio::stop()
{
+#if HAVE_DVB_API_VERSION > 2
+ flush();
+#endif
+ eDebugNoNewLine("AUDIO_STOP - ");
if (::ioctl(m_fd, AUDIO_STOP) < 0)
- eWarning("audio: AUDIO_STOP: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
#if HAVE_DVB_API_VERSION > 2
+ eDebugNoNewLine("DEMUX_STOP - audio - ");
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eWarning("audio: DMX_STOP: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
#endif
}
-
-#if HAVE_DVB_API_VERSION < 3
-void eDVBAudio::stopPid()
-{
- if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eWarning("audio: DMX_STOP: %m");
-}
-#endif
void eDVBAudio::flush()
{
+ eDebugNoNewLine("AUDIO_CLEAR_BUFFER - ");
if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)
- eDebug("audio: AUDIO_CLEAR_BUFFER: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
void eDVBAudio::freeze()
{
- if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
- eDebug("video: AUDIO_PAUSE: %m");
+ if (!m_is_freezed)
+ {
+ eDebugNoNewLine("AUDIO_PAUSE - ");
+ if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ m_is_freezed=1;
+ }
}
void eDVBAudio::unfreeze()
{
- if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
- eDebug("video: AUDIO_CONTINUE: %m");
+ if (m_is_freezed)
+ {
+ eDebugNoNewLine("AUDIO_CONTINUE - ");
+ if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ m_is_freezed=0;
+ }
}
void eDVBAudio::setChannel(int channel)
case aMonoRight: val = AUDIO_MONO_RIGHT; break;
default: break;
}
+ eDebugNoNewLine("AUDIO_CHANNEL_SELECT(%d) - ", val);
if (::ioctl(m_fd, AUDIO_CHANNEL_SELECT, val) < 0)
- eDebug("video: AUDIO_CHANNEL_SELECT: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
int eDVBAudio::getPTS(pts_t &now)
{
- return ::ioctl(m_fd, AUDIO_GET_PTS, &now);
+ eDebugNoNewLine("AUDIO_GET_PTS - ");
+ if (::ioctl(m_fd, AUDIO_GET_PTS, &now) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ return 0;
}
eDVBAudio::~eDVBAudio()
{
+ unfreeze();
if (m_fd >= 0)
::close(m_fd);
if (m_fd_demux >= 0)
DEFINE_REF(eDVBVideo);
-eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
+eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
+ :m_demux(demux), m_dev(dev), m_is_slow_motion(0), m_is_fast_forward(0), m_is_freezed(0)
{
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
m_fd = ::open(filename, O_RDWR);
if (m_fd < 0)
eWarning("%s: %m", filename);
-
+ else
+ {
+ m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Priority);
+ 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);
#define VIDEO_STREAMTYPE_MPEG2 0
#define VIDEO_STREAMTYPE_MPEG4_H264 1
+#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)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ return 0;
+}
+
+int eDVBVideo::startPid()
+{
+ eDebugNoNewLine("DEMUX_START - video - ");
+ if (::ioctl(m_fd_demux, DMX_START) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ return 0;
+}
+
+int eDVBVideo::start()
+{
+ eDebugNoNewLine("VIDEO_PLAY - ");
+ if (::ioctl(m_fd, VIDEO_PLAY) < 0)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ 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
int eDVBVideo::startPid(int pid, int type)
-{
+{
if ((m_fd < 0) || (m_fd_demux < 0))
return -1;
dmx_pes_filter_params pes;
+ eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ",type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2);
if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE,
type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2) < 0)
- eWarning("video: VIDEO_SET_STREAMTYPE: %m");
+ 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)
{
- eWarning("video: DMX_SET_PES_FILTER: %m");
+ eDebug("failed (%m)");
return -errno;
}
+ eDebug("ok");
+ eDebugNoNewLine("DEMUX_START - video - ");
if (::ioctl(m_fd_demux, DMX_START) < 0)
{
- eWarning("video: DMX_START: %m");
+ eDebug("failed (%m)");
return -errno;
}
+ eDebug("ok");
+ freeze();
+ eDebugNoNewLine("VIDEO_PLAY - ");
if (::ioctl(m_fd, VIDEO_PLAY) < 0)
- eWarning("video: VIDEO_PLAY: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
return 0;
}
-
+#endif
+
void eDVBVideo::stop()
{
#if HAVE_DVB_API_VERSION > 2
+ eDebugNoNewLine("DEMUX_STOP - video - ");
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eWarning("video: DMX_STOP: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
#endif
- eDebug("VIDEO_STOP");
+ eDebugNoNewLine("VIDEO_STOP - ");
if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
- eWarning("video: VIDEO_STOP: %m");
-}
-
-#if HAVE_DVB_API_VERSION < 3
-void eDVBVideo::stopPid()
-{
- if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eWarning("video: DMX_STOP: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
-#endif
void eDVBVideo::flush()
{
+ eDebugNoNewLine("VIDEO_CLEAR_BUFFER - ");
if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0)
- eDebug("video: VIDEO_CLEAR_BUFFER: %m");
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
-
+
void eDVBVideo::freeze()
{
- if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
- eDebug("video: VIDEO_FREEZE: %m");
+ if (!m_is_freezed)
+ {
+ eDebugNoNewLine("VIDEO_FREEZE - ");
+ if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ m_is_freezed=1;
+ }
}
-
+
void eDVBVideo::unfreeze()
{
- if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
- eDebug("video: VIDEO_CONTINUE: %m");
+ if (m_is_freezed)
+ {
+ eDebugNoNewLine("VIDEO_CONTINUE - ");
+ if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
+ m_is_freezed=0;
+ }
}
-
+
int eDVBVideo::setSlowMotion(int repeat)
{
+ eDebugNoNewLine("VIDEO_SLOWMOTION - ");
m_is_slow_motion = repeat;
- return ::ioctl(m_fd, VIDEO_SLOWMOTION, repeat);
+ int ret = ::ioctl(m_fd, VIDEO_SLOWMOTION, repeat);
+ if (ret < 0)
+ eDebug("failed(%m)");
+ else
+ eDebug("ok");
+ return ret;
}
int eDVBVideo::setFastForward(int skip)
{
+ eDebugNoNewLine("VIDEO_FAST_FORWARD - ");
m_is_fast_forward = skip;
- return ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip);
+ int ret = ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip);
+ if (ret < 0)
+ eDebug("failed(%m)");
+ else
+ eDebug("ok");
+ return ret;
}
int eDVBVideo::getPTS(pts_t &now)
{
- return ::ioctl(m_fd, VIDEO_GET_PTS, &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;
}
-
+
eDVBVideo::~eDVBVideo()
{
+ if (m_sn)
+ delete m_sn;
if (m_is_slow_motion)
setSlowMotion(0);
if (m_is_fast_forward)
setFastForward(0);
+ unfreeze();
if (m_fd >= 0)
::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)
+ eDebug("failed (%m)");
+ else
+ {
+ eDebug("ok");
+ if (evt.type == VIDEO_EVENT_SIZE_CHANGED)
+ {
+ struct iTSMPEGDecoder::videoEvent event;
+ event.type = iTSMPEGDecoder::videoEvent::eventSizeChanged;
+ event.aspect = evt.u.size.aspect_ratio;
+ event.height = evt.u.size.h;
+ event.width = evt.u.size.w;
+ /* emit */ m_event(event);
+ }
+ 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)
+{
+ conn = new eConnection(this, m_event.connect(event));
+ return 0;
}
DEFINE_REF(eDVBPCR);
eWarning("%s: %m", filename);
}
+#if HAVE_DVB_API_VERSION < 3
+int eDVBPCR::setPid(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 = 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)
+ {
+ eDebug("failed (%m)");
+ return -errno;
+ }
+ eDebug("ok");
+ return 0;
+}
+#else
int eDVBPCR::startPid(int pid)
{
if (m_fd_demux < 0)
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)
{
- eWarning("video: DMX_SET_PES_FILTER: %m");
+ eDebug("failed (%m)");
return -errno;
}
+ eDebug("ok");
+ eDebugNoNewLine("DEMUX_START - pcr - ");
if (::ioctl(m_fd_demux, DMX_START) < 0)
{
- eWarning("video: DMX_START: %m");
+ eDebug("failed (%m)");
return -errno;
}
+ eDebug("ok");
return 0;
}
+#endif
void eDVBPCR::stop()
{
+ eDebugNoNewLine("DEMUX_STOP - pcr - ");
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eWarning("video: DMX_STOP: %m");
+ eDebug("failed(%m)");
+ else
+ eDebug("ok");
}
eDVBPCR::~eDVBPCR()
pes.output = DMX_OUT_DECODER;
pes.pes_type = DMX_PES_TELETEXT;
pes.flags = 0;
+
+ eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - ttx - ", pid);
if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
{
- eWarning("video: DMX_SET_PES_FILTER: %m");
+ eDebug("failed(%m)");
return -errno;
}
+ eDebug("ok");
+ eDebugNoNewLine("DEMUX_START - pcr - ");
if (::ioctl(m_fd_demux, DMX_START) < 0)
{
- eWarning("video: DMX_START: %m");
+ eDebug("failed(%m)");
return -errno;
}
+ eDebug("ok");
return 0;
}
void eDVBTText::stop()
{
+ eDebugNoNewLine("DEMUX_STOP - ttx - ");
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
- eWarning("video: DMX_STOP: %m");
+ eDebug("failed(%m)");
+ else
+ eDebug("ok");
}
eDVBTText::~eDVBTText()
int eTSMPEGDecoder::setState()
{
int res = 0;
-
+
int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
int nott = noaudio; /* actually same conditions */
-
+
if ((noaudio && m_audio) || (!m_audio && !noaudio))
m_changed |= changeAudio;
-
+
if ((nott && m_text) || (!m_text && !nott))
m_changed |= changeText;
bool 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_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);
- if (m_pcr->startPid(m_pcrpid))
- {
- eWarning("pcr: startpid failed!");
+ 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)
{
- m_video = new eDVBVideo(m_demux, m_decoder);
- if (m_video->startPid(m_vpid))
- {
- eWarning("video: startpid failed!");
+ if (m_video->startPid() || m_video->start())
res = -1;
- }
m_changed &= ~changeVideo;
}
if (m_changed & changeAudio)
{
- m_audio = new eDVBAudio(m_demux, m_decoder);
- if (m_audio->startPid(m_apid, m_atype))
- {
- eWarning("audio: startpid failed!");
+ if (m_audio->start() || m_audio->startPid())
res = -1;
- }
m_changed &= ~changeAudio;
}
#else
{
m_pcr = new eDVBPCR(m_demux);
if (m_pcr->startPid(m_pcrpid))
- {
- eWarning("pcr: startpid failed!");
res = -1;
- }
}
m_changed &= ~changePCR;
}
eDebug("VIDEO CHANGED (to %04x)", m_vpid);
if (m_video)
{
- eDebug("STOP");
m_video->stop();
+ m_video = 0;
+ m_video_event_conn = 0;
}
- m_video = 0;
if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
{
- eDebug("new video");
m_video = new eDVBVideo(m_demux, m_decoder);
+ m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
if (m_video->startPid(m_vpid, m_vtype))
- {
- eWarning("video: startpid failed!");
res = -1;
- }
}
m_changed &= ~changeVideo;
}
{
m_audio = new eDVBAudio(m_demux, m_decoder);
if (m_audio->startPid(m_apid, m_atype))
- {
- eWarning("audio: startpid failed!");
res = -1;
- }
}
m_changed &= ~changeAudio;
}
{
m_text = new eDVBTText(m_demux);
if (m_text->startPid(m_textpid))
- {
- eWarning("text: startpid failed!");
res = -1;
- }
}
m_changed &= ~changeText;
}
fprintf(fp, "%x", delay*90);
fclose(fp);
m_pcm_delay = delay;
+ return 0;
}
}
+ return -1;
}
RESULT eTSMPEGDecoder::setAC3Delay(int delay)
fprintf(fp, "%x", delay*90);
fclose(fp);
m_ac3_delay = delay;
+ return 0;
}
}
+ return -1;
}
eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0), m_decoder(decoder)
{
- demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event);
+ demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event_conn);
m_is_ff = m_is_sm = m_is_trickmode = 0;
}
eTSMPEGDecoder::~eTSMPEGDecoder()
{
- m_vpid = m_apid = m_pcrpid = pidNone;
+ m_vpid = m_apid = m_pcrpid = m_textpid = pidNone;
m_changed = -1;
setState();
}
}
RESULT eTSMPEGDecoder::start()
+{
+ RESULT r;
+ r = setState();
+ if (r)
+ return r;
+ return unfreeze();
+}
+
+ /* preroll is start in freezed mode. */
+RESULT eTSMPEGDecoder::preroll()
{
return setState();
}
if (m_audio)
m_audio->freeze();
-
+
return 0;
}
if (m_audio)
m_audio->unfreeze();
-
+
return 0;
}
RESULT eTSMPEGDecoder::setFastForward(int frames_to_skip)
{
m_is_ff = frames_to_skip != 0;
-
+
setState();
-
+
if (m_video)
return m_video->setFastForward(frames_to_skip);
else
RESULT eTSMPEGDecoder::setSlowMotion(int repeat)
{
m_is_sm = repeat != 0;
-
+
setState();
-
+
if (m_video)
return m_video->setSlowMotion(repeat);
else
RESULT eTSMPEGDecoder::setRadioPic(const std::string &filename)
{
m_radio_pic = filename;
+ return 0;
}
RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
int vfd = open("/dev/dvb/adapter0/video0", O_RDWR);
if (vfd > 0)
{
- int length = fseek(f, 0, SEEK_END);
- unsigned char *buffer = new unsigned char[length*3+9];
+ fseek(f, 0, SEEK_END);
+ int length = ftell(f);
+ unsigned char *buffer = new unsigned char[length*2+9];
if (ioctl(vfd, VIDEO_FAST_FORWARD, 1) < 0)
eDebug("VIDEO_FAST_FORWARD failed (%m)");
if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY) < 0)
eDebug("VIDEO_SELECT_SOURCE MEMORY failed (%m)");
if (ioctl(vfd, VIDEO_PLAY) < 0)
eDebug("VIDEO_PLAY failed (%m)");
+ if (::ioctl(vfd, VIDEO_CONTINUE) < 0)
+ eDebug("video: VIDEO_CONTINUE: %m");
int cnt=0;
int pos=0;
- while(cnt<3)
+ while(cnt<2)
{
int rd;
fseek(f, 0, SEEK_SET);
+ if (!cnt)
+ {
+ buffer[pos++]=0;
+ buffer[pos++]=0;
+ buffer[pos++]=1;
+ buffer[pos++]=0xE0;
+ buffer[pos++]=(length*2)>>8;
+ buffer[pos++]=(length*2)&0xFF;
+ buffer[pos++]=0x80;
+ buffer[pos++]=0;
+ buffer[pos++]=0;
+ }
while(1)
{
- if (!cnt)
- {
- buffer[pos++]=0;
- buffer[pos++]=0;
- buffer[pos++]=1;
- buffer[pos++]=0xE0;
- buffer[pos++]=(length*3)>>8;
- buffer[pos++]=(length*3)&0xFF;
- buffer[pos++]=0x80;
- buffer[pos++]=0;
- buffer[pos++]=0;
- }
rd = fread(buffer+pos, 1, length, f);
if (rd > 0)
pos += rd;
++cnt;
}
write(vfd, buffer, pos);
- usleep(50000);
+ usleep(75000); // i dont like this.. but i dont have a better solution :(
if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX) < 0)
eDebug("VIDEO_SELECT_SOURCE DEMUX failed (%m)");
if (ioctl(vfd, VIDEO_FAST_FORWARD, 0) < 0)
}
return 0;
}
+
+RESULT eTSMPEGDecoder::connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &conn)
+{
+ conn = new eConnection(this, m_video_event.connect(event));
+ return 0;
+}
+
+void eTSMPEGDecoder::video_event(struct videoEvent event)
+{
+ /* emit */ m_video_event(event);
+}
git.cweiske.de / enigma2.git / blobdiff