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

Merge remote-tracking branch 'origin/5.5' into 5.6

Browse Source 
Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
This commit is contained in:
Yoann Lopes
2015-08-24 14:31:24 +02:00
parent 31fce88b3f 008d20e0ec
commit a2244c9b7a
56 changed files with 2426 additions and 1986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h
View File

@@ -43,6 +43,48 @@ public:
MockCameraViewfinderSettingsControl(QObject *parent = 0):
QCameraViewfinderSettingsControl2(parent)
{
QCameraViewfinderSettings s;
s.setResolution(640, 480);
s.setMinimumFrameRate(30);
s.setMaximumFrameRate(30);
s.setPixelFormat(QVideoFrame::Format_NV12);
s.setPixelAspectRatio(1, 1);
supportedSettings.append(s);
s.setResolution(1280, 720);
s.setMinimumFrameRate(10);
s.setMaximumFrameRate(10);
s.setPixelFormat(QVideoFrame::Format_NV12);
s.setPixelAspectRatio(1, 1);
supportedSettings.append(s);
s.setResolution(1920, 1080);
s.setMinimumFrameRate(5);
s.setMaximumFrameRate(10);
s.setPixelFormat(QVideoFrame::Format_BGR32);
s.setPixelAspectRatio(2, 1);
supportedSettings.append(s);
s.setResolution(1280, 720);
s.setMinimumFrameRate(10);
s.setMaximumFrameRate(10);
s.setPixelFormat(QVideoFrame::Format_YV12);
s.setPixelAspectRatio(1, 1);
supportedSettings.append(s);
s.setResolution(1280, 720);
s.setMinimumFrameRate(30);
s.setMaximumFrameRate(30);
s.setPixelFormat(QVideoFrame::Format_YV12);
s.setPixelAspectRatio(1, 1);
supportedSettings.append(s);
s.setResolution(320, 240);
s.setMinimumFrameRate(30);
s.setMaximumFrameRate(30);
s.setPixelFormat(QVideoFrame::Format_NV12);
s.setPixelAspectRatio(1, 1);
supportedSettings.append(s);
}
~MockCameraViewfinderSettingsControl() {}
@@ -59,10 +101,11 @@ public:
QList<QCameraViewfinderSettings> supportedViewfinderSettings() const
{
return QList<QCameraViewfinderSettings>();
return supportedSettings;
}
QCameraViewfinderSettings settings;
QList<QCameraViewfinderSettings> supportedSettings;
};
#endif // MOCKCAMERAVIEWFINDERSETTINGSCONTROL_H