[-]
[+]
|
Changed |
_service:tar_git:qtmultimedia.spec
|
|
[-]
[+]
|
Changed |
_service:tar_git:001-configure-pipeline-properties.patch
^
|
@@ -103,14 +103,14 @@
+
+ QString playbinElementName = QT_GSTREAMER_PLAYBIN_ELEMENT_NAME;
+ if(settings.contains("playbin/playbin-name"))
-+ playbinElementName = settings.value("playbin/playbin-name");
-+ m_playbin = gst_element_factory_make(playbinElementName, NULL);
++ playbinElementName = settings.value("playbin/playbin-name").toString();
++ m_playbin = gst_element_factory_make(playbinElementName.c_str(), NULL);
+ qInfo() << "QGstreamerPlayerSession - created " << playbinElementName;
+
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,45 @@
+@@ -156,16 +166,46 @@
int flags = GST_PLAY_FLAG_VIDEO | GST_PLAY_FLAG_AUDIO;
QByteArray envFlags = qgetenv("QT_GSTREAMER_PLAYBIN_FLAGS");
if (!envFlags.isEmpty()) {
@@ -141,8 +141,9 @@
+ qInfo() << "Loaded from settings ring-buffer-max-size=" << ringBufferMaxSize;
+ }
+ if(settings.contains("playbin/flags")) {
++ QString flagsString = settings.value("playbin/flags").toString();
+ bool ok;
-+ flags = settings.value("playbin/flags").toInt(&ok,0);
++ flags = flagsString.toInt(&ok, 0);
+ qInfo() << "Loaded from settings flags: 0x" << std::hex << flags;
+ }
+
@@ -151,8 +152,8 @@
- GstElement *audioSink = gst_element_factory_make("autoaudiosink", "audiosink");
+ QString audioSinkName = "autoaudiosink";
+ if(settings.contains("playbin/audiosink-name"))
-+ audioSinkName = settings.value("playbin/audiosink-name");
-+ GstElement *audioSink = gst_element_factory_make(audioSinkName, "audiosink");
++ audioSinkName = settings.value("playbin/audiosink-name").toString();
++ GstElement *audioSink = gst_element_factory_make(audioSinkName.c_str(), "audiosink");
+ qInfo() << "Created audiosink " << audioSinkName;
+
if (audioSink) {
|
|
Deleted |
_service:tar_git:qt5-qtmultimedia-5.6.2+git6+mer.5.6.20170930095722.10.gff16d55.tar.bz2
^
|
|
Added |
_service:tar_git:qt5-qtmultimedia-5.6.2+git6+mer.5.6.20170930102316.11.g1f251db.tar.bz2
^
|