decoder: switch off audio in trickmodes

[enigma2.git] / lib / dvb / decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index b7118558a3ae7e712f61df7908afbf2f2cefc9da..7bdb3062b97dcdd4bcfce17bc532a47300c32f08 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -49,12 +49,12 @@ eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux)
                eWarning("%s: %m", filename);
 }
        
-int eDVBAudio::startPid(int pid)
+int eDVBAudio::startPid(int pid, int type)
 {      
-       eDebug("setting audio pid to %x", 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;
@@ -70,6 +70,27 @@ int eDVBAudio::startPid(int pid)
                eWarning("audio: DMX_START: %m");
                return -errno;
        }
+       
+       int bypass = 0;
+       
+       switch (type)
+       {
+       case aMPEG:
+               bypass = 1;
+               break;
+       case aAC3:
+               bypass = 0;
+               break;
+               /*
+       case aDTS:
+               bypass = 2;
+               break;
+               */
+       }
+       
+       if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
+               eWarning("audio: AUDIO_SET_BYPASS_MODE: %m");
+       
        if (::ioctl(m_fd, AUDIO_PLAY) < 0)
                eWarning("audio: AUDIO_PLAY: %m");
        return 0;
@@ -98,6 +119,18 @@ void eDVBAudio::flush()
        if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)
                eDebug("audio: AUDIO_CLEAR_BUFFER: %m");
 }
+
+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");
+}
        
 eDVBAudio::~eDVBAudio()
 {
@@ -132,11 +165,10 @@ 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;
-       
+
        pes.pid      = pid;
        pes.input    = DMX_IN_FRONTEND;
        pes.output   = DMX_OUT_DECODER;
@@ -154,19 +186,18 @@ int eDVBVideo::startPid(int pid)
        }
        if (::ioctl(m_fd, VIDEO_PLAY) < 0)
                eWarning("video: VIDEO_PLAY: %m");
-       else
-               eDebug("video ok");
        return 0;
 }
        
 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
+       eDebug("VIDEO_STOP");
+       if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
+               eWarning("video: VIDEO_STOP: %m");
 }
 
 #if HAVE_DVB_API_VERSION < 3
@@ -183,8 +214,36 @@ void eDVBVideo::flush()
                eDebug("video: VIDEO_CLEAR_BUFFER: %m");
 }
        
+void eDVBVideo::freeze()
+{
+       if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
+               eDebug("video: VIDEO_FREEZE: %m");
+}
+       
+void eDVBVideo::unfreeze()
+{
+       if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
+               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);
+}
+       
 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)
@@ -208,7 +267,6 @@ eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux)
 
 int eDVBPCR::startPid(int pid)
 {
-       eDebug("setting pcr pid to %x", pid);
        if (m_fd_demux < 0)
                return -1;
        dmx_pes_filter_params pes;
@@ -248,7 +306,12 @@ DEFINE_REF(eTSMPEGDecoder);
 int eTSMPEGDecoder::setState()
 {
        int res = 0;
-       eDebug("changed %x", m_changed);
+       
+       int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
+       
+       if ((noaudio && m_audio) || (!m_audio && !noaudio))
+               m_changed |= changeAudio;
+       
 #if HAVE_DVB_API_VERSION < 3
        if (m_changed & changeAudio && m_audio)
                m_audio->stopPid();
@@ -274,7 +337,7 @@ int eTSMPEGDecoder::setState()
                m_pcr = new eDVBPCR(m_demux);
                if (m_pcr->startPid(m_pcrpid))
                {
-                       eWarning("video: startpid failed!");
+                       eWarning("pcr: startpid failed!");
                        res = -1;
                }
                m_changed &= ~changePCR;
@@ -292,7 +355,7 @@ int eTSMPEGDecoder::setState()
        if (m_changed & changeAudio)
        {
                m_audio = new eDVBAudio(m_demux, 0);
-               if (m_audio->startPid(m_apid))
+               if (m_audio->startPid(m_apid, m_atype))
                {
                        eWarning("audio: startpid failed!");
                        res = -1;
@@ -300,29 +363,18 @@ 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)
        {
+               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))
                        {
@@ -332,15 +384,31 @@ int eTSMPEGDecoder::setState()
                }
                m_changed &= ~changeVideo;
        }
+       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("pcr: startpid failed!");
+                               res = -1;
+                       }
+               }
+               m_changed &= ~changePCR;
+       }
        if (m_changed & changeAudio)
        {
                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))
+                       if (m_audio->startPid(m_apid, m_atype))
                        {
                                eWarning("audio: startpid failed!");
                                res = -1;
@@ -355,6 +423,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()
@@ -407,12 +476,24 @@ RESULT eTSMPEGDecoder::start()
 
 RESULT eTSMPEGDecoder::freeze(int cont)
 {
-       return -1;
+       if (m_video)
+               m_video->freeze();
+
+       if (m_audio)
+               m_audio->freeze();
+       
+       return 0;
 }
 
 RESULT eTSMPEGDecoder::unfreeze()
 {
-       return -1;
+       if (m_video)
+               m_video->unfreeze();
+
+       if (m_audio)
+               m_audio->unfreeze();
+       
+       return 0;
 }
 
 RESULT eTSMPEGDecoder::setSinglePictureMode(int when)
@@ -425,9 +506,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)
@@ -455,3 +555,10 @@ void eTSMPEGDecoder::demux_event(int event)
                break;
        }
 }
+
+RESULT eTSMPEGDecoder::setTrickmode(int what)
+{
+       m_is_trickmode = what;
+       setState();
+       return 0;
+}