Changeset 1310

Timestamp:

05/23/10 00:08:22 (2 years ago)

Author:

astrange

Message:

Import WebM files.

Doesn't decode VP8 yet so we can't claim actual support.

Location:

trunk

Files:

• CodecIDs.h (modified) (1 diff)
• MatroskaCodecIDs.cpp (modified) (1 diff)
• MatroskaImport.r (modified) (4 diffs)
• MatroskaImportPrivate.cpp (modified) (1 diff)
• Plists/PerianOpener-Info.plist (modified) (4 diffs)

trunk/CodecIDs.h

@@ -84 +84 @@
         kVideoFormatIndeo2                      = 'RT21',
         kVideoFormatIndeo3                      = 'IV32',
+        kVideoFormatVP8                         = 'VP80',
         
         kAudioFormatFlashADPCM                  = 'FlAd',

trunk/MatroskaCodecIDs.cpp

@@ -814 +814 @@
         { kVideoFormatXiphTheora, "V_THEORA" },
         { kVideoFormatSnow, "V_SNOW" },
+        { kVideoFormatVP8, "V_VP8" },
         
         { kAudioFormatMPEG4AAC, "A_AAC" },

trunk/MatroskaImport.r

@@ -195 +195 @@
 };
 
+// Component Alias
+resource 'thga' (518) {
+        'eat ',                                                         // Type
+        'WEBM',                                                         // Subtype - this must be in uppercase. It will match an ".eim" suffix case-insensitively.
+        'vide',                                                         // Manufaturer - for 'eat ' the media type supported by the component
+        kMatroskaImportFlags |                          // Component Flags
+        movieImportSubTypeIsFileExtension,      // The subtype is a file name suffix
+        0,                                                                      // Component Flags Mask
+        0,                                                                      // Code Type
+        0,                                                                      // Code ID
+        'STR ',                                                         // Name Type
+        kMkvImportResource,                                                             // Name ID
+        0,                                                                      // Info Type
+        0,                                                                      // Info ID 
+        0,                                                                      // Icon Type 
+        0,                                                                      // Icon ID
+    // TARGET COMPONENT ---------------
+        'eat ',                                                         // Type
+        'MkvF',                                                         // SubType
+        'vide',                                                         // Manufaturer
+        0,                                                                      // Component Flags
+        0,                                                                      // Component Flags Mask
+        'thnr', kMkvImportResource,                                             // Component public resource identifier
+        cmpAliasOnlyThisFile
+};
+
 // Import components should include a public component resource holding the same data that
 // MovieImportGetMIMETypeList would return. This public resource's type and ID should be 'mime' and 1,
@@ -263 +289 @@
                 {
                         "Matroska file",                                // Media type description for MIME configuration panel and browser
-                        "mkv,mka",                                                              // File extension(s), comma delimited if more than one
+                        "mkv,mka,webm",                                                         // File extension(s), comma delimited if more than one
                         "QuickTime Player",                                     // Opening application name for MIME configuration panel and browser
                         "Matroska Movie Importer",      // Missing software description for the missing software dialog
@@ -272 +298 @@
                 {
                         "video/x-matroska",
-                        "audio/x-matroska",     
+                        "audio/x-matroska",
+            "audio/webm",
+            "video/webm",
                 },
         }
@@ -292 +320 @@
                 kMimeInfoMimeTypeTag,      1, "video/x-matroska";
                 kMimeInfoMimeTypeTag,      2, "audio/x-matroska";
+        kMimeInfoMimeTypeTag,      3, "audio/webm";
+        kMimeInfoMimeTypeTag,      4, "video/webm";
                 kMimeInfoFileExtensionTag, 1, "mkv";
                 kMimeInfoFileExtensionTag, 2, "mka";
+        kMimeInfoFileExtensionTag, 3, "webm";
+        kMimeInfoFileExtensionTag, 4, "webm";
                 kMimeInfoDescriptionTag,   1, "Matroska";
                 kMimeInfoDescriptionTag,   2, "Matroska";
+        kMimeInfoDescriptionTag,   3, "Matroska/WebM";
+        kMimeInfoDescriptionTag,   4, "Matroska/WebM";
         };
 };

trunk/MatroskaImportPrivate.cpp

@@ -75 +75 @@
                 
                 EDocType docType = GetChild<EDocType>(*head);
-                if (string(docType) != "matroska") {
+                if (string(docType) != "matroska" && string(docType) != "webm") {
                         Codecprintf(NULL, "Not a Matroska file\n");
                         valid = false;

trunk/Plists/PerianOpener-Info.plist

@@ -56 +56 @@
                                 <string>mkv</string>
                                 <string>mka</string>
+                                <string>webm</string>
                         </array>
                         <key>CFBundleTypeMIMETypes</key>
@@ -61 +62 @@
                                 <string>video/x-matroska</string>
                                 <string>audio/x-matroska</string>
+                                <string>video/webm</string>
+                                <string>audio/webm</string>
                         </array>
                         <key>CFBundleTypeName</key>
@@ -68 +71 @@
                                 <string>MKV </string>
                                 <string>MKA </string>
+                                <string>WEBM</string>
                         </array>
                         <key>CFBundleTypeRole</key>
@@ -259 +263 @@
                                         <string>mkv</string>
                                         <string>mka</string>
+                                        <string>webm</string>
                                 </array>
                         </dict>