Skip to content

Commit

Permalink
Released code for 5.5.0-beta1.
Browse files Browse the repository at this point in the history
  • Loading branch information
carlonluca committed Feb 23, 2017
1 parent d577bdc commit 1a90d8a
Showing 9 changed files with 43 additions and 26 deletions.
13 changes: 13 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 0 additions & 2 deletions piomxtextures_lib/piomxtextures_lib.pro
Original file line number Diff line number Diff line change
@@ -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

29 changes: 14 additions & 15 deletions piomxtextures_qt_driver/mediaplayer/mediaplayer.pro
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@
+-----------------------------------------------------------------------------*/
#include "openmaxilplayercontrol.h"

#include <private/qmediaplaylistnavigator_p.h>
#include <private/qmediaresourcepolicy_p.h>
#include <private/qmediaresourceset_p.h>
//#include <private/qmediaplaylistnavigator_p.h>
//#include <private/qmediaresourcepolicy_p.h>
//#include <private/qmediaresourceset_p.h>

#include <QtCore/qdir.h>
#include <QtCore/qsocketnotifier.h>
@@ -78,8 +78,8 @@ OpenMAXILPlayerControl::OpenMAXILPlayerControl(QObject *parent)
: QMediaPlayerControl(parent)
, m_ownStream(false)
, m_seekToStartPending(false)
, m_pendingSeekPosition(-1)
, m_texProvider(make_shared<OMX_EGLBufferProvider>())
, m_pendingSeekPosition(-1)
, m_texProvider(make_shared<OMX_EGLBufferProvider>())
, m_mediaProcessor(new OMX_MediaProcessor(m_texProvider))
, m_renderer(NULL)
{
Original file line number Diff line number Diff line change
@@ -41,9 +41,9 @@

#include "omx_logging.h"

#include <private/qmediaplaylistnavigator_p.h>
//#include <private/qmediaplaylistnavigator_p.h>
#include <qmediaplaylist.h>
#include <private/qmediaresourceset_p.h>
//#include <private/qmediaresourceset_p.h>

QT_BEGIN_NAMESPACE

2 changes: 1 addition & 1 deletion piomxtextures_src/omx_mediaprocessor.cpp
Original file line number Diff line number Diff line change
@@ -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);
});
}

5 changes: 5 additions & 0 deletions piomxtextures_src/omx_qthread.h
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
+-----------------------------------------------------------------------------*/
#include <QThread>

#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;
}
2 changes: 2 additions & 0 deletions piomxtextures_src/piomxtextures_src.pri
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion piomxtextures_tools/compile_ffmpeg.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1a90d8a

Please sign in to comment.