Added codecs and formats blacklist in MultiSink. Disabled slow an con…

…flictive codecs. Fixed memory leak with FFmpeg when recording.
webcamoid · Feb 18, 2017 · 9fb7d9c · 9fb7d9c
1 parent 39c3690
commit 9fb7d9c
Show file tree

Hide file tree

Showing 15 changed files with 388 additions and 136 deletions.
diff --git a/StandAlone/src/recording.cpp b/StandAlone/src/recording.cpp
@@ -96,6 +96,10 @@ Recording::Recording(QQmlApplicationEngine *engine, QObject *parent):
                          SIGNAL(supportedFormatsChanged(const QStringList &)),
                          this,
                          SLOT(supportedFormatsUpdated(const QStringList &)));
+        QObject::connect(this->m_record.data(),
+                         SIGNAL(supportedFormatsChanged(const QStringList &)),
+                         this,
+                         SLOT(updateFormat()));
         QObject::connect(this->m_record.data(),
                          SIGNAL(codecLibChanged(const QString &)),
                          this,
@@ -491,8 +495,16 @@ void Recording::capsUpdated()
     this->loadStreams(format);
 }
 
-void Recording::updateFormat(const QString &codecLib)
+void Recording::updateFormat()
 {
+    if (!this->m_record)
+        return;
+
+    auto codecLib = this->m_record->property("codecLib").toString();
+
+    if (codecLib.isEmpty())
+        return;
+
     this->setFormat(codecLib == "gstreamer"? "webmmux": "webm");
 }
 

diff --git a/StandAlone/src/recording.h b/StandAlone/src/recording.h
@@ -135,7 +135,7 @@ class Recording: public QObject
         void supportedFormatsUpdated(const QStringList &availableFormats);
         void userControlsUpdated(const QVariantMap &userControls);
         void capsUpdated();
-        void updateFormat(const QString &codecLib);
+        void updateFormat();
         void loadProperties();
         void loadFormatOptions(const QString &format);
         void loadStreams(const QString &format);

diff --git a/libAvKys/Plugins/FrameOverlap/src/frameoverlapelement.cpp b/libAvKys/Plugins/FrameOverlap/src/frameoverlapelement.cpp
@@ -146,12 +146,16 @@ AkPacket FrameOverlapElement::iStream(const AkPacket &packet)
                 n++;
             }
 
-            r /= n;
-            g /= n;
-            b /= n;
-            a /= n;
-
-            dstBits[x] = qRgba(r, g, b, a);
+            if (n > 0) {
+                r /= n;
+                g /= n;
+                b /= n;
+                a /= n;
+
+                dstBits[x] = qRgba(r, g, b, a);
+            } else {
+                dstBits[x] = qRgba(0, 0, 0, 0);
+            }
         }
     }
 

diff --git a/libAvKys/Plugins/MultiSink/share/qml/CodecControl.qml b/libAvKys/Plugins/MultiSink/share/qml/CodecControl.qml
@@ -60,6 +60,8 @@ GridLayout {
                 description: description
             });
         }
+
+        cbxMenu.currentIndex = currentMenuIndex(controlParams);
     }
 
     function currentMenuIndex(controlParams)
@@ -214,7 +216,6 @@ GridLayout {
             id: menuModel
         }
         textRole: "description"
-        currentIndex: currentMenuIndex(controlParams)
         Layout.fillWidth: true
         visible: false
 

diff --git a/libAvKys/Plugins/MultiSink/share/qml/main.qml b/libAvKys/Plugins/MultiSink/share/qml/main.qml
@@ -80,11 +80,17 @@ ColumnLayout {
                     MultiSink.supportedCodecs(MultiSink.outputFormat,
                                               streamCaps.mimeType)
 
-            for (var codec in supportedCodecs)
-                streamOptions.codecList.append({codec: supportedCodecs[codec],
-                                                description: supportedCodecs[codec]
-                                                             + " - "
-                                                             + MultiSink.codecDescription(supportedCodecs[codec])})
+            for (var codec in supportedCodecs) {
+                var codecName = supportedCodecs[codec];
+                var codecDescription = MultiSink.codecDescription(supportedCodecs[codec]);
+                var description = codecName;
+
+                if (codecDescription.length > 0)
+                    description += " - " + codecDescription;
+
+                streamOptions.codecList.append({codec: codecName,
+                                                description: description});
+            }
 
             streamOptions.codec = streamConfig.codec
 
@@ -166,11 +172,18 @@ ColumnLayout {
             id: lstOutputFormats
         }
 
-        onCurrentIndexChanged: MultiSink.outputFormat = lstOutputFormats.get(currentIndex).format
+        onCurrentIndexChanged: {
+            var opt = lstOutputFormats.get(currentIndex);
+
+            if (opt)
+                MultiSink.outputFormat = opt.format
+        }
     }
     TextField {
         visible: !MultiSink.showFormatOptions
-        text: lstOutputFormats.get(cbxOutputFormats.currentIndex).description
+        text: lstOutputFormats.get(cbxOutputFormats.currentIndex)?
+                  lstOutputFormats.get(cbxOutputFormats.currentIndex).description:
+                  ""
         readOnly: true
         Layout.fillWidth: true
     }