From b6a8c713bcc0b0cc032fdbf909143f3ba8ca15a6 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Mon, 16 Jul 2012 10:55:20 +1000 Subject: Updated the camerabin2 based camera with QtMultimedia changes 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 --- .../gstreamer_encodingprofiles.pro | 12 ++++++ config.tests/gstreamer_encodingprofiles/main.cpp | 50 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro create mode 100644 config.tests/gstreamer_encodingprofiles/main.cpp (limited to 'config.tests/gstreamer_encodingprofiles') diff --git a/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro b/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro new file mode 100644 index 000000000..7e8a9e7a2 --- /dev/null +++ b/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro @@ -0,0 +1,12 @@ +SOURCES += main.cpp + +CONFIG += link_pkgconfig + +PKGCONFIG += \ + gstreamer-0.10 \ + gstreamer-base-0.10 \ + gstreamer-interfaces-0.10 \ + gstreamer-audio-0.10 \ + gstreamer-video-0.10 \ + gstreamer-pbutils-0.10 + diff --git a/config.tests/gstreamer_encodingprofiles/main.cpp b/config.tests/gstreamer_encodingprofiles/main.cpp new file mode 100644 index 000000000..8a6066dda --- /dev/null +++ b/config.tests/gstreamer_encodingprofiles/main.cpp @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the Qt Toolkit. +** +** $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$ +** +****************************************************************************/ + +#define GST_USE_UNSTABLE_API + +#include +#include + +int main(int argc, char** argv) +{ + return 0; +} -- cgit v1.2.3