slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a few more obsolete parts.

Browse Source 
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-07-19 10:40:05 +10:00
committed by Qt by Nokia
parent 1403a1c7be
commit eccb43d73c
100 changed files with 50 additions and 8051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/auto/qmediaplayer/main.cpp
View File

@@ -43,38 +43,11 @@
#include "tst_qmediaplayer.h"
#ifdef Q_OS_SYMBIAN
#include "tst_qmediaplayer_xa.h"
#include "tst_qmediaplayer_s60.h"
#endif
int main(int argc, char**argv)
{
QApplication app(argc,argv);
int ret;
tst_QMediaPlayer test_api;
ret = QTest::qExec(&test_api, argc, argv);
#ifdef Q_OS_SYMBIAN
#ifdef HAS_OPENMAXAL_MEDIAPLAY_BACKEND
char *new_argv[3];
QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + "_s60.log";
QByteArray bytes = str.toAscii();
char arg1[] = "-o";
new_argv[0] = argv[0];
new_argv[1] = arg1;
new_argv[2] = bytes.data();
tst_QMediaPlayer_xa test_xa;
ret = QTest::qExec(&test_xa, 3, new_argv);
#endif
char *new_argv1[3];
QString str1 = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + "_s60.log";
QByteArray bytes1 = str1.toAscii();
char arg2[] = "-o";
new_argv1[0] = argv[0];
new_argv1[1] = arg2;
new_argv1[2] = bytes1.data();
tst_QMediaPlayer_s60 test_s60;
ret = QTest::qExec(&test_s60, 3, new_argv1);
#endif
return ret;
}

15
tests/auto/qmediaplayer/qmediaplayer.pro
View File

@@ -5,21 +5,6 @@ QT += network multimediakit-private
# TARGET = tst_qmediaplayer
# CONFIG += testcase
symbian {
TARGET.CAPABILITY = NetworkServices
testFiles.sources = testfiles/*
testFiles.path = /Data/testfiles
DEPLOYMENT += testFiles
contains(openmaxal_symbian_enabled, no) {
DEFINES += HAS_OPENMAXAL_MEDIAPLAY_BACKEND
HEADERS += tst_qmediaplayer_xa.h
SOURCES += tst_qmediaplayer_xa.cpp
} else {
HEADERS += tst_qmediaplayer_s60.h
SOURCES += tst_qmediaplayer_s60.cpp
}
}
HEADERS += tst_qmediaplayer.h
SOURCES += main.cpp tst_qmediaplayer.cpp

1708
tests/auto/qmediaplayer/tst_qmediaplayer_s60.cpp
View File

File diff suppressed because it is too large Load Diff

137
tests/auto/qmediaplayer/tst_qmediaplayer_s60.h
View File

@@ -1,137 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the Qt Mobility Components.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef TST_QMEDIAPLAYER_S60_H
#define TST_QMEDIAPLAYER_S60_H
#include <QtTest/QtTest>
#include <QtCore>
#include <QtGui>
#include <QFile>
#include <QMediaPlayer>
#include <QMediaPlayerControl>
#include <QMediaPlaylist>
#include <QMediaService>
#include <QMediaStreamsControl>
#include <QVideoWidget>
QT_USE_NAMESPACE
#define WAIT_FOR_CONDITION(a,e) \
for (int _i = 0; _i < 500; _i += 1) { \
if ((a) == (e)) break; \
QTest::qWait(10);}
#define WAIT_LONG_FOR_CONDITION(a,e) \
for (int _i = 0; _i < 1800; _i += 1) { \
if ((a) == (e)) break; \
QTest::qWait(100);}
class mediaStatusList : public QObject, public QList<QMediaPlayer::MediaStatus>
{
Q_OBJECT
public slots:
void mediaStatus(QMediaPlayer::MediaStatus status) {
append(status);
}
public:
mediaStatusList(QObject *obj, const char *aSignal)
: QObject()
{
connect(obj, aSignal, this, SLOT(mediaStatus(QMediaPlayer::MediaStatus)));
}
};
class MockProvider_s60 : public QMediaServiceProvider
{
public:
MockProvider_s60(QMediaService *service):mockService(service) {}
QMediaService *requestService(const QByteArray &, const QMediaServiceProviderHint &)
{
return mockService;
}
void releaseService(QMediaService *service) { delete service; }
QMediaService *mockService;
};
class tst_QMediaPlayer_s60: public QObject
{
Q_OBJECT
public slots:
void initTestCase_data();
void initTestCase_data_default_winscw();
void initTestCase_data_default_armv5();
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void testNullService();
void testMedia();
void testDuration();
void testPosition();
void testPositionWhilePlaying();
void testVolume();
void testVolumeWhilePlaying();
void testMuted();
void testMutedWhilePlaying();
void testVideoAndAudioAvailability();
void testError();
void testPlay();
void testPause();
void testStop();
void testMediaStatus();
void testPlaylist();
void testStreamControl();
private:
QMediaPlayer *m_player;
QVideoWidget *m_widget;
bool runonce;
};
#endif // TST_QMEDIAPLAYER_S60_H

1413
tests/auto/qmediaplayer/tst_qmediaplayer_xa.cpp
View File

File diff suppressed because it is too large Load Diff

194
tests/auto/qmediaplayer/tst_qmediaplayer_xa.h
View File

@@ -1,194 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the Qt Mobility Components.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef TST_QMEDIAPLAYER_XA_H
#define TST_QMEDIAPLAYER_XA_H
#include <QtTest/QtTest>
#include <QtCore>
#include <QtGui>
#include <QFile>
#include <QMediaPlayer>
#include <QMediaPlayerControl>
#include <QMediaService>
#include <QMediaStreamsControl>
#include <QVideoWidget>
#include <QVideoWidgetControl>
#include <QVideoWindowControl>
#include <QMetadataReaderControl>
#include <QtNetwork/qnetworkconfiguration.h>
#include <QtNetwork/qnetworkconfigmanager.h>
#include <qmedianetworkaccesscontrol.h>
QT_USE_NAMESPACE
class mediaStatusList;
/*
class mediaStatusList : public QObject, public QList<QMediaPlayer::MediaStatus>
{
Q_OBJECT
public slots:
void mediaStatus(QMediaPlayer::MediaStatus status) {
append(status);
}
public:
mediaStatusList(QObject *obj, const char *aSignal)
: QObject()
{
connect(obj, aSignal, this, SLOT(mediaStatus(QMediaPlayer::MediaStatus)));
}
};
*/
class tst_QMediaPlayer_xa: public QObject
{
Q_OBJECT
public:
tst_QMediaPlayer_xa();
~tst_QMediaPlayer_xa();
private slots:
void initTestCase_data();
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
void testMediaStatus();
void testBufferStatus();
void testPositionWhilePlaying();
void testFullScreen();
void testWindowControl_FullScreen();
void testSeekable();
void testStreamInformation();
void testAspectRatioMode();
void testMedia();
void testDuration();
void testPosition();
void testVolume();
void testVolumeWhilePlaying();
void testMuted();
void testMutedWhilePlaying();
void testVideoAndAudioAvailability();
void testPlay();
void testPause();
void testStop();
void testPlaybackRate();
void testPlaybackRateWhilePlaying();
void testWindowControl_NativeSize();
void testWindowControl_AspectRatioMode();
void testSetconfigurationsAP();
void testSetAccesspoint();
void testGetAccesspoint();
void testDiffmediacontentAP();
void testInvalidaddressAP();
void testMultipleAccesspoints();
void testReconnectAPWhilestreaming();
void teststreampausestream();
void testStressAccessPoint();
private:
void resetPlayer();
void resetPlayer_WindowControl();
void updateLog(QString str, bool delFile=false);
void setAudioOnlyContent()
{
mediaContent = audioOnlyContent;
m_player->setMedia(*mediaContent);
}
void setVideoOnlyContent()
{
mediaContent = videoOnlyContent;
duration = 60000;
m_player->setMedia(*mediaContent);
}
void setAudioVideoContent()
{
if (mediaContent == audioVideoContent) {
mediaContent = audioVideoAltContent;
duration = 101840;
} else {
mediaContent = audioVideoContent;
duration = 141000;
}
m_player->setMedia(*mediaContent);
}
void setStreamingContent3gp()
{
mediaContent = streamingContent3gp;
m_player->setMedia(*mediaContent);
}
void setAudioStreamingContent()
{
mediaContent = audioStreamingContent;
m_player->setMedia(*mediaContent);
}
QMediaContent* audioOnlyContent;
QMediaContent* videoOnlyContent;
QMediaContent* audioVideoContent;
QMediaContent* audioVideoAltContent;
QMediaContent* mediaContent;
QMediaContent* streamingContent3gp;
QMediaContent* audioStreamingContent;
//for access-point requirement
QList<QNetworkConfiguration> accesspointlist;
QList<QNetworkConfiguration> secaccesspoint;
QNetworkConfigurationManager manager;
qint64 duration;
QMediaPlayer *m_player;
QVideoWidget *m_widget;
QWidget *m_windowWidget;
};
#endif // TST_QMEDIAPLAYER_XA_H