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

Updated the camerabin2 based camera with QtMultimedia changes

Browse Source 
Moved it to the separate plugin as the rest of gstreamer based services;
Updated with libqgsttools_p changes;
Implemented QMediaRecorder::status property;
Made gst_photography dependency optional,
it's not always available on desktop;
Added video recording case to auto integration test;
Moved backend implementation into qt namespace

Task-number: QTBUG-26046
Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-07-16 10:55:20 +10:00
committed by Qt by Nokia
parent fdc197d614
commit b6a8c713bc
47 changed files with 889 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/plugins/gstreamer/camerabin/camerabinrecorder.cpp
View File

@@ -47,12 +47,18 @@
#include <gst/pbutils/encoding-profile.h>
QT_BEGIN_NAMESPACE
CameraBinRecorder::CameraBinRecorder(CameraBinSession *session)
:QMediaRecorderControl(session),
m_session(session),
m_state(QMediaRecorder::StoppedState)
m_state(QMediaRecorder::StoppedState),
m_status(QMediaRecorder::UnloadedStatus)
{
connect(m_session, SIGNAL(stateChanged(QCamera::State)), SLOT(updateState()));
connect(m_session, SIGNAL(stateChanged(QCamera::State)), SLOT(updateStatus()));
connect(m_session, SIGNAL(pendingStateChanged(QCamera::State)), SLOT(updateStatus()));
connect(m_session, SIGNAL(busyChanged(bool)), SLOT(updateStatus()));
connect(m_session, SIGNAL(durationChanged(qint64)), SIGNAL(durationChanged(qint64)));
connect(m_session, SIGNAL(mutedChanged(bool)), this, SIGNAL(mutedChanged(bool)));
}
@@ -77,13 +83,43 @@ QMediaRecorder::State CameraBinRecorder::state() const
return m_state;
}
void CameraBinRecorder::updateState()
QMediaRecorder::Status CameraBinRecorder::status() const
{
if (m_session->state() != QCamera::ActiveState &&
m_state != QMediaRecorder::StoppedState) {
m_session->stopVideoRecording();
emit stateChanged(m_state = QMediaRecorder::StoppedState);
return m_status;
}
void CameraBinRecorder::updateStatus()
{
QCamera::State sessionState = m_session->state();
QMediaRecorder::State oldState = m_state;
QMediaRecorder::Status oldStatus = m_status;
if (sessionState == QCamera::ActiveState &&
m_session->captureMode().testFlag(QCamera::CaptureVideo)) {
if (m_state == QMediaRecorder::RecordingState) {
m_status = QMediaRecorder::RecordingStatus;
} else {
m_status = m_session->isBusy() ?
QMediaRecorder::FinalizingStatus :
QMediaRecorder::LoadedStatus;
}
} else {
if (m_state == QMediaRecorder::RecordingState) {
m_state = QMediaRecorder::StoppedState;
m_session->stopVideoRecording();
}
m_status = m_session->pendingState() == QCamera::ActiveState ?
QMediaRecorder::LoadingStatus :
QMediaRecorder::UnloadedStatus;
}
if (m_state != oldState)
emit stateChanged(m_state);
if (m_status != oldStatus)
emit statusChanged(m_status);
}
qint64 CameraBinRecorder::duration() const
@@ -91,29 +127,13 @@ qint64 CameraBinRecorder::duration() const
return m_session->duration();
}
void CameraBinRecorder::record()
{
if (m_session->state() == QCamera::ActiveState) {
m_session->recordVideo();
emit stateChanged(m_state = QMediaRecorder::RecordingState);
} else
emit error(QMediaRecorder::ResourceError, tr("Service has not been started"));
}
void CameraBinRecorder::pause()
{
emit error(QMediaRecorder::ResourceError, tr("QMediaRecorder::pause() is not supported by camerabin2."));
}
void CameraBinRecorder::stop()
{
if (m_session->state() == QCamera::ActiveState) {
m_session->stopVideoRecording();
emit stateChanged(m_state = QMediaRecorder::StoppedState);
}
}
void CameraBinRecorder::applySettings()
{
//settings are applied during camera startup
}
GstEncodingContainerProfile *CameraBinRecorder::videoProfile()
{
GstEncodingContainerProfile *containerProfile = m_session->mediaContainerControl()->createProfile();
@@ -125,7 +145,42 @@ void CameraBinRecorder::applySettings()
gst_encoding_container_profile_add_profile(containerProfile, videoProfile);
}
g_object_set (G_OBJECT(m_session->cameraBin()), "video-profile", containerProfile, NULL);
return containerProfile;
}
void CameraBinRecorder::setState(QMediaRecorder::State state)
{
if (m_state == state)
return;
QMediaRecorder::State oldState = m_state;
QMediaRecorder::Status oldStatus = m_status;
switch (state) {
case QMediaRecorder::StoppedState:
m_state = state;
m_status = QMediaRecorder::FinalizingStatus;
m_session->stopVideoRecording();
break;
case QMediaRecorder::PausedState:
emit error(QMediaRecorder::ResourceError, tr("QMediaRecorder::pause() is not supported by camerabin2."));
break;
case QMediaRecorder::RecordingState:
if (m_session->state() == QCamera::ActiveState) {
m_session->recordVideo();
m_state = state;
m_status = QMediaRecorder::RecordingStatus;
emit actualLocationChanged(m_session->outputLocation());
} else {
emit error(QMediaRecorder::ResourceError, tr("Service has not been started"));
}
}
if (m_state != oldState)
emit stateChanged(m_state);
if (m_status != oldStatus)
emit statusChanged(m_status);
}
bool CameraBinRecorder::isMuted() const
@@ -137,3 +192,5 @@ void CameraBinRecorder::setMuted(bool muted)
{
m_session->setMuted(muted);
}
QT_END_NAMESPACE