X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f053f1b4c7c7b4ae8591e7a0a45b6cd215d74f7d..e8430769e8cd5079428d7614cd76abc3efbc03ef:/lib/dvb/decoder.cpp diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 6b4a7f25..b9c9533a 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1,3 +1,4 @@ +#include #include #include #if HAVE_DVB_API_VERSION < 3 @@ -9,8 +10,10 @@ #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 #include #include @@ -37,7 +40,7 @@ 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); + sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev); #else sprintf(filename, "/dev/dvb/adapter%d/audio%d", demux->adapter, dev); #endif @@ -48,14 +51,14 @@ eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev) 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); } - + int eDVBAudio::startPid(int pid, int type) -{ +{ if ((m_fd < 0) || (m_fd_demux < 0)) return -1; dmx_pes_filter_params pes; @@ -75,9 +78,9 @@ int eDVBAudio::startPid(int pid, int type) eWarning("audio: DMX_START: %m"); return -errno; } - + int bypass = 0; - + switch (type) { case aMPEG: @@ -92,15 +95,17 @@ int eDVBAudio::startPid(int pid, int type) break; */ } - + if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0) eWarning("audio: AUDIO_SET_BYPASS_MODE: %m"); - + + freeze(); + if (::ioctl(m_fd, AUDIO_PLAY) < 0) eWarning("audio: AUDIO_PLAY: %m"); return 0; } - + void eDVBAudio::stop() { if (::ioctl(m_fd, AUDIO_STOP) < 0) @@ -110,7 +115,7 @@ void eDVBAudio::stop() eWarning("audio: DMX_STOP: %m"); #endif } - + #if HAVE_DVB_API_VERSION < 3 void eDVBAudio::stopPid() { @@ -157,6 +162,7 @@ int eDVBAudio::getPTS(pts_t &now) eDVBAudio::~eDVBAudio() { + unfreeze(); if (m_fd >= 0) ::close(m_fd); if (m_fd_demux >= 0) @@ -176,7 +182,11 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev) 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); @@ -194,7 +204,7 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev) #define VIDEO_STREAMTYPE_MPEG4_H264 1 int eDVBVideo::startPid(int pid, int type) -{ +{ if ((m_fd < 0) || (m_fd_demux < 0)) return -1; dmx_pes_filter_params pes; @@ -218,11 +228,15 @@ int eDVBVideo::startPid(int pid, int type) eWarning("video: DMX_START: %m"); return -errno; } + + eDebug("FREEZE.\n"); + freeze(); + if (::ioctl(m_fd, VIDEO_PLAY) < 0) eWarning("video: VIDEO_PLAY: %m"); return 0; } - + void eDVBVideo::stop() { #if HAVE_DVB_API_VERSION > 2 @@ -247,19 +261,21 @@ void eDVBVideo::flush() if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0) eDebug("video: VIDEO_CLEAR_BUFFER: %m"); } - + void eDVBVideo::freeze() { + eDebug("VIDEO_FREEZE"); if (::ioctl(m_fd, VIDEO_FREEZE) < 0) eDebug("video: VIDEO_FREEZE: %m"); } - + void eDVBVideo::unfreeze() { + eDebug("VIDEO_CONTINUE"); if (::ioctl(m_fd, VIDEO_CONTINUE) < 0) eDebug("video: VIDEO_CONTINUE: %m"); } - + int eDVBVideo::setSlowMotion(int repeat) { m_is_slow_motion = repeat; @@ -276,19 +292,53 @@ int eDVBVideo::getPTS(pts_t &now) { return ::ioctl(m_fd, VIDEO_GET_PTS, &now); } - + 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); } +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 &event, ePtr &conn) +{ + conn = new eConnection(this, m_event.connect(event)); + return 0; +} + DEFINE_REF(eDVBPCR); eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux) @@ -396,13 +446,13 @@ DEFINE_REF(eTSMPEGDecoder); 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; @@ -426,6 +476,7 @@ int eTSMPEGDecoder::setState() { m_video->stop(); m_video=0; + m_video_event_conn=0; } if (m_changed & changePCR) { @@ -440,6 +491,7 @@ int eTSMPEGDecoder::setState() 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!"); @@ -481,12 +533,14 @@ int eTSMPEGDecoder::setState() { 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!"); @@ -547,8 +601,10 @@ RESULT eTSMPEGDecoder::setPCMDelay(int delay) fprintf(fp, "%x", delay*90); fclose(fp); m_pcm_delay = delay; + return 0; } } + return -1; } RESULT eTSMPEGDecoder::setAC3Delay(int delay) @@ -561,13 +617,15 @@ 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; } @@ -650,6 +708,16 @@ RESULT eTSMPEGDecoder::setSyncMaster(int who) } RESULT eTSMPEGDecoder::start() +{ + RESULT r; + r = setState(); + if (r) + return r; + return unfreeze(); +} + + /* preroll is start in freezed mode. */ +RESULT eTSMPEGDecoder::preroll() { return setState(); } @@ -661,7 +729,7 @@ RESULT eTSMPEGDecoder::freeze(int cont) if (m_audio) m_audio->freeze(); - + return 0; } @@ -672,7 +740,7 @@ RESULT eTSMPEGDecoder::unfreeze() if (m_audio) m_audio->unfreeze(); - + return 0; } @@ -689,9 +757,9 @@ RESULT eTSMPEGDecoder::setPictureSkipMode(int what) 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 @@ -701,9 +769,9 @@ RESULT eTSMPEGDecoder::setFastForward(int frames_to_skip) RESULT eTSMPEGDecoder::setSlowMotion(int repeat) { m_is_sm = repeat != 0; - + setState(); - + if (m_video) return m_video->setSlowMotion(repeat); else @@ -770,6 +838,7 @@ RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts) RESULT eTSMPEGDecoder::setRadioPic(const std::string &filename) { m_radio_pic = filename; + return 0; } RESULT eTSMPEGDecoder::showSinglePic(const char *filename) @@ -784,33 +853,35 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename) { fseek(f, 0, SEEK_END); int length = ftell(f); - unsigned char *buffer = new unsigned char[length*3+9]; + 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; @@ -843,3 +914,14 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename) } return 0; } + +RESULT eTSMPEGDecoder::connectVideoEvent(const Slot1 &event, ePtr &conn) +{ + conn = new eConnection(this, m_video_event.connect(event)); + return 0; +} + +void eTSMPEGDecoder::video_event(struct videoEvent event) +{ + /* emit */ m_video_event(event); +}