X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ddc3964ed95d01e72229dc9af968a327cd84e56c..fe813cde98c0c550137b47dd7a75ec2d4d9e6f34:/lib/dvb/decoder.cpp diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index da529046..b9cfcded 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1,8 +1,25 @@ +#include #include #include +#if HAVE_DVB_API_VERSION < 3 +#define audioStatus audio_status +#define videoStatus video_status +#define pesType pes_type +#define playState play_state +#define audioStreamSource_t audio_stream_source_t +#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 +#include +#include +#include +#else #include #include #include +#endif #include #include @@ -14,11 +31,19 @@ DEFINE_REF(eDVBAudio); eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux) { char filename[128]; +#if HAVE_DVB_API_VERSION < 3 + sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev); +#else sprintf(filename, "/dev/dvb/adapter%d/audio%d", demux->adapter, dev); +#endif m_fd = ::open(filename, O_RDWR); if (m_fd < 0) eWarning("%s: %m", filename); +#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); @@ -30,23 +55,21 @@ int eDVBAudio::startPid(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 = DMX_PES_AUDIO0; + pes.pes_type = DMX_PES_AUDIO; // DMX_PES_AUDIO0 pes.flags = 0; if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) { eWarning("audio: DMX_SET_PES_FILTER: %m"); return -errno; } - if (::ioctl(m_fd_demux, DMX_START, &pes) < 0) + if (::ioctl(m_fd_demux, DMX_START) < 0) { eWarning("audio: DMX_START: %m"); return -errno; } - if (::ioctl(m_fd, AUDIO_PLAY) < 0) eWarning("audio: AUDIO_PLAY: %m"); return 0; @@ -56,9 +79,19 @@ void eDVBAudio::stop() { if (::ioctl(m_fd, AUDIO_STOP) < 0) eWarning("audio: AUDIO_STOP: %m"); +#if HAVE_DVB_API_VERSION > 2 + if (::ioctl(m_fd_demux, DMX_STOP) < 0) + eWarning("audio: DMX_STOP: %m"); +#endif +} + +#if HAVE_DVB_API_VERSION < 3 +void eDVBAudio::stopPid() +{ if (::ioctl(m_fd_demux, DMX_STOP) < 0) eWarning("audio: DMX_STOP: %m"); } +#endif eDVBAudio::~eDVBAudio() { @@ -73,11 +106,19 @@ DEFINE_REF(eDVBVideo); eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux) { char filename[128]; +#if HAVE_DVB_API_VERSION < 3 + sprintf(filename, "/dev/dvb/card%d/video%d", demux->adapter, dev); +#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); +#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); @@ -85,6 +126,7 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux) int eDVBVideo::startPid(int pid) { + eDebug("setting video pid to %x", pid); if ((m_fd < 0) || (m_fd_demux < 0)) return -1; dmx_pes_filter_params pes; @@ -92,19 +134,18 @@ int eDVBVideo::startPid(int pid) pes.pid = pid; pes.input = DMX_IN_FRONTEND; pes.output = DMX_OUT_DECODER; - pes.pes_type = DMX_PES_VIDEO0; + pes.pes_type = DMX_PES_VIDEO; 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, &pes) < 0) + if (::ioctl(m_fd_demux, DMX_START) < 0) { eWarning("video: DMX_START: %m"); return -errno; } - if (::ioctl(m_fd, VIDEO_PLAY) < 0) eWarning("video: VIDEO_PLAY: %m"); else @@ -116,10 +157,20 @@ void eDVBVideo::stop() { if (::ioctl(m_fd, VIDEO_STOP) < 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 } - + +#if HAVE_DVB_API_VERSION < 3 +void eDVBVideo::stopPid() +{ + if (::ioctl(m_fd_demux, DMX_STOP) < 0) + eWarning("video: DMX_STOP: %m"); +} +#endif + eDVBVideo::~eDVBVideo() { if (m_fd >= 0) @@ -128,17 +179,106 @@ eDVBVideo::~eDVBVideo() ::close(m_fd_demux); } +DEFINE_REF(eDVBPCR); + +eDVBPCR::eDVBPCR(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 eDVBPCR::startPid(int pid) +{ + eDebug("setting pcr pid to %x", 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; + 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 eDVBPCR::stop() +{ + if (::ioctl(m_fd_demux, DMX_STOP) < 0) + eWarning("video: DMX_STOP: %m"); +} + +eDVBPCR::~eDVBPCR() +{ + if (m_fd_demux >= 0) + ::close(m_fd_demux); +} + DEFINE_REF(eTSMPEGDecoder); int eTSMPEGDecoder::setState() { int res = 0; eDebug("changed %x", m_changed); +#if HAVE_DVB_API_VERSION < 3 + if (m_changed & changeAudio && m_audio) + m_audio->stopPid(); + if (m_changed & changeVideo && m_video) + m_video->stopPid(); + if (m_changed & changePCR && m_pcr) + { + m_pcr->stop(); + m_pcr=0; + } + if (m_changed & changeAudio && m_audio) + { + m_audio->stop(); + m_audio=0; + } + if (m_changed & changeVideo && m_video) + { + m_video->stop(); + m_video=0; + } + if (m_changed & changePCR) + { + m_pcr = new eDVBPCR(m_demux); + if (m_pcr->startPid(m_pcrpid)) + { + eWarning("video: startpid failed!"); + res = -1; + } + m_changed &= ~changePCR; + } + if (m_changed & changeVideo) + { + m_video = new eDVBVideo(m_demux, 0); + if (m_video->startPid(m_vpid)) + { + eWarning("video: startpid failed!"); + res = -1; + } + m_changed &= ~changeVideo; + } if (m_changed & changeAudio) { - if (m_audio) - m_audio->stop(); - m_audio = 0; m_audio = new eDVBAudio(m_demux, 0); if (m_audio->startPid(m_apid)) { @@ -147,6 +287,23 @@ int eTSMPEGDecoder::setState() } m_changed &= ~changeAudio; } +#else + if (m_changed & changePCR) + { + if (m_pcr) + m_pcr->stop(); + m_pcr = 0; + if ((m_pcrpid >= 0) && (m_pcrpid < 0x1FFF)) + { + m_pcr = new eDVBPCR(m_demux); + if (m_pcr->startPid(m_pcrpid)) + { + eWarning("video: startpid failed!"); + res = -1; + } + } + m_changed &= ~changePCR; + } if (m_changed & changeVideo) { if (m_video) @@ -160,10 +317,24 @@ int eTSMPEGDecoder::setState() } m_changed &= ~changeVideo; } + if (m_changed & changeAudio) + { + if (m_audio) + m_audio->stop(); + m_audio = 0; + m_audio = new eDVBAudio(m_demux, 0); + if (m_audio->startPid(m_apid)) + { + eWarning("audio: startpid failed!"); + res = -1; + } + m_changed &= ~changeAudio; + } +#endif return res; } -eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux) +eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0) { } @@ -199,10 +370,10 @@ RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid) { if (m_pcrpid != pcrpid) { - m_changed |= changeAudio; + m_changed |= changePCR; m_pcrpid = pcrpid; } - return -1; + return 0; } RESULT eTSMPEGDecoder::setSyncMaster(int who)