FCL/sf/mw/qtextensions: comparison qtmobility/tests/auto/qvideowidget/tst

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 #include <qmobilityglobal.h>
 #include <QtTest/QtTest>
 #include "../../../src/multimedia/qvideowidget.h"
-#include "../../../src/multimedia/qmediaobject.h"
+#include "qmediaobject.h"
-#include "../../../src/multimedia/qmediaservice.h"
+#include "qmediaservice.h"
-#include "../../../src/multimedia/qpaintervideosurface_p.h"
+#include "qpaintervideosurface_p.h"
-#include "../../../src/multimedia/qvideooutputcontrol.h"
+#include "qvideowindowcontrol.h"
-#include "../../../src/multimedia/qvideowindowcontrol.h"
+#include "qvideowidgetcontrol.h"
-#include "../../../src/multimedia/qvideowidgetcontrol.h"
+#include "qvideorenderercontrol.h"
-#include "../../../src/multimedia/qvideorenderercontrol.h"
+#include <qabstractvideosurface.h>
-#include <QtMultimedia/qabstractvideosurface.h>
+#include <qvideosurfaceformat.h>
-#include <QtMultimedia/qvideosurfaceformat.h>
 #include <QtGui/qapplication.h>
 QT_USE_NAMESPACE
 class tst_QVideoWidget : public QObject
 {
 Q_OBJECT
 private slots:
 void nullObject();
 void nullService();
-void nullOutputControl();
 void noOutputs();
 void serviceDestroyed();
 void objectDestroyed();
 void setMediaObject();
 void color_data();
 };
 Q_DECLARE_METATYPE(Qt::AspectRatioMode)
 Q_DECLARE_METATYPE(const uchar *)
-class QtTestOutputControl : public QVideoOutputControl
-{
-public:
-QtTestOutputControl() : m_output(NoOutput) {}
-QList<Output> availableOutputs() const { return m_outputs; }
-void setAvailableOutputs(const QList<Output> outputs) { m_outputs = outputs; }
-Output output() const { return m_output; }
-virtual void setOutput(Output output) { m_output = output; }
-private:
-Output m_output;
-QList<Output> m_outputs;
-};
 class QtTestWindowControl : public QVideoWindowControl
 {
 public:
 QtTestWindowControl()
 class QtTestVideoService : public QMediaService
 {
 Q_OBJECT
 public:
 QtTestVideoService(
-QtTestOutputControl *output,
 QtTestWindowControl *window,
 QtTestWidgetControl *widget,
 QtTestRendererControl *renderer)
 : QMediaService(0)
-, outputControl(output)
+, windowRef(0)
+, widgetRef(0)
+, rendererRef(0)
 , windowControl(window)
 , widgetControl(widget)
 , rendererControl(renderer)
 {
 }
 ~QtTestVideoService()
 {
-delete outputControl;
 delete windowControl;
 delete widgetControl;
 delete rendererControl;
 }
-QMediaControl *control(const char *name) const
+QMediaControl *requestControl(const char *name)
 {
-if (qstrcmp(name, QVideoOutputControl_iid) == 0)
+if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
-return outputControl;
+if (windowControl) {
-else if (qstrcmp(name, QVideoWindowControl_iid) == 0)
+windowRef += 1;
-return windowControl;
-else if (qstrcmp(name, QVideoWidgetControl_iid) == 0)
+return windowControl;
-return widgetControl;
+}
-else if (qstrcmp(name, QVideoRendererControl_iid) == 0)
+} else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
-return rendererControl;
+if (widgetControl) {
-else
+widgetRef += 1;
-return 0;
+return widgetControl;
+}
+} else if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
+if (rendererControl) {
+rendererRef += 1;
+return rendererControl;
+}
+}
+return 0;
 }
-QtTestOutputControl *outputControl;
+void releaseControl(QMediaControl *control)
+{
+Q_ASSERT(control);
+if (control == windowControl)
+windowRef -= 1;
+else if (control == widgetControl)
+widgetRef -= 1;
+else if (control == rendererControl)
+rendererRef -= 1;
+}
+int windowRef;
+int widgetRef;
+int rendererRef;
 QtTestWindowControl *windowControl;
 QtTestWidgetControl *widgetControl;
 QtTestRendererControl *rendererControl;
 };
 public:
 QtTestVideoObject(
 QtTestWindowControl *window,
 QtTestWidgetControl *widget,
 QtTestRendererControl *renderer):
-QMediaObject(0, new QtTestVideoService(new QtTestOutputControl, window, widget, renderer))
+QMediaObject(0, new QtTestVideoService(window, widget, renderer))
 {
 testService = qobject_cast<QtTestVideoService*>(service());
-QList<QVideoOutputControl::Output> outputs;
-if (window)
-outputs.append(QVideoOutputControl::WindowOutput);
-if (widget)
-outputs.append(QVideoOutputControl::WidgetOutput);
-if (renderer)
-outputs.append(QVideoOutputControl::RendererOutput);
-testService->outputControl->setAvailableOutputs(outputs);
 }
 QtTestVideoObject(QtTestVideoService *service):
 QMediaObject(0, service),
 testService(service)
 void tst_QVideoWidget::nullService()
 {
 QtTestVideoObject object(0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QVERIFY(widget.sizeHint().isEmpty());
 widget.setSaturation(100);
 QCOMPARE(widget.saturation(), 100);
 }
-void tst_QVideoWidget::nullOutputControl()
+void tst_QVideoWidget::noOutputs()
 {
-QtTestVideoObject object(new QtTestVideoService(0, 0, 0, 0));
+QtTestVideoObject object(0, 0, 0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QVERIFY(widget.sizeHint().isEmpty());
 widget.setFullScreen(true);
-QTest::qWaitForWindowShown(&widget);
 QCOMPARE(widget.isFullScreen(), true);
 widget.setBrightness(100);
 QCOMPARE(widget.brightness(), 100);
 widget.setSaturation(100);
 QCOMPARE(widget.saturation(), 100);
 }
-void tst_QVideoWidget::noOutputs()
-{
-QtTestVideoObject object(0, 0, 0);
-QVideoWidget widget;
-widget.setMediaObject(&object);
-widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
-QVERIFY(widget.sizeHint().isEmpty());
-widget.setFullScreen(true);
-QCOMPARE(widget.isFullScreen(), true);
-widget.setBrightness(100);
-QCOMPARE(widget.brightness(), 100);
-widget.setContrast(100);
-QCOMPARE(widget.contrast(), 100);
-widget.setHue(100);
-QCOMPARE(widget.hue(), 100);
-widget.setSaturation(100);
-QCOMPARE(widget.saturation(), 100);
-}
 void tst_QVideoWidget::serviceDestroyed()
 {
 QtTestVideoObject object(new QtTestWindowControl, new QtTestWidgetControl, 0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 new QtTestWindowControl,
 new QtTestWidgetControl,
 0);
 QVideoWidget widget;
-widget.setMediaObject(object);
+object->bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
+QCOMPARE(object->testService->windowRef, 0);
+QCOMPARE(object->testService->widgetRef, 1);
+QCOMPARE(object->testService->rendererRef, 0);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 widget.setBrightness(100);
 delete object;
 object = 0;
 QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(object));
-QCOMPARE(service->outputControl->output(), QVideoOutputControl::NoOutput);
 QCOMPARE(widget.brightness(), 100);
 QCOMPARE(widget.contrast(), 100);
 QCOMPARE(widget.hue(), 100);
 QCOMPARE(widget.saturation(), 100);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QCOMPARE(widget.mediaObject(), nullObject);
-QCOMPARE(windowObject.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+QCOMPARE(windowObject.testService->windowRef, 0);
-QCOMPARE(widgetObject.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+QCOMPARE(widgetObject.testService->widgetRef, 0);
-QCOMPARE(rendererObject.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+QCOMPARE(rendererObject.testService->rendererRef, 0);
-widget.setMediaObject(&windowObject);
+windowObject.bind(&widget);
 QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(&windowObject));
-QCOMPARE(windowObject.testService->outputControl->output(), QVideoOutputControl::WindowOutput);
+QCOMPARE(windowObject.testService->windowRef, 1);
+QCOMPARE(widgetObject.testService->widgetRef, 0);
+QCOMPARE(rendererObject.testService->rendererRef, 0);
 QVERIFY(windowObject.testService->windowControl->winId() != 0);
-widget.setMediaObject(&widgetObject);
+widgetObject.bind(&widget);
 QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(&widgetObject));
-QCOMPARE(widgetObject.testService->outputControl->output(), QVideoOutputControl::WidgetOutput);
+QCOMPARE(windowObject.testService->windowRef, 0);
+QCOMPARE(widgetObject.testService->widgetRef, 1);
+QCOMPARE(rendererObject.testService->rendererRef, 0);
 QCoreApplication::processEvents(QEventLoop::AllEvents);
 QCOMPARE(widgetObject.testService->widgetControl->videoWidget()->isVisible(), true);
-QCOMPARE(windowObject.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+QCOMPARE(windowObject.testService->windowRef, 0);
+QCOMPARE(widgetObject.testService->widgetRef, 1);
-widget.setMediaObject(&rendererObject);
+QCOMPARE(rendererObject.testService->rendererRef, 0);
+rendererObject.bind(&widget);
 QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(&rendererObject));
-QCOMPARE(rendererObject.testService->outputControl->output(), QVideoOutputControl::RendererOutput);
+QCOMPARE(windowObject.testService->windowRef, 0);
+QCOMPARE(widgetObject.testService->widgetRef, 0);
+QCOMPARE(rendererObject.testService->rendererRef, 1);
 QVERIFY(rendererObject.testService->rendererControl->surface() != 0);
-QCOMPARE(widgetObject.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+rendererObject.unbind(&widget);
-widget.setMediaObject(0);
 QCOMPARE(widget.mediaObject(), nullObject);
-QCOMPARE(rendererObject.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+QCOMPARE(windowObject.testService->windowRef, 0);
+QCOMPARE(widgetObject.testService->widgetRef, 0);
+QCOMPARE(rendererObject.testService->rendererRef, 0);
 }
 void tst_QVideoWidget::showWindowControl()
 {
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 object.testService->windowControl->setNativeSize(QSize(240, 180));
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+widget.show();
+QTest::qWaitForWindowShown(&widget);
-widget.show();
-QTest::qWaitForWindowShown(&widget);
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::WindowOutput);
 QVERIFY(object.testService->windowControl->winId() != 0);
 QVERIFY(object.testService->windowControl->repaintCount() > 0);
 widget.resize(640, 480);
 QCOMPARE(object.testService->windowControl->displayRect(), QRect(0, 0, 640, 480));
 widget.move(10, 10);
 QCOMPARE(object.testService->windowControl->displayRect(), QRect(0, 0, 640, 480));
 widget.hide();
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::WindowOutput);
 }
 void tst_QVideoWidget::showWidgetControl()
 {
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+widget.show();
+QTest::qWaitForWindowShown(&widget);
-widget.show();
-QTest::qWaitForWindowShown(&widget);
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::WidgetOutput);
 QCOMPARE(object.testService->widgetControl->videoWidget()->isVisible(), true);
 widget.resize(640, 480);
 widget.move(10, 10);
 widget.hide();
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::WidgetOutput);
 QCOMPARE(object.testService->widgetControl->videoWidget()->isVisible(), false);
 }
 void tst_QVideoWidget::showRendererControl()
 {
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::NoOutput);
+widget.show();
+QTest::qWaitForWindowShown(&widget);
-widget.show();
-QTest::qWaitForWindowShown(&widget);
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::RendererOutput);
 QVERIFY(object.testService->rendererControl->surface() != 0);
 widget.resize(640, 480);
 widget.move(10, 10);
 widget.hide();
-QCOMPARE(object.testService->outputControl->output(), QVideoOutputControl::RendererOutput);
 }
 void tst_QVideoWidget::aspectRatioWindowControl()
 {
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 object.testService->windowControl->setAspectRatioMode(Qt::IgnoreAspectRatio);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 // Test the aspect ratio defaults to keeping the aspect ratio.
 QCOMPARE(widget.aspectRatioMode(), Qt::KeepAspectRatio);
 {
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 object.testService->widgetControl->setAspectRatioMode(Qt::IgnoreAspectRatio);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 // Test the aspect ratio defaults to keeping the aspect ratio.
 QCOMPARE(widget.aspectRatioMode(), Qt::KeepAspectRatio);
 void tst_QVideoWidget::aspectRatioRendererControl()
 {
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 // Test the aspect ratio defaults to keeping the aspect ratio.
 QCOMPARE(widget.aspectRatioMode(), Qt::KeepAspectRatio);
 {
 QFETCH(QSize, size);
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QVERIFY(widget.sizeHint().isEmpty());
 {
 QFETCH(QSize, size);
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QVERIFY(widget.sizeHint().isEmpty());
 QFETCH(QSize, pixelAspectRatio);
 QFETCH(QSize, expectedSize);
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 void tst_QVideoWidget::fullScreenWindowControl()
 {
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 Qt::WindowFlags windowFlags = widget.windowFlags();
 void tst_QVideoWidget::fullScreenWidgetControl()
 {
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 Qt::WindowFlags windowFlags = widget.windowFlags();
 void tst_QVideoWidget::fullScreenRendererControl()
 {
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 Qt::WindowFlags windowFlags = widget.windowFlags();
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 object.testService->windowControl->setBrightness(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 // Test the video widget resets the controls starting brightness to the default.
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 object.testService->widgetControl->setBrightness(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QCOMPARE(widget.brightness(), 0);
 widget.show();
 QFETCH(int, expectedValue);
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QSignalSpy spy(&widget, SIGNAL(brightnessChanged(int)));
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 object.testService->windowControl->setContrast(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QCOMPARE(widget.contrast(), 0);
 widget.show();
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 object.testService->widgetControl->setContrast(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QCOMPARE(widget.contrast(), 0);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QFETCH(int, expectedValue);
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QSignalSpy spy(&widget, SIGNAL(contrastChanged(int)));
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 object.testService->windowControl->setHue(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QCOMPARE(widget.hue(), 0);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 object.testService->widgetControl->setHue(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QCOMPARE(widget.hue(), 0);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QFETCH(int, expectedValue);
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QSignalSpy spy(&widget, SIGNAL(hueChanged(int)));
 QtTestVideoObject object(new QtTestWindowControl, 0, 0);
 object.testService->windowControl->setSaturation(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QCOMPARE(widget.saturation(), 0);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QCOMPARE(widget.saturation(), 0);
 QtTestVideoObject object(0, new QtTestWidgetControl, 0);
 object.testService->widgetControl->setSaturation(controlValue);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 QCOMPARE(widget.saturation(), 0);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QFETCH(int, expectedValue);
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QSignalSpy spy(&widget, SIGNAL(saturationChanged(int)));
 void tst_QVideoWidget::paintRendererControl()
 {
 QtTestVideoObject object(0, 0, new QtTestRendererControl);
 QVideoWidget widget;
-widget.setMediaObject(&object);
+object.bind(&widget);
 widget.setWindowFlags(Qt::X11BypassWindowManagerHint);
+widget.resize(640,480);
 widget.show();
 QTest::qWaitForWindowShown(&widget);
 QPainterVideoSurface *surface = qobject_cast<QPainterVideoSurface *>(
 object.testService->rendererControl->surface());
 QVERIFY(surface->present(frame));
 QCOMPARE(surface->isActive(), true);
 QCOMPARE(surface->isReady(), false);
-QCoreApplication::processEvents(QEventLoop::AllEvents);
+//wait up to 2 seconds for the frame to be presented
+for (int i=0; i<200 && !surface->isReady(); i++)
+QTest::qWait(10);
 QCOMPARE(surface->isActive(), true);
 QCOMPARE(surface->isReady(), true);
 }

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411