Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

[vuplus_dvbapp] / lib / dvb / decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 66b923a..f73dbdd 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -187,11 +187,15 @@ int eDVBAudio::startPid(int pid, int type)
        case aAC3:
                bypass = 0;
                break;
-               /*
        case aDTS:
                bypass = 2;
                break;
-               */
+       case aAAC:
+               bypass = 8;
+               break;
+       case aAACHE:
+               bypass = 9;
+               break;
        }
 
        eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
@@ -291,7 +295,9 @@ eDVBAudio::~eDVBAudio()
 DEFINE_REF(eDVBVideo);
 
 eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
-       :m_demux(demux), m_dev(dev)
+<<<<<<< HEAD:lib/dvb/decoder.cpp
+       : m_demux(demux), m_dev(dev),
+       m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1)
 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3
@@ -325,6 +331,10 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
 // not finally values i think.. !!
 #define VIDEO_STREAMTYPE_MPEG2 0
 #define VIDEO_STREAMTYPE_MPEG4_H264 1
+#define VIDEO_STREAMTYPE_VC1 3
+#define VIDEO_STREAMTYPE_MPEG4_Part2 4
+#define VIDEO_STREAMTYPE_VC1_SM 5
+#define VIDEO_STREAMTYPE_MPEG1 6
 
 #if HAVE_DVB_API_VERSION < 3
 int eDVBVideo::setPid(int pid)
@@ -386,13 +396,36 @@ int eDVBVideo::stopPid()
 #else
 int eDVBVideo::startPid(int pid, int type)
 {
+       int streamtype = VIDEO_STREAMTYPE_MPEG2;
+
        if ((m_fd < 0) || (m_fd_demux < 0))
                return -1;
        dmx_pes_filter_params pes;
 
-       eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ",type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2);
-       if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE,
-               type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2) < 0)
+       switch(type)
+       {
+       default:
+       case MPEG2:
+               break;
+       case MPEG4_H264:
+               streamtype = VIDEO_STREAMTYPE_MPEG4_H264;
+               break;
+       case MPEG1:
+               streamtype = VIDEO_STREAMTYPE_MPEG1;
+               break;
+       case MPEG4_Part2:
+               streamtype = VIDEO_STREAMTYPE_MPEG4_Part2;
+               break;
+       case VC1:
+               streamtype = VIDEO_STREAMTYPE_VC1;
+               break;
+       case VC1_SM:
+               streamtype = VIDEO_STREAMTYPE_VC1_SM;
+               break;
+       }
+
+       eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ", streamtype);
+       if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE, streamtype) < 0)
                eDebug("failed (%m)");
        else
                eDebug("ok");
@@ -533,23 +566,23 @@ void eDVBVideo::video_event(int)
                {
                        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;
+                       m_aspect = event.aspect = evt.u.size.aspect_ratio == 0 ? 2 : 3;  // convert dvb api to etsi
+                       m_height = event.height = evt.u.size.h;
+                       m_width = event.width = evt.u.size.w;
                        /* emit */ m_event(event);
                }
                else if (evt.type == VIDEO_EVENT_FRAME_RATE_CHANGED)
                {
                        struct iTSMPEGDecoder::videoEvent event;
                        event.type = iTSMPEGDecoder::videoEvent::eventFrameRateChanged;
-                       event.framerate = evt.u.frame_rate;
+                       m_framerate = event.framerate = evt.u.frame_rate;
                        /* emit */ m_event(event);
                }
                else if (evt.type == 16 /*VIDEO_EVENT_PROGRESSIVE_CHANGED*/)
                {
                        struct iTSMPEGDecoder::videoEvent event;
                        event.type = iTSMPEGDecoder::videoEvent::eventProgressiveChanged;
-                       event.progressive = evt.u.frame_rate;
+                       m_progressive = event.progressive = evt.u.frame_rate;
                        /* emit */ m_event(event);
                }
                else
@@ -566,6 +599,93 @@ RESULT eDVBVideo::connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEve
        return 0;
 }
 
+static int readMpegProc(char *str, int decoder)
+{
+       int val = -1;
+       char tmp[64];
+       sprintf(tmp, "/proc/stb/vmpeg/%d/%s", decoder, str);
+       FILE *f = fopen(tmp, "r");
+       if (f)
+       {
+               fscanf(f, "%x", &val);
+               fclose(f);
+       }
+       return val;
+}
+
+static int readApiSize(int fd, int &xres, int &yres, int &aspect)
+{
+#if HAVE_DVB_API_VERSION >= 3
+       video_size_t size;
+       if (!::ioctl(fd, VIDEO_GET_SIZE, &size))
+       {
+               xres = size.w;
+               yres = size.h;
+               aspect = size.aspect_ratio == 0 ? 2 : 3;  // convert dvb api to etsi
+               return 0;
+       }
+//     eDebug("VIDEO_GET_SIZE failed (%m)");
+#endif
+       return -1;
+}
+
+static int readApiFrameRate(int fd, int &framerate)
+{
+#if HAVE_DVB_API_VERSION >= 3
+       unsigned int frate;
+       if (!::ioctl(fd, VIDEO_GET_FRAME_RATE, &frate))
+       {
+               framerate = frate;      
+               return 0;
+       }
+//     eDebug("VIDEO_GET_FRAME_RATE failed (%m)");
+#endif
+       return -1;
+}
+
+int eDVBVideo::getWidth()
+{
+       if (m_width == -1)
+               readApiSize(m_fd, m_width, m_height, m_aspect);
+       if (m_width == -1)
+               m_width = readMpegProc("xres", m_dev);
+       return m_width;
+}
+
+int eDVBVideo::getHeight()
+{
+       if (m_height == -1)
+               readApiSize(m_fd, m_width, m_height, m_aspect);
+       if (m_height == -1)
+               m_height = readMpegProc("yres", m_dev);
+       return m_height;
+}
+
+int eDVBVideo::getAspect()
+{
+       if (m_aspect == -1)
+               readApiSize(m_fd, m_width, m_height, m_aspect);
+       if (m_aspect == -1)
+               m_aspect = readMpegProc("aspect", m_dev);
+       return m_aspect;
+}
+
+int eDVBVideo::getProgressive()
+{
+       if (m_progressive == -1)
+               m_progressive = readMpegProc("progressive", m_dev);
+       return m_progressive;
+}
+
+int eDVBVideo::getFrameRate()
+{
+       if (m_framerate == -1)
+               readApiFrameRate(m_fd, m_framerate);
+       if (m_framerate == -1)
+               m_framerate = readMpegProc("framerate", m_dev);
+       return m_framerate;
+}
+
 DEFINE_REF(eDVBPCR);
 
 eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux)
@@ -1227,3 +1347,38 @@ void eTSMPEGDecoder::video_event(struct videoEvent event)
 {
        /* emit */ m_video_event(event);
 }
+
+int eTSMPEGDecoder::getVideoWidth()
+{
+       if (m_video)
+               return m_video->getWidth();
+       return -1;
+}
+
+int eTSMPEGDecoder::getVideoHeight()
+{
+       if (m_video)
+               return m_video->getHeight();
+       return -1;
+}
+
+int eTSMPEGDecoder::getVideoProgressive()
+{
+       if (m_video)
+               return m_video->getProgressive();
+       return -1;
+}
+
+int eTSMPEGDecoder::getVideoFrameRate()
+{
+       if (m_video)
+               return m_video->getFrameRate();
+       return -1;
+}
+
+int eTSMPEGDecoder::getVideoAspect()
+{
+       if (m_video)
+               return m_video->getAspect();
+       return -1;
+}