Changeset 7bf6bb1364 in mythtv

Timestamp:

Feb 13, 2015, 8:48:24 PM (10 years ago)

Author:

Stuart Morgan <smorgan@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

5e16d5788

Parents:

e254a029ea

git-author:

Stuart Morgan <smorgan@…> (02/13/15 20:48:24)

git-committer:

Stuart Morgan <smorgan@…> (02/13/15 20:48:48)

Message:

HTTP: Use correct mimetypes for MPEG2 PS/TS

Per RFC3555 and the Annex to ISO/IEC 13818-1

​https://tools.ietf.org/html/rfc3555#page-38
​https://www.ietf.org/mail-archive/web/ietf-types/current/msg01593.html

DLNA has it's own ideas about the correct mimetype, so we have to
override the HTTP mimetype in the UPnP code.

Location:

mythtv

Files:

• libs/libmythupnp/httprequest.cpp (modified) (3 diffs)
• programs/mythbackend/upnpcdstv.cpp (modified) (3 diffs)
• programs/mythbackend/upnpcdsvideo.cpp (modified) (1 diff)

mythtv/libs/libmythupnp/httprequest.cpp

@@ -112 +112 @@
     { "asf" , "video/x-ms-asf"             },
     { "avi" , "video/x-msvideo"            }, // Also video/avi
+    { "m2p" , "video/mp2p"                 }, // RFC 3555
     { "m4v" , "video/mp4"                  },
-    { "mpeg", "video/mpeg"                 },
-    { "mpeg2","video/mpeg"                 },
-    { "mpg" , "video/mpeg"                 },
-    { "mpg2", "video/mpeg"                 },
+    { "mpeg", "video/mp2p"                 }, // RFC 3555
+    { "mpeg2","video/mp2p"                 }, // RFC 3555
+    { "mpg" , "video/mp2p"                 }, // RFC 3555
+    { "mpg2", "video/mp2p"                 }, // RFC 3555
     { "mov" , "video/quicktime"            },
     { "mp4" , "video/mp4"                  },
@@ -122 +123 @@
     { "nuv" , "video/nupplevideo"          },
     { "ogv" , "video/ogg"                  }, // Defined: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-    { "ts"  , "video/mp2t"                 },
-    { "vob" , "video/mpeg"                 },
+    { "ps"  , "video/mp2p"                 }, // RFC 3555
+    { "ts"  , "video/mp2t"                 }, // RFC 3555
+    { "vob" , "video/mpeg"                 }, // Also video/dvd
     { "wmv" , "video/x-ms-wmv"             }
 };
@@ -1100 +1102 @@
 
             if ( sHex == "000001ba44000400" )  // MPEG2 PS
-                sMIME = "video/mpeg";
+                sMIME = "video/mp2p";
 
             if ( head == "MythTVVi" )

mythtv/programs/mythbackend/upnpcdstv.cpp

@@ -1220 +1220 @@
         {
             sContainer = "NUV";
-            if (sMimeType == "video/mpeg")
+            if (sMimeType == "video/mp2p")
             {
                 if (bTranscoded) // Transcoded mpeg will probably be in a PS container
                     sContainer = "MPEG2-PS";
-                else
+                else // For temporary backwards compatibility with old file naming
                     sContainer = "MPEG2-TS"; // 99% of recordings will be in MPEG-2 TS containers before transcoding
             }
             else if (sMimeType == "video/mp2t")
             {
-                sMimeType == "video/mpeg";
+                sMimeType == "video/mp2p";
                 sContainer = "MPEG2-TS";
             }
@@ -1237 +1237 @@
         if (sVideoCodec.isEmpty())
         {
-            if (sMimeType == "video/mpeg" || sMimeType == "video/mp2t")
+            if (sMimeType == "video/mp2p" || sMimeType == "video/mp2t")
                 sVideoCodec = (nVideoProps & VID_AVC) ? "H264" : "MPEG2VIDEO";
             else if (sMimeType == "video/mp4")
@@ -1243 +1243 @@
         }
 
-        // DLNA requires a mimetype of video/mpeg for TS files, it's not the
+        // DLNA requires a mimetype of video/mp2p for TS files, it's not the
         // correct mimetype, but then DLNA doesn't seem to care about such
         // things
-        if (sMimeType == "video/mp2t")
+        if (sMimeType == "video/mp2t" || sMimeType == "video/mp2p")
             sMimeType = "video/mpeg";
 

mythtv/programs/mythbackend/upnpcdsvideo.cpp

@@ -816 +816 @@
         resURI.addQueryItem("Id", QString::number(nVidID));
 
-        // DLNA requires a mimetype of video/mpeg for TS files, it's not the
+        // DLNA requires a mimetype of video/mp2p for TS files, it's not the
         // correct mimetype, but then DLNA doesn't seem to care about such
         // things
-        if (sMimeType == "video/mp2t")
+        if (sMimeType == "video/mp2t" || sMimeType == "video/mp2p")
             sMimeType = "video/mpeg";