[-]
[+]
|
Changed |
_service:tar_git:qtmultimedia.spec
|
|
[-]
[+]
|
Changed |
_service:tar_git:001-configure-pipeline-properties.patch
^
|
@@ -1,5 +1,12 @@
- debug info on used flags
- load playbin properties from settings
+- example .config/qtmultimedia/settings.conf
+ [playbin]
+ buffer-size=256000
+ ;buffer-duration=5000000
+ ;ring-buffer-max-size=64000
+ ;connection-speed=128000
+ flags=0x182
diff -u -r upstream\src\plugins\gstreamer\audiodecoder\audiodecoder.pro qtmultimedia-mer-5.6\src\plugins\gstreamer\audiodecoder\audiodecoder.pro
--- src/plugins/gstreamer/audiodecoder/audiodecoder.pro Fri Sep 29 20:38:02 2017
+++ src/plugins/gstreamer/audiodecoder/audiodecoder.pro Fri Sep 29 22:24:11 2017
@@ -94,11 +101,12 @@
//#define DEBUG_PLAYBIN
//#define DEBUG_VO_BIN_DUMP
-@@ -145,7 +148,14 @@
+@@ -145,7 +148,15 @@
Q_ASSERT(result == TRUE);
Q_UNUSED(result);
- m_playbin = gst_element_factory_make(QT_GSTREAMER_PLAYBIN_ELEMENT_NAME, NULL);
++ // any config? (.config/qtmultimedia/settings.conf)
+ QSettings settings("qtmultimedia", "settings");
+
+ QString playbinElementName = QT_GSTREAMER_PLAYBIN_ELEMENT_NAME;
@@ -110,14 +118,14 @@
if (m_playbin) {
//GST_PLAY_FLAG_NATIVE_VIDEO omits configuration of ffmpegcolorspace and videoscale,
//since those elements are included in the video output bin when necessary.
-@@ -156,16 +166,46 @@
+@@ -156,16 +167,51 @@
int flags = GST_PLAY_FLAG_VIDEO | GST_PLAY_FLAG_AUDIO;
QByteArray envFlags = qgetenv("QT_GSTREAMER_PLAYBIN_FLAGS");
if (!envFlags.isEmpty()) {
- flags |= envFlags.toInt();
+ bool ok;
+ flags |= envFlags.toInt(&ok, 0);
-+ qInfo() << "QGstreamerPlayerSession - using configured flags: 0x" << std::hex << flags;
++ qInfo("QGstreamerPlayerSession - Loaded from QT_GSTREAMER_PLAYBIN_FLAGS flags: 0x%0X", flags);
#if !GST_CHECK_VERSION(1,0,0)
} else {
flags |= GST_PLAY_FLAG_NATIVE_VIDEO;
@@ -128,23 +136,28 @@
+ if(settings.contains("playbin/buffer-duration")) {
+ int bufferDuration = settings.value("playbin/buffer-duration").toInt();
+ g_object_set(G_OBJECT(m_playbin), "buffer-duration", bufferDuration, NULL);
-+ qInfo() << "Loaded from settings buffer-duration=" << bufferDuration;
++ qInfo() << "QGstreamerPlayerSession - Loaded from settings buffer-duration=" << bufferDuration;
+ }
+ if(settings.contains("playbin/buffer-size")) {
+ int bufferSize = settings.value("playbin/buffer-size").toInt();
+ g_object_set(G_OBJECT(m_playbin), "buffer-size", bufferSize, NULL);
-+ qInfo() << "Loaded from settings buffer-size=" << bufferSize;
++ qInfo() << "QGstreamerPlayerSession - Loaded from settings buffer-size=" << bufferSize;
+ }
+ if(settings.contains("playbin/ring-buffer-max-size")) {
+ int ringBufferMaxSize = settings.value("playbin/ring-buffer-max-size").toInt();
+ g_object_set(G_OBJECT(m_playbin), "ring-buffer-max-size", ringBufferMaxSize, NULL);
-+ qInfo() << "Loaded from settings ring-buffer-max-size=" << ringBufferMaxSize;
++ qInfo() << "QGstreamerPlayerSession - Loaded from settings ring-buffer-max-size=" << ringBufferMaxSize;
++ }
++ if(settings.contains("playbin/connection-speed")) {
++ int speed = settings.value("playbin/connection-speed").toInt();
++ g_object_set(G_OBJECT(m_playbin), "connection-speed", speed, NULL);
++ qInfo() << "QGstreamerPlayerSession - Loaded from settings connection-speed=" << speed;
+ }
+ if(settings.contains("playbin/flags")) {
+ QString flagsString = settings.value("playbin/flags").toString();
+ bool ok;
+ flags = flagsString.toInt(&ok, 0);
-+ qInfo() << "Loaded from settings flags: 0x" << std::hex << flags;
++ qInfo("QGstreamerPlayerSession - Loaded from settings flags: 0x%0X", flags);
+ }
+
g_object_set(G_OBJECT(m_playbin), "flags", flags, NULL);
@@ -154,7 +167,7 @@
+ if(settings.contains("playbin/audiosink-name"))
+ audioSinkName = settings.value("playbin/audiosink-name").toString();
+ GstElement *audioSink = gst_element_factory_make(audioSinkName.toStdString().c_str(), "audiosink");
-+ qInfo() << "Created audiosink " << audioSinkName;
++ qInfo() << "QGstreamerPlayerSession - Created audiosink " << audioSinkName;
+
if (audioSink) {
if (usePlaybinVolume()) {
|
|
Deleted |
_service:tar_git:qt5-qtmultimedia-5.6.2+git6+mer.5.6.20170930111536.14.gce8ef7d.tar.bz2
^
|
|
Added |
_service:tar_git:qt5-qtmultimedia-5.6.2+git6+mer.5.6.20170930165226.15.gee34dbf.tar.bz2
^
|