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

Changed QCamera::captureMode property to QFlags

Browse Source 
This enables the expression of extra camera modes like
viewfinder only or capture during video recording.

Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-12 16:27:34 +10:00
committed by Qt by Nokia
parent a6268601c9
commit 53d71baed3
22 changed files with 88 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/directshow/camera/dscameracontrol.cpp
View File

@@ -71,7 +71,7 @@ void DSCameraControl::setState(QCamera::State state)
}
}
bool DSCameraControl::isCaptureModeSupported(QCamera::CaptureMode mode) const
bool DSCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const
{
bool bCaptureSupported = false;
switch (mode) {

8
src/plugins/directshow/camera/dscameracontrol.h
View File

@@ -64,8 +64,8 @@ public:
void stop();
QCamera::State state() const;
QCamera::CaptureMode captureMode() const { return m_captureMode; }
void setCaptureMode(QCamera::CaptureMode mode)
QCamera::CaptureModes captureMode() const { return m_captureMode; }
void setCaptureMode(QCamera::CaptureModes mode)
{
if (m_captureMode != mode) {
m_captureMode = mode;
@@ -76,13 +76,13 @@ public:
void setState(QCamera::State state);
QCamera::Status status() const { return QCamera::UnavailableStatus; }
bool isCaptureModeSupported(QCamera::CaptureMode mode) const;
bool isCaptureModeSupported(QCamera::CaptureModes mode) const;
bool canChangeProperty(PropertyChangeType /* changeType */, QCamera::Status /* status */) const {return false; }
private:
DSCameraSession *m_session;
DSCameraService *m_service;
QCamera::CaptureMode m_captureMode;
QCamera::CaptureModes m_captureMode;
};
QT_END_NAMESPACE

6
src/plugins/gstreamer/camerabin/camerabincontrol.cpp
View File

@@ -98,12 +98,12 @@ CameraBinControl::~CameraBinControl()
{
}
QCamera::CaptureMode CameraBinControl::captureMode() const
QCamera::CaptureModes CameraBinControl::captureMode() const
{
return m_session->captureMode();
}
void CameraBinControl::setCaptureMode(QCamera::CaptureMode mode)
void CameraBinControl::setCaptureMode(QCamera::CaptureModes mode)
{
if (m_session->captureMode() != mode) {
m_session->setCaptureMode(mode);
@@ -118,7 +118,7 @@ void CameraBinControl::setCaptureMode(QCamera::CaptureMode mode)
}
}
bool CameraBinControl::isCaptureModeSupported(QCamera::CaptureMode mode) const
bool CameraBinControl::isCaptureModeSupported(QCamera::CaptureModes mode) const
{
return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo;
}

6
src/plugins/gstreamer/camerabin/camerabincontrol.h
View File

@@ -66,10 +66,10 @@ public:
QCamera::Status status() const { return m_status; }
QCamera::CaptureMode captureMode() const;
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode() const;
void setCaptureMode(QCamera::CaptureModes mode);
bool isCaptureModeSupported(QCamera::CaptureMode mode) const;
bool isCaptureModeSupported(QCamera::CaptureModes mode) const;
bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const;
bool viewfinderColorSpaceConversion() const;

6
src/plugins/gstreamer/camerabin/camerabinsession.cpp
View File

@@ -401,7 +401,7 @@ void CameraBinSession::captureImage(int requestId, const QString &fileName)
m_imageFileName = actualFileName;
}
void CameraBinSession::setCaptureMode(QCamera::CaptureMode mode)
void CameraBinSession::setCaptureMode(QCamera::CaptureModes mode)
{
m_captureMode = mode;
@@ -427,7 +427,7 @@ bool CameraBinSession::setOutputLocation(const QUrl& sink)
return true;
}
QDir CameraBinSession::defaultDir(QCamera::CaptureMode mode) const
QDir CameraBinSession::defaultDir(QCamera::CaptureModes mode) const
{
QStringList dirCandidates;
@@ -1073,7 +1073,7 @@ static bool resolutionLessThan(const QSize &r1, const QSize &r2)
QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
bool *continuous,
QCamera::CaptureMode mode) const
QCamera::CaptureModes mode) const
{
QList<QSize> res;

10
src/plugins/gstreamer/camerabin/camerabinsession.h
View File

@@ -99,15 +99,15 @@ public:
CameraRole cameraRole() const;
QList< QPair<int,int> > supportedFrameRates(const QSize &frameSize, bool *continuous) const;
QList<QSize> supportedResolutions( QPair<int,int> rate, bool *continuous, QCamera::CaptureMode mode) const;
QList<QSize> supportedResolutions(QPair<int,int> rate, bool *continuous, QCamera::CaptureModes mode) const;
QCamera::CaptureMode captureMode() { return m_captureMode; }
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode() { return m_captureMode; }
void setCaptureMode(QCamera::CaptureModes mode);
QUrl outputLocation() const;
bool setOutputLocation(const QUrl& sink);
QDir defaultDir(QCamera::CaptureMode mode) const;
QDir defaultDir(QCamera::CaptureModes mode) const;
QString generateFileName(const QString &prefix, const QDir &dir, const QString &ext) const;
CameraBinAudioEncoder *audioEncodeControl() const { return m_audioEncodeControl; }
@@ -188,7 +188,7 @@ private:
bool m_muted;
bool m_busy;
QCamera::CaptureMode m_captureMode;
QCamera::CaptureModes m_captureMode;
QMap<QByteArray, QVariant> m_metaData;
QGstreamerElementFactory *m_audioInputFactory;

2
src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp
View File

@@ -70,7 +70,7 @@ QGstreamerCameraControl::~QGstreamerCameraControl()
{
}
void QGstreamerCameraControl::setCaptureMode(QCamera::CaptureMode mode)
void QGstreamerCameraControl::setCaptureMode(QCamera::CaptureModes mode)
{
if (m_captureMode == mode)
return;

8
src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h
View File

@@ -63,10 +63,10 @@ public:
QCamera::Status status() const { return m_status; }
QCamera::CaptureMode captureMode() const { return m_captureMode; }
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode() const { return m_captureMode; }
void setCaptureMode(QCamera::CaptureModes mode);
bool isCaptureModeSupported(QCamera::CaptureMode mode) const
bool isCaptureModeSupported(QCamera::CaptureModes mode) const
{
return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo;
}
@@ -87,7 +87,7 @@ private slots:
private:
QCamera::CaptureMode m_captureMode;
QCamera::CaptureModes m_captureMode;
QGstreamerCaptureSession *m_session;
QCamera::State m_state;
QCamera::Status m_status;

6
src/plugins/simulator/camera/simulatorcameracontrol.cpp
View File

@@ -55,12 +55,12 @@ SimulatorCameraControl::~SimulatorCameraControl()
{
}
QCamera::CaptureMode SimulatorCameraControl::captureMode() const
QCamera::CaptureModes SimulatorCameraControl::captureMode() const
{
return m_session->captureMode();
}
void SimulatorCameraControl::setCaptureMode(QCamera::CaptureMode mode)
void SimulatorCameraControl::setCaptureMode(QCamera::CaptureModes mode)
{
if (m_session->captureMode() != mode) {
m_session->setCaptureMode(mode);
@@ -168,7 +168,7 @@ bool SimulatorCameraControl::canChangeProperty(PropertyChangeType changeType, QC
}
}
bool SimulatorCameraControl::isCaptureModeSupported(QCamera::CaptureMode mode) const
bool SimulatorCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const
{
return mode == QCamera::CaptureStillImage;
}

6
src/plugins/simulator/camera/simulatorcameracontrol.h
View File

@@ -64,10 +64,10 @@ public:
QCamera::Status status() const;
QCamera::CaptureMode captureMode() const;
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode() const;
void setCaptureMode(QCamera::CaptureModes mode);
bool isCaptureModeSupported(QCamera::CaptureMode mode) const;
bool isCaptureModeSupported(QCamera::CaptureModes mode) const;
bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const;

6
src/plugins/simulator/camera/simulatorcamerasession.cpp
View File

@@ -86,12 +86,12 @@ int SimulatorCameraSession::captureImage(const QString &fileName)
return mRequestId;
}
void SimulatorCameraSession::setCaptureMode(QCamera::CaptureMode mode)
void SimulatorCameraSession::setCaptureMode(QCamera::CaptureModes mode)
{
mCaptureMode = mode;
}
QDir SimulatorCameraSession::defaultDir(QCamera::CaptureMode) const
QDir SimulatorCameraSession::defaultDir(QCamera::CaptureModes) const
{
const QString temp = QDir::tempPath();
if (QFileInfo(temp).isWritable())
@@ -126,7 +126,7 @@ void SimulatorCameraSession::setViewfinder(QObject *viewfinder)
}
}
QCamera::CaptureMode SimulatorCameraSession::captureMode()
QCamera::CaptureModes SimulatorCameraSession::captureMode()
{
return mCaptureMode;
}

8
src/plugins/simulator/camera/simulatorcamerasession.h
View File

@@ -58,10 +58,10 @@ public:
SimulatorCameraSession(QObject *parent);
~SimulatorCameraSession();
QCamera::CaptureMode captureMode();
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode();
void setCaptureMode(QCamera::CaptureModes mode);
QDir defaultDir(QCamera::CaptureMode mode) const;
QDir defaultDir(QCamera::CaptureModes mode) const;
QString generateFileName(const QString &prefix, const QDir &dir, const QString &ext) const;
void setImage(const QImage *image);
@@ -82,7 +82,7 @@ signals:
void viewfinderChanged();
private:
QCamera::CaptureMode mCaptureMode;
QCamera::CaptureModes mCaptureMode;
QObject *mViewfinder;
const QImage *mImage;