Changeset 586

Timestamp:

06/20/07 01:56:13 (1 year ago)

Author:

dconrad

Message:

Support for VobSubs? compressed by zlib. Closes #31 for all common files

Files:

• trunk/CodecIDs.h (modified) (1 diff)
• trunk/MatroskaCodecIDs.cpp (modified) (2 diffs)
• trunk/MatroskaImport.h (modified) (2 diffs)
• trunk/MatroskaImportPrivate.cpp (modified) (2 diffs)
• trunk/VobSubCodec.c (modified) (6 diffs)

trunk/CodecIDs.h

@@ -57 +57 @@
-        kSampleDescriptionExtensionVobSubIdx = '.IDX',
-        kSampleDescriptionExtensionReal = 'RVex',
+        kSampleDescriptionExtensionMKVCompression = 'Comp',
-};
-

trunk/MatroskaCodecIDs.cpp

@@ -27 +27 @@
-#include <matroska/KaxTracks.h>
-#include <matroska/KaxTrackEntryData.h>
-#include <matroska/KaxContentEncoding.h>
-#include "MatroskaCodecIDs.h"
-#include "CommonUtils.h"
@@ -736 +735 @@
-        string codecString(*tr_codec);
-        
-        // how should we handle compressed tracks in general?
-        KaxContentEncodings *contentEncs = FindChild<KaxContentEncodings>(*tr_entry);
-        if (contentEncs) {
-                OSType subtype = 0;
-                for (int i = 0; i < sizeof(kMatroskaCodecIDs) / sizeof(MatroskaQT_Codec); i++) {
-                        if (codecString == kMatroskaCodecIDs[i].mkvID)
-                                subtype = kMatroskaCodecIDs[i].cType;
-                }
-                return 'COMP';
-        }
-        
-        if (codecString == MKV_V_MS) {
-                // avi compatibility mode, 4cc is in private info

trunk/MatroskaImport.h

@@ -41 +41 @@
-#include <matroska/KaxBlock.h>
-#include <matroska/KaxAttachments.h>
+#include <matroska/KaxContentEncoding.h>
-
-using namespace libmatroska;
@@ -227 +228 @@
-        ComponentResult ReadMetaSeek(KaxSeekHead &seekHead);
-        
+        // Adds a sample description extension if the content is compressed
+        // should only be the case for VobSub data.
+        ComponentResult ReadContentEncodings(KaxContentEncodings &encodings, MatroskaTrack &mkvTrack);
+        
-        // These three are called from ReadTracks to set up a track of the specific type, 
-        // modifying the MatroskaTrack structure to reflect the newly create track. 

trunk/MatroskaImportPrivate.cpp

@@ -287 +287 @@
-                        KaxTrackLanguage & trackLang = GetChild<KaxTrackLanguage>(track);
-                        KaxTrackName & trackName = GetChild<KaxTrackName>(track);
+                        KaxContentEncodings * encodings = FindChild<KaxContentEncodings>(track);
+                        
+                        if (encodings) {
+                                err = ReadContentEncodings(*encodings, mkvTrack);
+                                // just ignore the track if there's some problem with this element
+                                if (err) continue;
+                        }
-                        
-                        long qtLang = ISO639_2ToQTLangCode(string(trackLang).c_str());
@@ -331 +338 @@
-}
-
+ComponentResult MatroskaImport::ReadContentEncodings(KaxContentEncodings &encodings, MatroskaTrack &mkvTrack)
+{
+        KaxContentEncoding & encoding = GetChild<KaxContentEncoding>(encodings);
+        int scope = uint32(GetChild<KaxContentEncodingScope>(encoding));
+        int type = uint32(GetChild<KaxContentEncodingType>(encoding));
+        
+        if (scope != 1) {
+                Codecprintf(NULL, "Content encoding scope of %d not expected\n", scope);
+                return -1;
+        }
+        if (type != 0) {
+                Codecprintf(NULL, "Encrypted track\n");
+                return -2;
+        }
+        
+        KaxContentCompression & comp = GetChild<KaxContentCompression>(encoding);
+        int algo = uint32(GetChild<KaxContentCompAlgo>(comp));
+        
+        if (algo != 0)
+                Codecprintf(NULL, "MKV: warning, track compression algorithm %d not zlib\n", algo);
+        
+        if ((*mkvTrack.desc)->dataFormat != kSubFormatVobSub)
+                Codecprintf(NULL, "MKV: warning, compressed track %4.4s probably won't work (not VobSub)\n", &(*mkvTrack.desc)->dataFormat);
+        
+        Handle ext = NewHandle(1);
+        **ext = algo;
+        
+        if (mkvTrack.type == track_audio)
+                AddSoundDescriptionExtension((SoundDescriptionHandle)mkvTrack.desc, ext, kSampleDescriptionExtensionMKVCompression);
+        else
+                AddImageDescriptionExtension((ImageDescriptionHandle)mkvTrack.desc, ext, kSampleDescriptionExtensionMKVCompression);
+        
+        return noErr;
+}
+
-ComponentResult MatroskaImport::AddVideoTrack(KaxTrackEntry &kaxTrack, MatroskaTrack &mkvTrack)
-{

trunk/VobSubCodec.c

@@ -11 +11 @@
-#include "VobSubCodec.h"
-#include "Codecprintf.h"
+#include <zlib.h>
+#include "avcodec.h"
+#include "intreadwrite.h"
-
-// Constants
@@ -26 +29 @@
-        
-        uint8_t                                 *codecData;
-
+
+
-} VobSubCodecGlobalsRecord, *VobSubCodecGlobals;
-
@@ -232 +236 @@
-    SetupColorPalette(glob, p->imageDescription);
-
+        if (isImageDescriptionExtensionPresent(p->imageDescription, kSampleDescriptionExtensionMKVCompression))
+                glob->compressed = 1;
+        
-        return noErr;
-}
@@ -265 +272 @@
-}
-
+void DecompressZlib(VobSubCodecGlobals glob, uint8_t *data, int bufferSize)
+{
+        ComponentResult err = noErr;
+        z_stream strm;
+        strm.zalloc = Z_NULL;
+        strm.zfree = Z_NULL;
+        strm.opaque = Z_NULL;
+        strm.avail_in = 0;
+        strm.next_in = Z_NULL;
+        err = inflateInit(&strm);
+        if (err != Z_OK) return;
+        
+        strm.avail_in = bufferSize;
+        strm.next_in = data;
+        
+        // first, get the size of the decompressed data
+        strm.avail_out = 2;
+        strm.next_out = glob->codecData;
+        
+        err = inflate(&strm, Z_SYNC_FLUSH);
+        if (err < Z_OK) goto bail;
+        if (strm.avail_out != 0) goto bail;
+        
+        glob->codecData = av_fast_realloc(glob->codecData, &glob->bufferSize, AV_RB16(glob->codecData));
+        
+        // then decompress the rest of it
+        strm.avail_out = glob->bufferSize - 2;
+        strm.next_out = glob->codecData + 2;
+        
+        inflate(&strm, Z_SYNC_FLUSH);
+bail:
+        inflateEnd(&strm);
+}
+
-pascal ComponentResult VobSubCodecDecodeBand(VobSubCodecGlobals glob, ImageSubCodecDecompressRecord *drp, unsigned long flags)
-{
@@ -271 +312 @@
-        
-        if (glob->codecData == NULL) {
-
-
+ + 2
+ + 2
-        }
-        
-
-
-
-
-
-
+
+
+
+
-    // the header of a spu PS packet starts 0x000001bd
-    // if it's raw spu data, the 1st 2 bytes are the length of the data
-
+else 
-                // remove the MPEG framing
-                ExtractData(glob->codecData, data, myDrp->bufferSize);
@@ -318 +357 @@
-        memset(drp->baseAddr, 0, myDrp->height * drp->rowBytes);
-        
-myDrp
+glob
-                // invalid packet, not enough data
-                return err;