From 1a90d8a5202c764f0aea63d330fa7ef3539c6696 Mon Sep 17 00:00:00 2001 From: Luca Carlon Date: Thu, 23 Feb 2017 13:39:46 +0100 Subject: [PATCH] Released code for 5.5.0-beta1. --- changelog.txt | 13 +++++++++ piomxtextures_lib/piomxtextures_lib.pro | 2 -- .../mediaplayer/mediaplayer.pro | 29 +++++++++---------- .../mediaplayer/openmaxilplayercontrol.cpp | 10 +++---- .../mediaplayer/openmaxilplayerservice.cpp | 4 +-- piomxtextures_src/omx_mediaprocessor.cpp | 2 +- piomxtextures_src/omx_qthread.h | 5 ++++ piomxtextures_src/piomxtextures_src.pri | 2 ++ piomxtextures_tools/compile_ffmpeg.sh | 2 +- 9 files changed, 43 insertions(+), 26 deletions(-) diff --git a/changelog.txt b/changelog.txt index 2e22ceb..b583fb7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,18 @@ Changelog +Version 5.4.0-beta1 +=================== +1. Bump to ffmpeg 3.1. +2. Bump to Qt 5.7.0. + +Version 5.3.0-beta1 +=================== +1. Implemented webkit support. +2. Implemented buffering. + +Version 5.2.2 +============= + Version 5.2.1 ============= 1. Added duration changed signal. diff --git a/piomxtextures_lib/piomxtextures_lib.pro b/piomxtextures_lib/piomxtextures_lib.pro index 4a222bd..aa61d77 100644 --- a/piomxtextures_lib/piomxtextures_lib.pro +++ b/piomxtextures_lib/piomxtextures_lib.pro @@ -23,8 +23,6 @@ TEMPLATE = lib -VERSION = 5.3.0 - QT += core core-private gui gui-private opengl quick quick-private CONFIG += no_private_qt_headers_warning diff --git a/piomxtextures_qt_driver/mediaplayer/mediaplayer.pro b/piomxtextures_qt_driver/mediaplayer/mediaplayer.pro index 59f47ad..0fb9736 100644 --- a/piomxtextures_qt_driver/mediaplayer/mediaplayer.pro +++ b/piomxtextures_qt_driver/mediaplayer/mediaplayer.pro @@ -22,25 +22,25 @@ # TARGET = openmaxilmediaplayer +TEMPLATE = lib + +QT += quick network PLUGIN_TYPE = mediaservice PLUGIN_CLASS_NAME = OpenMAXILPlayerServicePlugin -load(qt_plugin) - -QT += quick -QT += multimedia-private network -CONFIG += no_private_qt_headers_warning +#QT += multimedia-private network +#CONFIG += no_private_qt_headers_warning -qtHaveModule(widgets) { - QT += widgets multimediawidgets-private - DEFINES += HAVE_WIDGETS -} +#qtHaveModule(widgets) { +# QT += widgets multimediawidgets-private +# DEFINES += HAVE_WIDGETS +#} -config_xvideo:qtHaveModule(widgets) { +#config_xvideo:qtHaveModule(widgets) { # DEFINES += HAVE_XVIDEO # LIBS += -lXv -lX11 -lXext -} +#} include($$_PRO_FILE_PWD_/../../piomxtextures_src/piomxtextures_src.pri) @@ -54,7 +54,7 @@ HEADERS += \ $$PWD/openmaxilavailabilitycontrol.h \ $$PWD/openmaxilplayerserviceplugin.h \ $$PWD/openmaxilvideorenderercontrol.h \ - openmaxilvideoprobe.h + $$PWD/openmaxilvideoprobe.h SOURCES += \ $$PWD/openmaxilplayercontrol.cpp \ @@ -64,7 +64,6 @@ SOURCES += \ $$PWD/openmaxilavailabilitycontrol.cpp \ $$PWD/openmaxilplayerserviceplugin.cpp \ $$PWD/openmaxilvideorenderercontrol.cpp \ - openmaxilvideoprobe.cpp + $$PWD/openmaxilvideoprobe.cpp -OTHER_FILES += \ - mediaplayer.json +OTHER_FILES += mediaplayer.json diff --git a/piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp b/piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp index be3251a..a5d28ae 100644 --- a/piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp +++ b/piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp @@ -26,9 +26,9 @@ +-----------------------------------------------------------------------------*/ #include "openmaxilplayercontrol.h" -#include -#include -#include +//#include +//#include +//#include #include #include @@ -78,8 +78,8 @@ OpenMAXILPlayerControl::OpenMAXILPlayerControl(QObject *parent) : QMediaPlayerControl(parent) , m_ownStream(false) , m_seekToStartPending(false) - , m_pendingSeekPosition(-1) - , m_texProvider(make_shared()) + , m_pendingSeekPosition(-1) + , m_texProvider(make_shared()) , m_mediaProcessor(new OMX_MediaProcessor(m_texProvider)) , m_renderer(NULL) { diff --git a/piomxtextures_qt_driver/mediaplayer/openmaxilplayerservice.cpp b/piomxtextures_qt_driver/mediaplayer/openmaxilplayerservice.cpp index 6063a87..91cf656 100644 --- a/piomxtextures_qt_driver/mediaplayer/openmaxilplayerservice.cpp +++ b/piomxtextures_qt_driver/mediaplayer/openmaxilplayerservice.cpp @@ -41,9 +41,9 @@ #include "omx_logging.h" -#include +//#include #include -#include +//#include QT_BEGIN_NAMESPACE diff --git a/piomxtextures_src/omx_mediaprocessor.cpp b/piomxtextures_src/omx_mediaprocessor.cpp index 997cac3..a64a75a 100644 --- a/piomxtextures_src/omx_mediaprocessor.cpp +++ b/piomxtextures_src/omx_mediaprocessor.cpp @@ -120,7 +120,7 @@ static std::once_flag flag1; static void print_build_once() { std::call_once(flag1, []() { - log_info("POT build %s %s.", __DATE__, __TIME__); + log_info("POT build %s %s, version %s.", __DATE__, __TIME__, POT_VERSION); }); } diff --git a/piomxtextures_src/omx_qthread.h b/piomxtextures_src/omx_qthread.h index 99fee1e..3217ff5 100644 --- a/piomxtextures_src/omx_qthread.h +++ b/piomxtextures_src/omx_qthread.h @@ -29,6 +29,7 @@ +-----------------------------------------------------------------------------*/ #include +#include "omx_logging.h" /*------------------------------------------------------------------------------ | OMX_VideoProcessorThread class @@ -40,6 +41,10 @@ class OMX_QThread : public QThread // Do nothing. } + ~OMX_QThread() { + log_dtor_func; + } + inline Qt::HANDLE getThreadId() { return m_threadId; } diff --git a/piomxtextures_src/piomxtextures_src.pri b/piomxtextures_src/piomxtextures_src.pri index 56f614f..83ec199 100644 --- a/piomxtextures_src/piomxtextures_src.pri +++ b/piomxtextures_src/piomxtextures_src.pri @@ -23,6 +23,8 @@ QT += core core-private gui gui-private opengl quick quick-private multimedia +DEFINES += POT_VERSION=\\\"5.5.0\\\" + SRC=$$PWD SRC_WRAPPER=$$SRC/omx_wrapper diff --git a/piomxtextures_tools/compile_ffmpeg.sh b/piomxtextures_tools/compile_ffmpeg.sh index 9b69b0a..96a0834 100755 --- a/piomxtextures_tools/compile_ffmpeg.sh +++ b/piomxtextures_tools/compile_ffmpeg.sh @@ -61,7 +61,7 @@ fi cd 3rdparty/ffmpeg rm -rf ffmpeg_src -git clone git://source.ffmpeg.org/ffmpeg ffmpeg_src -b release/3.1 --depth=1 +git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg_src -b n3.2.1 --depth=1 cd ffmpeg_src; export PATH="$COMPILER_PATH":$PATH