Merge pull request #8 from jcwenger/feature/deconflict-omx
Fold in gstreamer support -- fix conflicts with cmake module updates.
This commit is contained in:
Jason Wenger
GitHub
commit
f18bce9e12
@ -14,6 +14,7 @@ set(base_directory ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
set(resources_directory ${base_directory}/assets)
|
||||
set(sources_directory ${base_directory}/src)
|
||||
set(include_directory ${base_directory}/include)
|
||||
include(${base_directory}/cmake_modules/functions.cmake)
|
||||
|
||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${base_directory}/lib)
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${base_directory}/lib)
|
||||
@ -40,27 +41,57 @@ add_definitions(-DBOOST_ALL_DYN_LINK)
|
||||
|
||||
find_package(Boost REQUIRED COMPONENTS system log OPTIONAL_COMPONENTS unit_test_framework)
|
||||
find_package(libusb-1.0 REQUIRED)
|
||||
find_package(Qt5 COMPONENTS Multimedia MultimediaWidgets Bluetooth)
|
||||
find_package(Qt5 COMPONENTS Multimedia MultimediaWidgets Bluetooth Qml Quick QuickWidgets REQUIRED)
|
||||
find_package(Protobuf REQUIRED)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
find_package(rtaudio REQUIRED)
|
||||
find_package(aasdk REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(libomx)
|
||||
find_package(GObject)
|
||||
|
||||
if(WIN32)
|
||||
set(WINSOCK2_LIBRARIES "ws2_32")
|
||||
endif(WIN32)
|
||||
|
||||
if(RPI_BUILD AND NOT GST_BUILD)
|
||||
add_definitions(-DUSE_OMX -DOMX_SKIP64BIT)
|
||||
set(BCM_HOST_LIBRARIES "/opt/vc/lib/libbcm_host.so")
|
||||
set(BCM_HOST_INCLUDE_DIRS "/opt/vc/include")
|
||||
set(ILCLIENT_INCLUDE_DIRS "/opt/vc/src/hello_pi/libs/ilclient")
|
||||
set(ILCLIENT_LIBRARIES "/opt/vc/src/hello_pi/libs/ilclient/libilclient.a;/opt/vc/lib/libvcos.so;/opt/vc/lib/libvcilcs.a;/opt/vc/lib/libvchiq_arm.so")
|
||||
endif(RPI_BUILD AND NOT GST_BUILD)
|
||||
if(GST_BUILD)
|
||||
find_package(Qt5GStreamer)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(GST REQUIRED
|
||||
gstreamer-1.0>=1.4
|
||||
gstreamer-sdp-1.0>=1.4
|
||||
gstreamer-video-1.0>=1.4
|
||||
gstreamer-app-1.0>=1.4)
|
||||
add_definitions(-DUSE_GST)
|
||||
if(RPI_BUILD)
|
||||
add_definitions(-DRPI)
|
||||
findRpiRevision( RPI_REVISION )
|
||||
if(RPI_REVISION MATCHES "a03111" OR RPI_REVISION MATCHES "b03111" OR RPI_REVISION MATCHES "a03111")
|
||||
message("Raspberry Pi 4 Found")
|
||||
add_definitions(-DPI4)
|
||||
endif(RPI_REVISION MATCHES "a03111" OR RPI_REVISION MATCHES "b03111" OR RPI_REVISION MATCHES "a03111")
|
||||
endif(RPI_BUILD)
|
||||
endif(GST_BUILD)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}
|
||||
${Qt5Multimedia_INCLUDE_DIRS}
|
||||
${Qt5MultimediaWidgets_INCLUDE_DIRS}
|
||||
${Qt5Widgets_INCLUDE_DIRS}
|
||||
${Qt5Bluetooth_INCLUDE_DIRS}
|
||||
${QTGSTREAMER_INCLUDE_DIR}
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${PROTOBUF_INCLUDE_DIR}
|
||||
${OPENSSL_INCLUDE_DIR}
|
||||
${RTAUDIO_INCLUDE_DIRS}
|
||||
${BCM_HOST_INCLUDE_DIRS}
|
||||
${ILCLIENT_INCLUDE_DIRS}
|
||||
${GST_INCLUDE_DIRS}
|
||||
${include_directory})
|
||||
|
||||
link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
|
||||
@ -73,21 +104,31 @@ file(GLOB_RECURSE autoapp_source_files ${autoapp_sources_directory}/*.ui ${autoa
|
||||
|
||||
add_executable(autoapp ${autoapp_source_files})
|
||||
|
||||
message(STATUS "${GST_LIBRARIES}")
|
||||
target_link_libraries(autoapp aasdk libusb
|
||||
${GST_LIBRARIES}
|
||||
${Boost_LIBRARIES}
|
||||
${Qt5Multimedia_LIBRARIES}
|
||||
${Qt5MultimediaWidgets_LIBRARIES}
|
||||
${Qt5QuickWidgets_LIBRARIES}
|
||||
${Qt5Bluetooth_LIBRARIES}
|
||||
${PROTOBUF_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
${BCM_HOST_LIBRARIES}
|
||||
${ILCLIENT_LIBRARIES}
|
||||
${WINSOCK2_LIBRARIES}
|
||||
${RTAUDIO_LIBRARIES}
|
||||
${QTGLIB_LIBRARY}
|
||||
${QTGLIB_LIBRARIES}
|
||||
${QTGSTREAMER_LIBRARY}
|
||||
${QTGSTREAMER_LIBRARIES}
|
||||
${QTGSTREAMER_UI_LIBRARY}
|
||||
${QTGSTREAMER_UI_LIBRARIES}
|
||||
${QTGSTREAMER_QUICK_LIBRARIES}
|
||||
${QTGSTREAMER_QUICK_LIBRARY}
|
||||
${GOBJECT_LIBRARIES}
|
||||
)
|
||||
|
||||
if(libomx_FOUND)
|
||||
target_link_libraries(autoapp omx)
|
||||
endif()
|
||||
|
||||
set(btservice_sources_directory ${sources_directory}/btservice)
|
||||
set(btservice_include_directory ${include_directory}/f1x/openauto/btservice)
|
||||
file(GLOB_RECURSE btservice_source_files ${btservice_sources_directory}/*.cpp ${btservice_include_directory}/*.hpp ${common_include_directory}/*.hpp)
|
||||
|
||||
9
assets/aa_video.qml
Normal file
9
assets/aa_video.qml
Normal file
@ -0,0 +1,9 @@
|
||||
import QtQuick 2.0
|
||||
import QtGStreamer 1.0
|
||||
|
||||
VideoItem {
|
||||
id: aaVideo
|
||||
width: 300
|
||||
height: 300
|
||||
surface: videoSurface
|
||||
}
|
||||
@ -4,5 +4,6 @@
|
||||
<file>ico_warning.png</file>
|
||||
<file>ico_setting.png</file>
|
||||
<file>ico_info.png</file>
|
||||
<file>aa_video.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
80
cmake_modules/FindGObject.cmake
Normal file
80
cmake_modules/FindGObject.cmake
Normal file
@ -0,0 +1,80 @@
|
||||
# - Try to find GObject
|
||||
# Once done this will define
|
||||
#
|
||||
# GOBJECT_FOUND - system has GObject
|
||||
# GOBJECT_INCLUDE_DIR - the GObject include directory
|
||||
# GOBJECT_LIBRARIES - the libraries needed to use GObject
|
||||
# GOBJECT_DEFINITIONS - Compiler switches required for using GObject
|
||||
|
||||
# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
|
||||
IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
|
||||
# in cache already
|
||||
SET(GObject_FIND_QUIETLY TRUE)
|
||||
ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
|
||||
SET(GObject_FIND_QUIETLY FALSE)
|
||||
ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
|
||||
|
||||
IF (NOT WIN32)
|
||||
# use pkg-config to get the directories and then use these values
|
||||
# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
FIND_PACKAGE(PkgConfig)
|
||||
PKG_CHECK_MODULES(PC_GOBJECT gobject-2.0)
|
||||
#MESSAGE(STATUS "DEBUG: GObject include directory = ${GOBJECT_INCLUDE_DIRS}")
|
||||
#MESSAGE(STATUS "DEBUG: GObject link directory = ${GOBJECT_LIBRARY_DIRS}")
|
||||
#MESSAGE(STATUS "DEBUG: GObject CFlags = ${GOBJECT_CFLAGS}")
|
||||
SET(GOBJECT_DEFINITIONS ${PC_GOBJECT_CFLAGS_OTHER})
|
||||
ENDIF (NOT WIN32)
|
||||
|
||||
FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h
|
||||
PATHS
|
||||
${PC_GOBJECT_INCLUDEDIR}
|
||||
${PC_GOBJECT_INCLUDE_DIRS}
|
||||
PATH_SUFFIXES glib-2.0/gobject/
|
||||
)
|
||||
|
||||
FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
|
||||
PATHS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
|
||||
PATHS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
|
||||
PATHS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
FIND_LIBRARY(_GLibs NAMES glib-2.0
|
||||
PATHS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
SET( GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs} )
|
||||
|
||||
IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
|
||||
SET(GOBJECT_FOUND TRUE)
|
||||
ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
|
||||
SET(GOBJECT_FOUND FALSE)
|
||||
ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
|
||||
|
||||
IF (GOBJECT_FOUND)
|
||||
IF (NOT GObject_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found GObject libraries: ${GOBJECT_LIBRARIES}")
|
||||
MESSAGE(STATUS "Found GObject includes : ${GOBJECT_INCLUDE_DIR}")
|
||||
ENDIF (NOT GObject_FIND_QUIETLY)
|
||||
ELSE (GOBJECT_FOUND)
|
||||
IF (GObject_FIND_REQUIRED)
|
||||
MESSAGE(STATUS "Could NOT find GObject")
|
||||
ENDIF(GObject_FIND_REQUIRED)
|
||||
ENDIF (GOBJECT_FOUND)
|
||||
|
||||
MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR _GObjectLibs _GModuleLibs _GThreadLibs _GLibs)
|
||||
135
cmake_modules/FindGStreamer.cmake
Normal file
135
cmake_modules/FindGStreamer.cmake
Normal file
@ -0,0 +1,135 @@
|
||||
# - Try to find GStreamer and its plugins
|
||||
# Once done, this will define
|
||||
#
|
||||
# GSTREAMER_FOUND - system has GStreamer
|
||||
# GSTREAMER_INCLUDE_DIRS - the GStreamer include directories
|
||||
# GSTREAMER_LIBRARIES - link these to use GStreamer
|
||||
#
|
||||
# Additionally, gstreamer-base is always looked for and required, and
|
||||
# the following related variables are defined:
|
||||
#
|
||||
# GSTREAMER_BASE_INCLUDE_DIRS - gstreamer-base's include directory
|
||||
# GSTREAMER_BASE_LIBRARIES - link to these to use gstreamer-base
|
||||
#
|
||||
# Optionally, the COMPONENTS keyword can be passed to find_package()
|
||||
# and GStreamer plugins can be looked for. Currently, the following
|
||||
# plugins can be searched, and they define the following variables if
|
||||
# found:
|
||||
#
|
||||
# gstreamer-app: GSTREAMER_APP_INCLUDE_DIRS and GSTREAMER_APP_LIBRARIES
|
||||
# gstreamer-audio: GSTREAMER_AUDIO_INCLUDE_DIRS and GSTREAMER_AUDIO_LIBRARIES
|
||||
# gstreamer-fft: GSTREAMER_FFT_INCLUDE_DIRS and GSTREAMER_FFT_LIBRARIES
|
||||
# gstreamer-gl: GSTREAMER_GL_INCLUDE_DIRS and GSTREAMER_GL_LIBRARIES
|
||||
# gstreamer-mpegts: GSTREAMER_MPEGTS_INCLUDE_DIRS and GSTREAMER_MPEGTS_LIBRARIES
|
||||
# gstreamer-pbutils: GSTREAMER_PBUTILS_INCLUDE_DIRS and GSTREAMER_PBUTILS_LIBRARIES
|
||||
# gstreamer-tag: GSTREAMER_TAG_INCLUDE_DIRS and GSTREAMER_TAG_LIBRARIES
|
||||
# gstreamer-video: GSTREAMER_VIDEO_INCLUDE_DIRS and GSTREAMER_VIDEO_LIBRARIES
|
||||
# gstreamer-codecparser:GSTREAMER_CODECPARSERS_INCLUDE_DIRS and GSTREAMER_CODECPARSERS_LIBRARIES
|
||||
#
|
||||
# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
|
||||
# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
|
||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
|
||||
# Helper macro to find a GStreamer plugin (or GStreamer itself)
|
||||
# _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_AUDIO")
|
||||
# _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0").
|
||||
# _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
|
||||
macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
|
||||
|
||||
string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
|
||||
if ("${CMAKE_MATCH_2}" STREQUAL "")
|
||||
pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
|
||||
else ()
|
||||
pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
|
||||
endif ()
|
||||
set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
|
||||
|
||||
find_library(${_component_prefix}_LIBRARIES
|
||||
NAMES ${_library}
|
||||
HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
|
||||
)
|
||||
endmacro()
|
||||
|
||||
# ------------------------
|
||||
# 1. Find GStreamer itself
|
||||
# ------------------------
|
||||
|
||||
# 1.1. Find headers and libraries
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer-1.0 gstreamer-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gstbase-1.0)
|
||||
|
||||
# -------------------------
|
||||
# 2. Find GStreamer plugins
|
||||
# -------------------------
|
||||
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app-1.0 gstapp-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft-1.0 gstfft-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_GL gstreamer-gl-1.0 gstgl-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_MPEGTS gstreamer-mpegts-1.0>=1.4.0 gstmpegts-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_TAG gstreamer-tag-1.0 gsttag-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_VIDEO gstreamer-video-1.0 gstvideo-1.0)
|
||||
FIND_GSTREAMER_COMPONENT(GSTREAMER_CODECPARSERS gstreamer-codecparsers-1.0 gstcodecparsers-1.0)
|
||||
|
||||
# ------------------------------------------------
|
||||
# 3. Process the COMPONENTS passed to FIND_PACKAGE
|
||||
# ------------------------------------------------
|
||||
set(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_VERSION GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)
|
||||
|
||||
foreach (_component ${GStreamer_FIND_COMPONENTS})
|
||||
set(_gst_component "GSTREAMER_${_component}")
|
||||
string(TOUPPER ${_gst_component} _UPPER_NAME)
|
||||
|
||||
list(APPEND _GSTREAMER_REQUIRED_VARS ${_UPPER_NAME}_INCLUDE_DIRS ${_UPPER_NAME}_LIBRARIES)
|
||||
endforeach ()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS _GSTREAMER_REQUIRED_VARS
|
||||
VERSION_VAR GSTREAMER_VERSION)
|
||||
|
||||
mark_as_advanced(
|
||||
GSTREAMER_APP_INCLUDE_DIRS
|
||||
GSTREAMER_APP_LIBRARIES
|
||||
GSTREAMER_AUDIO_INCLUDE_DIRS
|
||||
GSTREAMER_AUDIO_LIBRARIES
|
||||
GSTREAMER_BASE_INCLUDE_DIRS
|
||||
GSTREAMER_BASE_LIBRARIES
|
||||
GSTREAMER_FFT_INCLUDE_DIRS
|
||||
GSTREAMER_FFT_LIBRARIES
|
||||
GSTREAMER_GL_INCLUDE_DIRS
|
||||
GSTREAMER_GL_LIBRARIES
|
||||
GSTREAMER_INCLUDE_DIRS
|
||||
GSTREAMER_LIBRARIES
|
||||
GSTREAMER_MPEGTS_INCLUDE_DIRS
|
||||
GSTREAMER_MPEGTS_LIBRARIES
|
||||
GSTREAMER_PBUTILS_INCLUDE_DIRS
|
||||
GSTREAMER_PBUTILS_LIBRARIES
|
||||
GSTREAMER_TAG_INCLUDE_DIRS
|
||||
GSTREAMER_TAG_LIBRARIES
|
||||
GSTREAMER_VIDEO_INCLUDE_DIRS
|
||||
GSTREAMER_VIDEO_LIBRARIES
|
||||
GSTREAMER_CODECPARSERS_INCLUDE_DIRS
|
||||
GSTREAMER_CODECPARSERS_LIBRARIES
|
||||
)
|
||||
15
cmake_modules/functions.cmake
Normal file
15
cmake_modules/functions.cmake
Normal file
@ -0,0 +1,15 @@
|
||||
|
||||
function( findRpiRevision OUTPUT )
|
||||
# Find it with an automated script
|
||||
execute_process( COMMAND grep -Po "^Revision\\s*:\\s*\\K[[:xdigit:]]+" /proc/cpuinfo OUTPUT_VARIABLE TMP )
|
||||
|
||||
# If have not found the Revision number, use the last version
|
||||
if ( TMP )
|
||||
message( "-- Detecting Raspberry Pi Revision Number: ${TMP}" )
|
||||
else()
|
||||
set( TMP "0006" )
|
||||
message( WARNING "-- Could NOT find Raspberry Pi revision!" )
|
||||
endif()
|
||||
|
||||
set( ${OUTPUT} "${TMP}" PARENT_SCOPE )
|
||||
endfunction()
|
||||
97
include/f1x/openauto/autoapp/Projection/GSTVideoOutput.hpp
Normal file
97
include/f1x/openauto/autoapp/Projection/GSTVideoOutput.hpp
Normal file
@ -0,0 +1,97 @@
|
||||
/*
|
||||
* This file is part of openauto project.
|
||||
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||
*
|
||||
* openauto is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
||||
* openauto is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifdef USE_GST
|
||||
#pragma once
|
||||
|
||||
#include <mutex>
|
||||
#include <condition_variable>
|
||||
#include <functional>
|
||||
#include <thread>
|
||||
#include <boost/circular_buffer.hpp>
|
||||
#include <boost/noncopyable.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/VideoOutput.hpp>
|
||||
#include <gst/gst.h>
|
||||
#include <gst/app/gstappsrc.h>
|
||||
#include <gst/app/gstappsink.h>
|
||||
#include <gst/video/video.h>
|
||||
#include <QGlib/Error>
|
||||
#include <QGlib/Connect>
|
||||
#include <QGst/Init>
|
||||
#include <QGst/Bus>
|
||||
#include <QGst/Pipeline>
|
||||
#include <QGst/Parse>
|
||||
#include <QGst/Message>
|
||||
#include <QGst/Utils/ApplicationSink>
|
||||
#include <QGst/Utils/ApplicationSource>
|
||||
#include <QGst/Ui/VideoWidget>
|
||||
#include <QGst/ElementFactory>
|
||||
#include <QGst/Quick/VideoSurface>
|
||||
#include <QtQml/QQmlContext>
|
||||
#include <QtQuickWidgets/QQuickWidget>
|
||||
#include <QApplication>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
namespace openauto
|
||||
{
|
||||
namespace autoapp
|
||||
{
|
||||
namespace projection
|
||||
{
|
||||
|
||||
class GSTVideoOutput: public QObject, public VideoOutput, boost::noncopyable
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
GSTVideoOutput(configuration::IConfiguration::Pointer configuration, QWidget* videoContainer=nullptr, std::function<void(bool)> activeCallback=nullptr);
|
||||
~GSTVideoOutput();
|
||||
bool open() override;
|
||||
bool init() override;
|
||||
void write(uint64_t timestamp, const aasdk::common::DataConstBuffer& buffer) override;
|
||||
void stop() override;
|
||||
void resize();
|
||||
|
||||
signals:
|
||||
void startPlayback();
|
||||
void stopPlayback();
|
||||
|
||||
protected slots:
|
||||
void onStartPlayback();
|
||||
void onStopPlayback();
|
||||
|
||||
private:
|
||||
static GstPadProbeReturn convertProbe(GstPad* pad, GstPadProbeInfo* info, void*);
|
||||
static gboolean busCallback(GstBus*, GstMessage* message, gpointer*);
|
||||
|
||||
QGst::ElementPtr videoSink_;
|
||||
QQuickWidget* videoWidget_;
|
||||
GstElement* vidPipeline_;
|
||||
GstAppSrc* vidSrc_;
|
||||
QWidget* videoContainer_;
|
||||
QGst::Quick::VideoSurface* surface_;
|
||||
std::function<void(bool)> activeCallback_;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -45,6 +45,7 @@ public:
|
||||
bool eventFilter(QObject* obj, QEvent* event) override;
|
||||
bool hasTouchscreen() const override;
|
||||
QRect getTouchscreenGeometry() const override;
|
||||
void setTouchscreenGeometry(QRect& touchscreenGeometry);
|
||||
|
||||
private:
|
||||
void setVideoGeometry();
|
||||
|
||||
@ -62,6 +62,7 @@ public:
|
||||
void write(uint64_t timestamp, const aasdk::common::DataConstBuffer& buffer) override;
|
||||
void stop() override;
|
||||
void setOpacity(OMX_U32 alpha);
|
||||
void setDestRect(DestRect destRect);
|
||||
|
||||
private:
|
||||
bool createComponents();
|
||||
|
||||
@ -43,6 +43,7 @@ public:
|
||||
bool init() override;
|
||||
void write(uint64_t timestamp, const aasdk::common::DataConstBuffer& buffer) override;
|
||||
void stop() override;
|
||||
void resize();
|
||||
|
||||
signals:
|
||||
void startPlayback();
|
||||
|
||||
@ -33,7 +33,7 @@ namespace service
|
||||
class SensorService: public aasdk::channel::sensor::ISensorServiceChannelEventHandler, public IService, public std::enable_shared_from_this<SensorService>
|
||||
{
|
||||
public:
|
||||
SensorService(boost::asio::io_service& ioService, aasdk::messenger::IMessenger::Pointer messenger);
|
||||
SensorService(boost::asio::io_service& ioService, aasdk::messenger::IMessenger::Pointer messenger, bool nightMode=false);
|
||||
|
||||
void start() override;
|
||||
void stop() override;
|
||||
@ -41,6 +41,7 @@ public:
|
||||
void onChannelOpenRequest(const aasdk::proto::messages::ChannelOpenRequest& request) override;
|
||||
void onSensorStartRequest(const aasdk::proto::messages::SensorStartRequestMessage& request) override;
|
||||
void onChannelError(const aasdk::error::Error& e) override;
|
||||
void setNightMode(bool nightMode);
|
||||
|
||||
private:
|
||||
using std::enable_shared_from_this<SensorService>::shared_from_this;
|
||||
@ -49,6 +50,7 @@ private:
|
||||
|
||||
boost::asio::io_service::strand strand_;
|
||||
aasdk::channel::sensor::SensorServiceChannel::Pointer channel_;
|
||||
bool nightMode_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -20,7 +20,11 @@
|
||||
|
||||
#include <f1x/openauto/autoapp/Service/IServiceFactory.hpp>
|
||||
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/InputDevice.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/OMXVideoOutput.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/GSTVideoOutput.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/QtVideoOutput.hpp>
|
||||
#include <f1x/openauto/autoapp/Service/SensorService.hpp>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
@ -34,9 +38,12 @@ namespace service
|
||||
class ServiceFactory: public IServiceFactory
|
||||
{
|
||||
public:
|
||||
ServiceFactory(boost::asio::io_service& ioService, configuration::IConfiguration::Pointer configuration, QWidget* activeArea=nullptr, std::function<void(bool)> activeCallback=nullptr);
|
||||
ServiceFactory(boost::asio::io_service& ioService, configuration::IConfiguration::Pointer configuration, QWidget* activeArea=nullptr, std::function<void(bool)> activeCallback=nullptr, bool nightMode=false);
|
||||
ServiceList create(aasdk::messenger::IMessenger::Pointer messenger) override;
|
||||
void setOpacity(unsigned int alpha);
|
||||
void resize();
|
||||
void setNightMode(bool nightMode);
|
||||
void sendKeyEvent(QKeyEvent* event);
|
||||
static QRect mapActiveAreaToGlobal(QWidget* activeArea);
|
||||
#ifdef USE_OMX
|
||||
static projection::DestRect QRectToDestRect(QRect rect);
|
||||
@ -53,9 +60,16 @@ private:
|
||||
QWidget* activeArea_;
|
||||
QRect screenGeometry_;
|
||||
std::function<void(bool)> activeCallback_;
|
||||
#ifdef USE_OMX
|
||||
std::shared_ptr<projection::InputDevice> inputDevice_;
|
||||
#if defined USE_OMX
|
||||
std::shared_ptr<projection::OMXVideoOutput> omxVideoOutput_;
|
||||
#elif defined USE_GST
|
||||
std::shared_ptr<projection::GSTVideoOutput> gstVideoOutput_;
|
||||
#else
|
||||
projection::QtVideoOutput *qtVideoOutput_;
|
||||
#endif
|
||||
bool nightMode_;
|
||||
std::weak_ptr<SensorService> sensorService_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
236
src/autoapp/Projection/GSTVideoOutput.cpp
Normal file
236
src/autoapp/Projection/GSTVideoOutput.cpp
Normal file
@ -0,0 +1,236 @@
|
||||
/*
|
||||
* This file is part of openauto project.
|
||||
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||
*
|
||||
* openauto is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
||||
* openauto is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifdef USE_GST
|
||||
|
||||
#include <f1x/aasdk/Common/Data.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/GSTVideoOutput.hpp>
|
||||
#include <f1x/openauto/Common/Log.hpp>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
namespace openauto
|
||||
{
|
||||
namespace autoapp
|
||||
{
|
||||
namespace projection
|
||||
{
|
||||
|
||||
GSTVideoOutput::GSTVideoOutput(configuration::IConfiguration::Pointer configuration, QWidget* videoContainer, std::function<void(bool)> activeCallback)
|
||||
: VideoOutput(std::move(configuration))
|
||||
, videoContainer_(videoContainer)
|
||||
, activeCallback_(activeCallback)
|
||||
{
|
||||
this->moveToThread(QApplication::instance()->thread());
|
||||
videoWidget_ = new QQuickWidget(videoContainer_);
|
||||
|
||||
surface_ = new QGst::Quick::VideoSurface;
|
||||
videoWidget_->rootContext()->setContextProperty(QLatin1String("videoSurface"), surface_);
|
||||
videoWidget_->setSource(QUrl("qrc:/aa_video.qml"));
|
||||
videoWidget_->setResizeMode(QQuickWidget::SizeRootObjectToView);
|
||||
|
||||
videoSink_ = surface_->videoSink();
|
||||
|
||||
GError* error = nullptr;
|
||||
const char* vidLaunchStr = "appsrc name=mysrc is-live=true block=false max-latency=100 do-timestamp=true stream-type=stream ! queue ! h264parse ! "
|
||||
#ifdef RPI
|
||||
#ifdef PI4
|
||||
"v4l2h264dec ! "
|
||||
#else
|
||||
"omxh264dec ! "
|
||||
#endif
|
||||
#else
|
||||
"avdec_h264 ! "
|
||||
#endif
|
||||
"capsfilter caps=video/x-raw name=mycapsfilter";
|
||||
#ifdef RPI
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] RPI Build, running with " <<
|
||||
#ifdef PI4
|
||||
"v4l2h264dec";
|
||||
#else
|
||||
"omxh264dec";
|
||||
#endif
|
||||
#endif
|
||||
|
||||
vidPipeline_ = gst_parse_launch(vidLaunchStr, &error);
|
||||
GstBus* bus = gst_pipeline_get_bus(GST_PIPELINE(vidPipeline_));
|
||||
gst_bus_add_watch(bus, (GstBusFunc)&GSTVideoOutput::busCallback, this);
|
||||
gst_object_unref(bus);
|
||||
|
||||
GstElement* sink = QGlib::RefPointer<QGst::Element>(videoSink_);
|
||||
g_object_set(sink, "force-aspect-ratio", false, nullptr);
|
||||
g_object_set(sink, "sync", false, nullptr);
|
||||
g_object_set(sink, "async", false, nullptr);
|
||||
|
||||
GstElement* capsFilter = gst_bin_get_by_name(GST_BIN(vidPipeline_), "mycapsfilter");
|
||||
gst_bin_add(GST_BIN(vidPipeline_), GST_ELEMENT(sink));
|
||||
gst_element_link(capsFilter, GST_ELEMENT(sink));
|
||||
|
||||
vidSrc_ = GST_APP_SRC(gst_bin_get_by_name(GST_BIN(vidPipeline_), "mysrc"));
|
||||
gst_app_src_set_stream_type(vidSrc_, GST_APP_STREAM_TYPE_STREAM);
|
||||
|
||||
connect(this, &GSTVideoOutput::startPlayback, this, &GSTVideoOutput::onStartPlayback, Qt::QueuedConnection);
|
||||
connect(this, &GSTVideoOutput::stopPlayback, this, &GSTVideoOutput::onStopPlayback, Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
GSTVideoOutput::~GSTVideoOutput()
|
||||
{
|
||||
gst_object_unref(vidPipeline_);
|
||||
gst_object_unref(vidSrc_);
|
||||
}
|
||||
|
||||
gboolean GSTVideoOutput::busCallback(GstBus*, GstMessage* message, gpointer*)
|
||||
{
|
||||
gchar* debug;
|
||||
GError* err;
|
||||
gchar* name;
|
||||
|
||||
switch(GST_MESSAGE_TYPE(message))
|
||||
{
|
||||
case GST_MESSAGE_ERROR:
|
||||
gst_message_parse_error(message, &err, &debug);
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] Error " << err->message;
|
||||
g_error_free(err);
|
||||
g_free(debug);
|
||||
break;
|
||||
case GST_MESSAGE_WARNING:
|
||||
gst_message_parse_warning(message, &err, &debug);
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] Warning " << err->message << " | Debug " << debug;
|
||||
name = (gchar*)GST_MESSAGE_SRC_NAME(message);
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] Name of src " << (name ? name : "nil");
|
||||
g_error_free(err);
|
||||
g_free(debug);
|
||||
break;
|
||||
case GST_MESSAGE_EOS:
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] End of stream";
|
||||
break;
|
||||
case GST_MESSAGE_STATE_CHANGED:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool GSTVideoOutput::open()
|
||||
{
|
||||
GstElement* capsFilter = gst_bin_get_by_name(GST_BIN(vidPipeline_), "mycapsfilter");
|
||||
GstPad* convertPad = gst_element_get_static_pad(capsFilter, "sink");
|
||||
gst_pad_add_probe(convertPad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, &GSTVideoOutput::convertProbe, this, nullptr);
|
||||
gst_element_set_state(vidPipeline_, GST_STATE_PLAYING);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
GstPadProbeReturn GSTVideoOutput::convertProbe(GstPad* pad, GstPadProbeInfo* info, void*)
|
||||
{
|
||||
GstEvent* event = GST_PAD_PROBE_INFO_EVENT(info);
|
||||
if(GST_PAD_PROBE_INFO_TYPE(info) & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM)
|
||||
{
|
||||
if(GST_EVENT_TYPE(event) == GST_EVENT_SEGMENT)
|
||||
{
|
||||
GstCaps* caps = gst_pad_get_current_caps(pad);
|
||||
if(caps != nullptr)
|
||||
{
|
||||
GstVideoInfo* vinfo = gst_video_info_new();
|
||||
gst_video_info_from_caps(vinfo, caps);
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] Video Width: " << vinfo->width;
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] Video Height: " << vinfo->height;
|
||||
}
|
||||
|
||||
return GST_PAD_PROBE_REMOVE;
|
||||
}
|
||||
}
|
||||
|
||||
return GST_PAD_PROBE_OK;
|
||||
}
|
||||
|
||||
bool GSTVideoOutput::init()
|
||||
{
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] init";
|
||||
emit startPlayback();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void GSTVideoOutput::write(uint64_t timestamp, const aasdk::common::DataConstBuffer& buffer)
|
||||
{
|
||||
GstBuffer* buffer_ = gst_buffer_new_and_alloc(buffer.size);
|
||||
gst_buffer_fill(buffer_, 0, buffer.cdata, buffer.size);
|
||||
int ret = gst_app_src_push_buffer((GstAppSrc*)vidSrc_, buffer_);
|
||||
if(ret != GST_FLOW_OK)
|
||||
{
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] push buffer returned " << ret << " for " << buffer.size << "bytes";
|
||||
}
|
||||
}
|
||||
|
||||
void GSTVideoOutput::onStartPlayback()
|
||||
{
|
||||
if(activeCallback_ != nullptr)
|
||||
{
|
||||
activeCallback_(true);
|
||||
}
|
||||
|
||||
if(videoContainer_ == nullptr)
|
||||
{
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] No video container, setting projection fullscreen";
|
||||
videoWidget_->setFocus();
|
||||
videoWidget_->setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
|
||||
videoWidget_->showFullScreen();
|
||||
}
|
||||
else
|
||||
{
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] Resizing to video container";
|
||||
videoWidget_->resize(videoContainer_->size());
|
||||
}
|
||||
videoWidget_->show();
|
||||
}
|
||||
|
||||
void GSTVideoOutput::stop()
|
||||
{
|
||||
emit stopPlayback();
|
||||
}
|
||||
|
||||
void GSTVideoOutput::onStopPlayback()
|
||||
{
|
||||
if(activeCallback_ != nullptr)
|
||||
{
|
||||
activeCallback_(false);
|
||||
}
|
||||
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] stop.";
|
||||
gst_element_set_state(vidPipeline_, GST_STATE_PAUSED);
|
||||
videoWidget_->hide();
|
||||
}
|
||||
|
||||
void GSTVideoOutput::resize()
|
||||
{
|
||||
OPENAUTO_LOG(info) << "[GSTVideoOutput] Got resize request to "<< videoContainer_->width() << "x" << videoContainer_->height();
|
||||
|
||||
if(videoWidget_ != nullptr && videoContainer_ != nullptr)
|
||||
{
|
||||
videoWidget_->resize(videoContainer_->size());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -225,6 +225,11 @@ QRect InputDevice::getTouchscreenGeometry() const
|
||||
return touchscreenGeometry_;
|
||||
}
|
||||
|
||||
void InputDevice::setTouchscreenGeometry(QRect& touchscreenGeometry)
|
||||
{
|
||||
touchscreenGeometry_ = touchscreenGeometry;
|
||||
}
|
||||
|
||||
IInputDevice::ButtonCodes InputDevice::getSupportedButtonCodes() const
|
||||
{
|
||||
return configuration_->getButtonCodes();
|
||||
|
||||
@ -114,10 +114,12 @@ bool OMXVideoOutput::open()
|
||||
}
|
||||
|
||||
isActive_ = true;
|
||||
if(this->activeCallback_ != nullptr)
|
||||
|
||||
if(activeCallback_ != nullptr)
|
||||
{
|
||||
this->activeCallback_(isActive_);
|
||||
activeCallback_(true);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -142,7 +144,7 @@ bool OMXVideoOutput::setupDisplayRegion()
|
||||
displayRegion.noaspect = OMX_TRUE;
|
||||
displayRegion.set = static_cast<OMX_DISPLAYSETTYPE >(OMX_DISPLAY_SET_FULLSCREEN | OMX_DISPLAY_SET_NOASPECT | OMX_DISPLAY_SET_LAYER);
|
||||
|
||||
if (destRect_.fullscreen == OMX_FALSE)
|
||||
if(displayRegion.fullscreen == OMX_FALSE)
|
||||
{
|
||||
displayRegion.alpha = alpha_;
|
||||
displayRegion.dest_rect.x_offset = destRect_.xOffset;
|
||||
@ -214,15 +216,16 @@ void OMXVideoOutput::stop()
|
||||
{
|
||||
OPENAUTO_LOG(info) << "[OMXVideoOutput] stop.";
|
||||
|
||||
if(activeCallback_ != nullptr)
|
||||
{
|
||||
activeCallback_(false);
|
||||
}
|
||||
|
||||
std::lock_guard<decltype(mutex_)> lock(mutex_);
|
||||
|
||||
if(isActive_)
|
||||
{
|
||||
isActive_ = false;
|
||||
if(this->activeCallback_ != nullptr)
|
||||
{
|
||||
this->activeCallback_(isActive_);
|
||||
}
|
||||
|
||||
ilclient_disable_tunnel(&tunnels_[0]);
|
||||
ilclient_disable_tunnel(&tunnels_[1]);
|
||||
@ -249,14 +252,18 @@ void OMXVideoOutput::setOpacity(OMX_U32 alpha)
|
||||
alpha_ = alpha;
|
||||
if(isActive_)
|
||||
{
|
||||
OMX_CONFIG_DISPLAYREGIONTYPE displayRegion;
|
||||
displayRegion.nSize = sizeof(OMX_CONFIG_DISPLAYREGIONTYPE);
|
||||
displayRegion.nVersion.nVersion = OMX_VERSION;
|
||||
displayRegion.nPortIndex = 90;
|
||||
displayRegion.alpha = alpha_;
|
||||
displayRegion.set = static_cast<OMX_DISPLAYSETTYPE >(OMX_DISPLAY_SET_ALPHA);
|
||||
this->setupDisplayRegion();
|
||||
}
|
||||
}
|
||||
|
||||
OMX_SetConfig(ilclient_get_handle(components_[VideoComponent::RENDERER]), OMX_IndexConfigDisplayRegion, &displayRegion) == OMX_ErrorNone;
|
||||
void OMXVideoOutput::setDestRect(DestRect destRect)
|
||||
{
|
||||
std::lock_guard<decltype(mutex_)> lock(mutex_);
|
||||
|
||||
destRect_ = destRect;
|
||||
if(isActive_)
|
||||
{
|
||||
this->setupDisplayRegion();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -69,6 +69,14 @@ void QtVideoOutput::write(uint64_t, const aasdk::common::DataConstBuffer& buffer
|
||||
videoBuffer_.write(reinterpret_cast<const char*>(buffer.cdata), buffer.size);
|
||||
}
|
||||
|
||||
void QtVideoOutput::resize()
|
||||
{
|
||||
if(videoWidget_ != nullptr && videoContainer_ != nullptr)
|
||||
{
|
||||
videoWidget_->resize(videoContainer_->size());
|
||||
}
|
||||
}
|
||||
|
||||
void QtVideoOutput::onStartPlayback()
|
||||
{
|
||||
if(videoContainer_ == nullptr)
|
||||
|
||||
@ -29,9 +29,10 @@ namespace autoapp
|
||||
namespace service
|
||||
{
|
||||
|
||||
SensorService::SensorService(boost::asio::io_service& ioService, aasdk::messenger::IMessenger::Pointer messenger)
|
||||
SensorService::SensorService(boost::asio::io_service& ioService, aasdk::messenger::IMessenger::Pointer messenger, bool nightMode)
|
||||
: strand_(ioService)
|
||||
, channel_(std::make_shared<aasdk::channel::sensor::SensorServiceChannel>(strand_, std::move(messenger)))
|
||||
, nightMode_(nightMode)
|
||||
{
|
||||
|
||||
}
|
||||
@ -121,7 +122,7 @@ void SensorService::sendDrivingStatusUnrestricted()
|
||||
void SensorService::sendNightData()
|
||||
{
|
||||
aasdk::proto::messages::SensorEventIndication indication;
|
||||
indication.add_night_mode()->set_is_night(false);
|
||||
indication.add_night_mode()->set_is_night(nightMode_);
|
||||
|
||||
auto promise = aasdk::channel::SendPromise::defer(strand_);
|
||||
promise->then([]() {}, std::bind(&SensorService::onChannelError, this->shared_from_this(), std::placeholders::_1));
|
||||
@ -133,6 +134,12 @@ void SensorService::onChannelError(const aasdk::error::Error& e)
|
||||
OPENAUTO_LOG(error) << "[SensorService] channel error: " << e.what();
|
||||
}
|
||||
|
||||
void SensorService::setNightMode(bool nightMode)
|
||||
{
|
||||
nightMode_ = nightMode;
|
||||
this->sendNightData();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
#include <f1x/openauto/autoapp/Service/BluetoothService.hpp>
|
||||
#include <f1x/openauto/autoapp/Service/InputService.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/QtVideoOutput.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/GSTVideoOutput.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/OMXVideoOutput.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/RtAudioOutput.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/QtAudioOutput.hpp>
|
||||
@ -49,15 +50,20 @@ namespace autoapp
|
||||
namespace service
|
||||
{
|
||||
|
||||
ServiceFactory::ServiceFactory(boost::asio::io_service& ioService, configuration::IConfiguration::Pointer configuration, QWidget *activeArea, std::function<void(bool)> activeCallback)
|
||||
ServiceFactory::ServiceFactory(boost::asio::io_service& ioService, configuration::IConfiguration::Pointer configuration, QWidget *activeArea, std::function<void(bool)> activeCallback, bool nightMode)
|
||||
: ioService_(ioService)
|
||||
, configuration_(std::move(configuration))
|
||||
, activeArea_(activeArea)
|
||||
, screenGeometry_(this->mapActiveAreaToGlobal(activeArea_))
|
||||
, activeCallback_(activeCallback)
|
||||
#ifdef USE_OMX
|
||||
#if defined USE_OMX
|
||||
, omxVideoOutput_(std::make_shared<projection::OMXVideoOutput>(configuration_, this->QRectToDestRect(screenGeometry_), activeCallback_))
|
||||
#elif defined USE_GST
|
||||
, gstVideoOutput_((QGst::init(nullptr, nullptr), std::make_shared<projection::GSTVideoOutput>(configuration_, activeArea_, activeCallback_)))
|
||||
#else
|
||||
, qtVideoOutput_(nullptr)
|
||||
#endif
|
||||
, nightMode_(nightMode)
|
||||
{
|
||||
|
||||
}
|
||||
@ -69,7 +75,11 @@ ServiceList ServiceFactory::create(aasdk::messenger::IMessenger::Pointer messeng
|
||||
projection::IAudioInput::Pointer audioInput(new projection::QtAudioInput(1, 16, 16000), std::bind(&QObject::deleteLater, std::placeholders::_1));
|
||||
serviceList.emplace_back(std::make_shared<AudioInputService>(ioService_, messenger, std::move(audioInput)));
|
||||
this->createAudioServices(serviceList, messenger);
|
||||
serviceList.emplace_back(std::make_shared<SensorService>(ioService_, messenger));
|
||||
|
||||
std::shared_ptr<SensorService> sensorService = std::make_shared<SensorService>(ioService_, messenger, nightMode_);
|
||||
sensorService_ = sensorService;
|
||||
serviceList.emplace_back(sensorService);
|
||||
|
||||
serviceList.emplace_back(this->createVideoService(messenger));
|
||||
serviceList.emplace_back(this->createBluetoothService(messenger));
|
||||
serviceList.emplace_back(this->createInputService(messenger));
|
||||
@ -79,11 +89,22 @@ ServiceList ServiceFactory::create(aasdk::messenger::IMessenger::Pointer messeng
|
||||
|
||||
IService::Pointer ServiceFactory::createVideoService(aasdk::messenger::IMessenger::Pointer messenger)
|
||||
{
|
||||
#ifdef USE_OMX
|
||||
#if defined USE_OMX
|
||||
auto videoOutput(omxVideoOutput_);
|
||||
#elif defined USE_GST
|
||||
auto videoOutput(gstVideoOutput_);
|
||||
#else
|
||||
auto qtVideoOutput = new projection::QtVideoOutput(configuration_, activeArea_);
|
||||
projection::IVideoOutput::Pointer videoOutput(qtVideoOutput, std::bind(&QObject::deleteLater, std::placeholders::_1));
|
||||
qtVideoOutput_ = new projection::QtVideoOutput(configuration_, activeArea_);
|
||||
if(activeCallback_ != nullptr)
|
||||
{
|
||||
QObject::connect(qtVideoOutput_, &projection::QtVideoOutput::startPlayback, [callback = activeCallback_]() { callback(true); });
|
||||
QObject::connect(qtVideoOutput_, &projection::QtVideoOutput::stopPlayback, [this]() {
|
||||
activeCallback_(false);
|
||||
qtVideoOutput_->disconnect();
|
||||
qtVideoOutput_ = nullptr;
|
||||
});
|
||||
}
|
||||
projection::IVideoOutput::Pointer videoOutput(qtVideoOutput_, std::bind(&QObject::deleteLater, std::placeholders::_1));
|
||||
#endif
|
||||
return std::make_shared<VideoService>(ioService_, messenger, std::move(videoOutput));
|
||||
}
|
||||
@ -128,9 +149,9 @@ IService::Pointer ServiceFactory::createInputService(aasdk::messenger::IMessenge
|
||||
}
|
||||
|
||||
QObject* inputObject = activeArea_ == nullptr ? qobject_cast<QObject*>(QApplication::instance()) : qobject_cast<QObject*>(activeArea_);
|
||||
projection::IInputDevice::Pointer inputDevice(std::make_shared<projection::InputDevice>(*inputObject, configuration_, std::move(screenGeometry_), std::move(videoGeometry)));
|
||||
inputDevice_ = std::make_shared<projection::InputDevice>(*inputObject, configuration_, std::move(screenGeometry_), std::move(videoGeometry));
|
||||
|
||||
return std::make_shared<InputService>(ioService_, messenger, std::move(inputDevice));
|
||||
return std::make_shared<InputService>(ioService_, messenger, std::move(projection::IInputDevice::Pointer(inputDevice_)));
|
||||
}
|
||||
|
||||
void ServiceFactory::createAudioServices(ServiceList& serviceList, aasdk::messenger::IMessenger::Pointer messenger)
|
||||
@ -163,10 +184,55 @@ void ServiceFactory::createAudioServices(ServiceList& serviceList, aasdk::messen
|
||||
void ServiceFactory::setOpacity(unsigned int alpha)
|
||||
{
|
||||
#ifdef USE_OMX
|
||||
if(omxVideoOutput_ != nullptr)
|
||||
{
|
||||
omxVideoOutput_->setOpacity(alpha);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void ServiceFactory::resize()
|
||||
{
|
||||
screenGeometry_ = this->mapActiveAreaToGlobal(activeArea_);
|
||||
if(inputDevice_ != nullptr)
|
||||
{
|
||||
inputDevice_->setTouchscreenGeometry(screenGeometry_);
|
||||
}
|
||||
#if defined USE_OMX
|
||||
if(omxVideoOutput_ != nullptr)
|
||||
{
|
||||
omxVideoOutput_->setDestRect(this->QRectToDestRect(screenGeometry_));
|
||||
}
|
||||
#elif defined USE_GST
|
||||
if(gstVideoOutput_ != nullptr)
|
||||
{
|
||||
gstVideoOutput_->resize();
|
||||
}
|
||||
#else
|
||||
if(qtVideoOutput_ != nullptr)
|
||||
{
|
||||
qtVideoOutput_->resize();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void ServiceFactory::setNightMode(bool nightMode)
|
||||
{
|
||||
nightMode_ = nightMode;
|
||||
if(std::shared_ptr<SensorService> sensorService = sensorService_.lock())
|
||||
{
|
||||
sensorService->setNightMode(nightMode_);
|
||||
}
|
||||
}
|
||||
|
||||
void ServiceFactory::sendKeyEvent(QKeyEvent* event)
|
||||
{
|
||||
if(inputDevice_ != nullptr)
|
||||
{
|
||||
inputDevice_->eventFilter(activeArea_, event);
|
||||
}
|
||||
}
|
||||
|
||||
QRect ServiceFactory::mapActiveAreaToGlobal(QWidget* activeArea)
|
||||
{
|
||||
if(activeArea == nullptr)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user