demux: adaptive: move mime to format conversion

modules/demux/adaptive/StreamFormat.cpp

@@ -23,6 +23,7 @@
 #endif
 
 #include "StreamFormat.hpp"
+#include <algorithm>
 
 using namespace adaptive;
 
@@ -58,6 +59,26 @@ StreamFormat::StreamFormat( unsigned formatid_ )
     formatid = formatid_;
 }
 
+StreamFormat::StreamFormat( const std::string &mimetype )
+{
+    std::string mime = mimetype;
+    std::transform(mime.begin(), mime.end(), mime.begin(), ::tolower);
+    std::string::size_type pos = mime.find("/");
+    formatid = UNSUPPORTED;
+    if(pos != std::string::npos)
+    {
+        std::string tail = mime.substr(pos + 1);
+        if(tail == "mp4")
+            formatid = StreamFormat::MP4;
+        else if (tail == "mp2t")
+            formatid = StreamFormat::MPEG2TS;
+        else if (tail == "vtt")
+            formatid = StreamFormat::WEBVTT;
+        else if (tail == "ttml+xml")
+            formatid = StreamFormat::TTML;
+    }
+}
+
 StreamFormat::~StreamFormat()
 {
 

modules/demux/adaptive/StreamFormat.hpp

@@ -37,6 +37,7 @@ namespace adaptive
             static const unsigned UNKNOWN     = 0xFF; /* will probe */
 
             StreamFormat( unsigned = UNSUPPORTED );
+            explicit StreamFormat( const std::string &mime );
             ~StreamFormat();
             operator unsigned() const;
             std::string str() const;

modules/demux/adaptive/plumbing/Demuxer.cpp

@@ -27,6 +27,7 @@
 #include <vlc_stream.h>
 #include <vlc_demux.h>
 #include "SourceStream.hpp"
+#include "../StreamFormat.hpp"
 #include "CommandsQueue.hpp"
 #include "../ChunksSource.hpp"
 

modules/demux/dash/mpd/AdaptationSet.cpp

@@ -46,7 +46,7 @@ AdaptationSet::~AdaptationSet()
 StreamFormat AdaptationSet::getStreamFormat() const
 {
     if(!getMimeType().empty())
-        return MPD::mimeToFormat(getMimeType());
+        return StreamFormat(getMimeType());
     else
         return BaseAdaptationSet::getStreamFormat();
 }

modules/demux/dash/mpd/MPD.cpp

@@ -65,24 +65,6 @@ Profile MPD::getProfile() const
     return profile;
 }
 
-StreamFormat MPD::mimeToFormat(const std::string &mime)
-{
-    std::string::size_type pos = mime.find("/");
-    if(pos != std::string::npos)
-    {
-        std::string tail = mime.substr(pos + 1);
-        if(tail == "mp4")
-            return StreamFormat(StreamFormat::MP4);
-        else if (tail == "mp2t")
-            return StreamFormat(StreamFormat::MPEG2TS);
-        else if (tail == "vtt")
-            return StreamFormat(StreamFormat::WEBVTT);
-        else if (tail == "ttml+xml")
-            return StreamFormat(StreamFormat::TTML);
-    }
-    return StreamFormat();
-}
-
 void MPD::debug()
 {
     msg_Dbg(p_object, "MPD profile=%s mediaPresentationDuration=%" PRId64

modules/demux/dash/mpd/MPD.h

@@ -48,8 +48,6 @@ namespace dash
                 virtual bool                    isLive() const;
                 virtual void                    debug();
 
-                static StreamFormat             mimeToFormat(const std::string &);
-
                 Property<ProgramInformation *>      programInfo;
 
             private:

modules/demux/dash/mpd/Representation.cpp

@@ -51,9 +51,9 @@ Representation::~Representation ()
 StreamFormat Representation::getStreamFormat() const
 {
     if(getMimeType().empty())
-        return MPD::mimeToFormat(adaptationSet->getMimeType());
+        return StreamFormat(adaptationSet->getMimeType());
     else
-        return MPD::mimeToFormat(getMimeType());
+        return StreamFormat(getMimeType());
 }
 
 TrickModeType*      Representation::getTrickModeType        () const