+#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>
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);
eDVBVideo::~eDVBVideo()
{
+ if (m_sn)
+ delete m_sn;
if (m_is_slow_motion)
setSlowMotion(0);
if (m_is_fast_forward)
::close(m_fd_demux);
}
+void eDVBVideo::video_event(int)
+{
+#if HAVE_DVB_API_VERSION >= 3
+ struct video_event evt;
+ if (::ioctl(m_fd, VIDEO_GET_EVENT, &evt) < 0)
+ eDebug("VIDEO_GET_EVENT failed(%m)");
+ else
+ {
+ 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);
eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux)
{
m_video->stop();
m_video=0;
+ m_video_event_conn=0;
}
if (m_changed & changePCR)
{
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->startPid(m_vpid))
{
eWarning("video: startpid failed!");
{
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!");
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;
}
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);
+ fseek(f, 0, SEEK_END);
+ int length = ftell(f);
unsigned char *buffer = new unsigned char[length*3+9];
if (ioctl(vfd, VIDEO_FAST_FORWARD, 1) < 0)
eDebug("VIDEO_FAST_FORWARD failed (%m)");
++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);
+}
+