Changeset 846 for trunk/src/3rdparty/phonon/ds9

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/ds9/backendnode.cpp (modified) (1 diff)
• src/3rdparty/phonon/ds9/iodevicereader.cpp (modified) (1 diff)
• src/3rdparty/phonon/ds9/mediagraph.cpp (modified) (6 diffs)
• src/3rdparty/phonon/ds9/mediaobject.cpp (modified) (1 diff)
• src/3rdparty/phonon/ds9/qevr9.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/phonon/ds9/qevr9.h )
• src/3rdparty/phonon/ds9/videorenderer_default.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/phonon/ds9/videorenderer_default.cpp )
• src/3rdparty/phonon/ds9/videorenderer_default.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/phonon/ds9/videorenderer_default.h )
• src/3rdparty/phonon/ds9/videorenderer_evr.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/phonon/ds9/videorenderer_evr.cpp )
• src/3rdparty/phonon/ds9/videorenderer_evr.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/phonon/ds9/videorenderer_evr.h )
• src/3rdparty/phonon/ds9/videorenderer_soft.cpp (modified) (1 diff)
• src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp (modified) (3 diffs)
• src/3rdparty/phonon/ds9/videorenderer_vmr9.h (modified) (1 diff)
• src/3rdparty/phonon/ds9/videowidget.cpp (modified) (2 diffs)

trunk/src/3rdparty/phonon/ds9/backendnode.cpp

@@ -68 +68 @@
                     HRESULT hr = info.pGraph->RemoveFilter(filter);
 
-                    if (hr == VFW_E_NOT_STOPPED && m_mediaObject) {
+                    if (FAILED(hr) && m_mediaObject) {
                         m_mediaObject->ensureStopped();
 

trunk/src/3rdparty/phonon/ds9/iodevicereader.cpp

@@ -129 +129 @@
                   while (m_buffer.size() < int(length)) {
                       needData();
-                      if (m_mediaGraph->isStopping()) {
-                          return VFW_E_WRONG_STATE;
-                      }
 
                       if (oldSize == m_buffer.size()) {

trunk/src/3rdparty/phonon/ds9/mediagraph.cpp

@@ -380 +380 @@
             filter->QueryFilterInfo(&info);
 #ifdef GRAPH_DEBUG
-            qDebug() << "removeFilter" << QString::fromUtf16(info.achName);
+            qDebug() << "removeFilter" << QString((const QChar *)info.achName);
 #endif
             if (info.pGraph) {
@@ -876 +876 @@
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName);
+                qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
@@ -922 +922 @@
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << "found a decoder filter" << QString::fromUtf16(info.achName);
+                qDebug() << "found a decoder filter" << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
@@ -938 +938 @@
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName);
+                qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
@@ -957 +957 @@
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName);
+                qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
@@ -991 +991 @@
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << "found a demuxer filter" << QString::fromUtf16(info.achName);
+                qDebug() << "found a demuxer filter" << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();

trunk/src/3rdparty/phonon/ds9/mediaobject.cpp

@@ -28 +28 @@
 #include <initguid.h>
 #include <qnetwork.h>
+#ifdef Q_CC_MSVC
+# include <comdef.h>
+#endif
 #include <evcode.h>
 

trunk/src/3rdparty/phonon/ds9/videorenderer_soft.cpp

@@ -46 +46 @@
 
 #ifndef QT_NO_OPENGL
-#include <gl/gl.h>
+#include <GL/gl.h>
 #ifndef GL_FRAGMENT_PROGRAM_ARB
 #define GL_FRAGMENT_PROGRAM_ARB           0x8804

trunk/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp

@@ -23 +23 @@
 #include <QtGui/QWidget>
 #include <QtGui/QPainter>
-#include <QtCore/QTimerEvent>
-
-#ifndef Q_OS_WINCE
+
 #include <d3d9.h>
 #include <vmr9.h>
-#else
-#include <uuids.h>
-#endif
 
 QT_BEGIN_NAMESPACE
@@ -49 +44 @@
 
 
-#ifdef Q_OS_WINCE
-        VideoRendererVMR9::VideoRendererVMR9(QWidget *target) : m_target(target)
-        {
-            m_target->setAttribute(Qt::WA_PaintOnScreen, true);
-            m_filter = Filter(CLSID_VideoRenderer, IID_IBaseFilter);
-        }
-
-        QSize VideoRendererVMR9::videoSize() const
-        {
-            LONG w = 0,
-                h = 0;
-            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-            if (basic) {
-                basic->GetVideoSize( &w, &h);
-            }
-            return QSize(w, h);
-        }
-
-        void VideoRendererVMR9::repaintCurrentFrame(QWidget * /*target*/, const QRect & /*rect*/)
-        {
-            //nothing to do here: the renderer paints everything
-        }
-
-        void VideoRendererVMR9::notifyResize(const QSize &size, Phonon::VideoWidget::AspectRatio aspectRatio,
-            Phonon::VideoWidget::ScaleMode scaleMode)
-        {
-            if (!isActive()) {
-                ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-                if (basic) {
-                    basic->SetDestinationPosition(0, 0, 0, 0);
-                }
-                return;
-            }
-
-            ComPointer<IVideoWindow> video(m_filter, IID_IVideoWindow);
-
-            OAHWND owner;
-            HRESULT hr = video->get_Owner(&owner);
-            if (FAILED(hr)) {
-                return;
-            }
-
-            const OAHWND newOwner = reinterpret_cast<OAHWND>(m_target->winId());
-            if (owner != newOwner) {
-                video->put_Owner(newOwner);
-                video->put_MessageDrain(newOwner);
-                video->put_WindowStyle(WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-            }
-
-            //make sure the widget takes the whole size of the parent
-            video->SetWindowPosition(0, 0, size.width(), size.height());
-
-            const QSize vsize = videoSize();
-            internalNotifyResize(size, vsize, aspectRatio, scaleMode);
-
-            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-            if (basic) {
-                basic->SetDestinationPosition(m_dstX, m_dstY, m_dstWidth, m_dstHeight);
-            }
-        }
-
-        void VideoRendererVMR9::applyMixerSettings(qreal /*brightness*/, qreal /*contrast*/, qreal /*m_hue*/, qreal /*saturation*/)
-        {
-            //this can't be supported for WinCE
-        }
-
-        QImage VideoRendererVMR9::snapshot() const
-        {
-            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-            if (basic) {
-                LONG bufferSize = 0;
-                //1st we get the buffer size
-                basic->GetCurrentImage(&bufferSize, 0);
-
-                QByteArray buffer;
-                buffer.resize(bufferSize);
-                HRESULT hr = basic->GetCurrentImage(&bufferSize, reinterpret_cast<long*>(buffer.data()));
-
-                if (SUCCEEDED(hr)) {
-
-                    const BITMAPINFOHEADER  *bmi = reinterpret_cast<const BITMAPINFOHEADER*>(buffer.constData());
-
-                    const int w = qAbs(bmi->biWidth),
-                        h = qAbs(bmi->biHeight);
-
-                    // Create image and copy data into image.
-                    QImage ret(w, h, QImage::Format_RGB32);
-
-                    if (!ret.isNull()) {
-                        const char *data = buffer.constData() + bmi->biSize;
-                        const int bytes_per_line = w * sizeof(QRgb);
-                        for (int y = h - 1; y >= 0; --y) {
-                            qMemCopy(ret.scanLine(y), //destination
-                                data,     //source
-                                bytes_per_line);
-                            data += bytes_per_line;
-                        }
-                    }
-                    return ret;
-                }
-            }
-            return QImage();
-        }
-
-#else
         VideoRendererVMR9::VideoRendererVMR9(QWidget *target) : m_target(target)
         {
             m_filter = Filter(CLSID_VideoMixingRenderer9, IID_IBaseFilter);
             if (!m_filter) {
-                qWarning("the video widget could not be initialized correctly");
                 return;
             }
@@ -326 +215 @@
             mixer->SetProcAmpControl(0, &ctrl);
         }
-#endif
     }
 }

trunk/src/3rdparty/phonon/ds9/videorenderer_vmr9.h

@@ -20 +20 @@
 
 #include "abstractvideorenderer.h"
-#include "compointer.h"
 
 QT_BEGIN_NAMESPACE

trunk/src/3rdparty/phonon/ds9/videowidget.cpp

@@ -25 +25 @@
 #include "mediaobject.h"
 
+#ifndef Q_OS_WINCE
+#include "videorenderer_evr.h"
 #include "videorenderer_vmr9.h"
+#else
+#include "videorenderer_default.h"
+#endif
 #include "videorenderer_soft.h"
 
@@ -353 +358 @@
             if (m_renderers[index] == 0 && autoCreate) {
                 AbstractVideoRenderer *renderer = 0;
-                                if (type == Native) {
-                    renderer = new VideoRendererVMR9(m_widget);
+                if (type == Native) {
+#ifndef Q_OS_WINCE
+                    renderer = new VideoRendererEVR(m_widget);
                     if (renderer->getFilter() == 0) {
-                        //instanciating the renderer might fail with error VFW_E_DDRAW_CAPS_NOT_SUITABLE (0x80040273)
+                        delete renderer;
+                        //EVR not present, let's try VMR
+                        renderer = new VideoRendererVMR9(m_widget);
+                        if (renderer->getFilter() == 0) {
+                            //instanciating the renderer might fail
+                            m_noNativeRendererSupported = true;
+                            delete renderer;
+                            renderer = 0;
+                        }
+                    }
+#else
+                    renderer = new VideoRendererDefault(m_widget);
+                    if (renderer->getFilter() == 0) {
+                        //instanciating the renderer might fail
                         m_noNativeRendererSupported = true;
                         delete renderer;
                         renderer = 0;
                     }
+#endif
                 }