X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b09455febeca3d10b9c55ee8720d0831a52e0d69..2e874fa14264bf37f17ae9b9375e26059e7f35ec:/lib/dvb/decoder.cpp?ds=sidebyside diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index cbc40683..362289f3 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,9 +25,15 @@ #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) +eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev) { char filename[128]; #if HAVE_DVB_API_VERSION < 3 @@ -58,7 +63,7 @@ int eDVBAudio::startPid(int pid, int type) pes.pid = pid; pes.input = DMX_IN_FRONTEND; pes.output = DMX_OUT_DECODER; - pes.pes_type = DMX_PES_AUDIO; // DMX_PES_AUDIO0 + pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */ pes.flags = 0; if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) { @@ -131,7 +136,25 @@ void eDVBAudio::unfreeze() if (::ioctl(m_fd, AUDIO_CONTINUE) < 0) eDebug("video: AUDIO_CONTINUE: %m"); } - + +void eDVBAudio::setChannel(int channel) +{ + int val = AUDIO_STEREO; + switch (channel) + { + case aMonoLeft: val = AUDIO_MONO_LEFT; break; + case aMonoRight: val = AUDIO_MONO_RIGHT; break; + default: break; + } + if (::ioctl(m_fd, AUDIO_CHANNEL_SELECT, val) < 0) + eDebug("video: AUDIO_CHANNEL_SELECT: %m"); +} + +int eDVBAudio::getPTS(pts_t &now) +{ + return ::ioctl(m_fd, AUDIO_GET_PTS, &now); +} + eDVBAudio::~eDVBAudio() { if (m_fd >= 0) @@ -142,7 +165,7 @@ eDVBAudio::~eDVBAudio() DEFINE_REF(eDVBVideo); -eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux) +eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev) { char filename[128]; #if HAVE_DVB_API_VERSION < 3 @@ -153,6 +176,8 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux) m_fd = ::open(filename, O_RDWR); if (m_fd < 0) eWarning("%s: %m", filename); + + eDebug("Video Device: %s", filename); #if HAVE_DVB_API_VERSION < 3 sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux); #else @@ -161,18 +186,27 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux) m_fd_demux = ::open(filename, O_RDWR); if (m_fd_demux < 0) eWarning("%s: %m", filename); + eDebug("demux device: %s", filename); } - -int eDVBVideo::startPid(int pid) + +// not finally values i think.. !! +#define VIDEO_STREAMTYPE_MPEG2 0 +#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; + if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE, + type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2) < 0) + eWarning("video: VIDEO_SET_STREAMTYPE: %m"); + pes.pid = pid; pes.input = DMX_IN_FRONTEND; pes.output = DMX_OUT_DECODER; - pes.pes_type = DMX_PES_VIDEO; + pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */ pes.flags = 0; if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) { @@ -237,6 +271,11 @@ 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() { @@ -360,7 +399,7 @@ int eTSMPEGDecoder::setState() 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; @@ -399,7 +438,7 @@ int eTSMPEGDecoder::setState() } if (m_changed & changeVideo) { - m_video = new eDVBVideo(m_demux, 0); + m_video = new eDVBVideo(m_demux, m_decoder); if (m_video->startPid(m_vpid)) { eWarning("video: startpid failed!"); @@ -409,7 +448,7 @@ int eTSMPEGDecoder::setState() } if (m_changed & changeAudio) { - m_audio = new eDVBAudio(m_demux, 0); + m_audio = new eDVBAudio(m_demux, m_decoder); if (m_audio->startPid(m_apid, m_atype)) { eWarning("audio: startpid failed!"); @@ -446,8 +485,8 @@ int eTSMPEGDecoder::setState() if ((m_vpid >= 0) && (m_vpid < 0x1FFF)) { eDebug("new video"); - m_video = new eDVBVideo(m_demux, 0); - if (m_video->startPid(m_vpid)) + m_video = new eDVBVideo(m_demux, m_decoder); + if (m_video->startPid(m_vpid, m_vtype)) { eWarning("video: startpid failed!"); res = -1; @@ -462,7 +501,7 @@ int eTSMPEGDecoder::setState() m_audio = 0; if ((m_apid >= 0) && (m_apid < 0x1FFF) && !noaudio) { - m_audio = new eDVBAudio(m_demux, 0); + m_audio = new eDVBAudio(m_demux, m_decoder); if (m_audio->startPid(m_apid, m_atype)) { eWarning("audio: startpid failed!"); @@ -491,7 +530,7 @@ int eTSMPEGDecoder::setState() return res; } -eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0) +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); m_is_ff = m_is_sm = m_is_trickmode = 0; @@ -504,12 +543,13 @@ eTSMPEGDecoder::~eTSMPEGDecoder() setState(); } -RESULT eTSMPEGDecoder::setVideoPID(int vpid) +RESULT eTSMPEGDecoder::setVideoPID(int vpid, int type) { if (m_vpid != vpid) { m_changed |= changeVideo; m_vpid = vpid; + m_vtype = type; } return 0; } @@ -525,6 +565,15 @@ RESULT eTSMPEGDecoder::setAudioPID(int apid, int type) return 0; } +RESULT eTSMPEGDecoder::setAudioChannel(int channel) +{ + if (m_audio) + m_audio->setChannel(channel); + else + eDebug("eTSMPEGDecoder::setAudioChannel but no audio decoder exist"); + return 0; +} + RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid) { if (m_pcrpid != pcrpid) @@ -643,3 +692,27 @@ RESULT eTSMPEGDecoder::setTrickmode(int 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; +}