X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/033a2333874297c1c388ecf4532de2bc2b11fb30..40d11af2de7aed77c90970ba2b61dd754a225117:/lib/dvb/decoder.cpp diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 26172e0c..0e6f86d3 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1,4 +1,3 @@ -#include #include #include #if HAVE_DVB_API_VERSION < 3 @@ -26,6 +25,12 @@ #include #include + /* these are quite new... */ +#ifndef AUDIO_GET_PTS +#define AUDIO_GET_PTS _IOR('o', 19, __u64) +#define VIDEO_GET_PTS _IOR('o', 57, __u64) +#endif + DEFINE_REF(eDVBAudio); eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux) @@ -125,13 +130,18 @@ void eDVBAudio::freeze() if (::ioctl(m_fd, AUDIO_PAUSE) < 0) eDebug("video: AUDIO_PAUSE: %m"); } - + void eDVBAudio::unfreeze() { if (::ioctl(m_fd, AUDIO_CONTINUE) < 0) eDebug("video: AUDIO_CONTINUE: %m"); } - + +int eDVBAudio::getPTS(pts_t &now) +{ + return ::ioctl(m_fd, AUDIO_GET_PTS, &now); +} + eDVBAudio::~eDVBAudio() { if (m_fd >= 0) @@ -191,12 +201,13 @@ int eDVBVideo::startPid(int pid) void eDVBVideo::stop() { - if (::ioctl(m_fd, VIDEO_STOP, 1) < 0) - eWarning("video: VIDEO_STOP: %m"); #if HAVE_DVB_API_VERSION > 2 if (::ioctl(m_fd_demux, DMX_STOP) < 0) eWarning("video: DMX_STOP: %m"); #endif + eDebug("VIDEO_STOP"); + if (::ioctl(m_fd, VIDEO_STOP, 1) < 0) + eWarning("video: VIDEO_STOP: %m"); } #if HAVE_DVB_API_VERSION < 3 @@ -225,8 +236,29 @@ void eDVBVideo::unfreeze() eDebug("video: VIDEO_CONTINUE: %m"); } +int eDVBVideo::setSlowMotion(int repeat) +{ + m_is_slow_motion = repeat; + return ::ioctl(m_fd, VIDEO_SLOWMOTION, repeat); +} + +int eDVBVideo::setFastForward(int skip) +{ + m_is_fast_forward = skip; + return ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip); +} + +int eDVBVideo::getPTS(pts_t &now) +{ + return ::ioctl(m_fd, VIDEO_GET_PTS, &now); +} + eDVBVideo::~eDVBVideo() { + if (m_is_slow_motion) + setSlowMotion(0); + if (m_is_fast_forward) + setFastForward(0); if (m_fd >= 0) ::close(m_fd); if (m_fd_demux >= 0) @@ -284,11 +316,72 @@ eDVBPCR::~eDVBPCR() ::close(m_fd_demux); } +DEFINE_REF(eDVBTText); + +eDVBTText::eDVBTText(eDVBDemux *demux): m_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 + m_fd_demux = ::open(filename, O_RDWR); + if (m_fd_demux < 0) + eWarning("%s: %m", filename); +} + +int eDVBTText::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 = DMX_PES_TELETEXT; + pes.flags = 0; + if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) + { + eWarning("video: DMX_SET_PES_FILTER: %m"); + return -errno; + } + if (::ioctl(m_fd_demux, DMX_START) < 0) + { + eWarning("video: DMX_START: %m"); + return -errno; + } + return 0; +} + +void eDVBTText::stop() +{ + if (::ioctl(m_fd_demux, DMX_STOP) < 0) + eWarning("video: DMX_STOP: %m"); +} + +eDVBTText::~eDVBTText() +{ + if (m_fd_demux >= 0) + ::close(m_fd_demux); +} + 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; + #if HAVE_DVB_API_VERSION < 3 if (m_changed & changeAudio && m_audio) m_audio->stopPid(); @@ -358,11 +451,16 @@ int eTSMPEGDecoder::setState() } if (m_changed & changeVideo) { + eDebug("VIDEO CHANGED (to %04x)", m_vpid); if (m_video) + { + eDebug("STOP"); m_video->stop(); + } m_video = 0; if ((m_vpid >= 0) && (m_vpid < 0x1FFF)) { + eDebug("new video"); m_video = new eDVBVideo(m_demux, 0); if (m_video->startPid(m_vpid)) { @@ -377,7 +475,7 @@ int eTSMPEGDecoder::setState() if (m_audio) m_audio->stop(); m_audio = 0; - if ((m_apid >= 0) && (m_apid < 0x1FFF)) + if ((m_apid >= 0) && (m_apid < 0x1FFF) && !noaudio) { m_audio = new eDVBAudio(m_demux, 0); if (m_audio->startPid(m_apid, m_atype)) @@ -388,6 +486,22 @@ int eTSMPEGDecoder::setState() } m_changed &= ~changeAudio; } + if (m_changed & changeText) + { + if (m_text) + m_text->stop(); + m_text = 0; + if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott) + { + m_text = new eDVBTText(m_demux); + if (m_text->startPid(m_textpid)) + { + eWarning("text: startpid failed!"); + res = -1; + } + } + m_changed &= ~changeText; + } #endif return res; } @@ -395,6 +509,7 @@ int eTSMPEGDecoder::setState() eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0) { demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event); + m_is_ff = m_is_sm = m_is_trickmode = 0; } eTSMPEGDecoder::~eTSMPEGDecoder() @@ -435,6 +550,16 @@ RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid) return 0; } +RESULT eTSMPEGDecoder::setTextPID(int textpid) +{ + if (m_textpid != textpid) + { + m_changed |= changeText; + m_textpid = textpid; + } + return 0; +} + RESULT eTSMPEGDecoder::setSyncMaster(int who) { return -1; @@ -477,9 +602,28 @@ RESULT eTSMPEGDecoder::setPictureSkipMode(int what) return -1; } +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 + return -1; +} + RESULT eTSMPEGDecoder::setSlowMotion(int repeat) { - return -1; + m_is_sm = repeat != 0; + + setState(); + + if (m_video) + return m_video->setSlowMotion(repeat); + else + return -1; } RESULT eTSMPEGDecoder::setZoom(int what) @@ -507,3 +651,34 @@ void eTSMPEGDecoder::demux_event(int event) break; } } + +RESULT eTSMPEGDecoder::setTrickmode(int what) +{ + m_is_trickmode = what; + setState(); + return 0; +} + +RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts) +{ + if (what == 0) /* auto */ + what = m_video ? 1 : 2; + + if (what == 1) /* video */ + { + if (m_video) + return m_video->getPTS(pts); + else + return -1; + } + + if (what == 2) /* audio */ + { + if (m_audio) + return m_audio->getPTS(pts); + else + return -1; + } + + return -1; +}