From 5659fd58390ac8b30e843ce0a680f63a0dcc0fff Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Fri, 8 Jan 2021 22:38:37 +0100
Subject: [PATCH] Use mimetype instead of description from stream discoverer
 when available

---
 src/engine/gstengine.cpp | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index 1f040a6c4..7541db02f 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -930,15 +930,36 @@ void GstEngine::StreamDiscovered(GstDiscoverer*, GstDiscovererInfo *info, GError
     bundle.bitrate = gst_discoverer_audio_info_get_bitrate(GST_DISCOVERER_AUDIO_INFO(stream_info)) / 1000;
 
     GstCaps *caps = gst_discoverer_stream_info_get_caps(stream_info);
-    gchar *codec_description = gst_pb_utils_get_codec_description(caps);
-    QString filetype_description = (codec_description ? QString(codec_description) : QString("Unknown"));
-    g_free(codec_description);
+
+    const guint caps_size = gst_caps_get_size(caps);
+    for (guint i = 0; i < caps_size; ++i) {
+      GstStructure *gst_structure = gst_caps_get_structure(caps, i);
+      if (!gst_structure) continue;
+      QString mimetype = gst_structure_get_name(gst_structure);
+      if (!mimetype.isEmpty() && mimetype != "audio/mpeg") {
+        bundle.filetype = Song::FiletypeByMimetype(mimetype);
+        if (bundle.filetype == Song::FileType_Unknown) {
+          qLog(Error) << "Unknown mimetype" << mimetype;
+        }
+      }
+    }
+
+    if (bundle.filetype == Song::FileType_Unknown) {
+      gchar *codec_description = gst_pb_utils_get_codec_description(caps);
+      QString filetype_description = (codec_description ? QString(codec_description) : QString());
+      g_free(codec_description);
+      if (!filetype_description.isEmpty()) {
+        bundle.filetype = Song::FiletypeByDescription(filetype_description);
+        if (bundle.filetype == Song::FileType_Unknown) {
+          qLog(Error) << "Unknown filetype" << filetype_description;
+        }
+      }
+    }
 
     gst_caps_unref(caps);
     gst_discoverer_stream_info_list_free(audio_streams);
 
-    bundle.filetype = Song::FiletypeByDescription(filetype_description);
-    qLog(Info) << "Got stream info for" << discovered_url + ":" << filetype_description;
+    qLog(Info) << "Got stream info for" << discovered_url + ":" << Song::TextForFiletype(bundle.filetype);
 
     emit instance->MetaData(bundle);