Changeset 666

Timestamp:

02/27/07 09:04:25 (3 years ago)

Author:

vasi

Message:

prepare for better meta-data handling

Location:

QTSplit

Files:

• QTChapter.m (modified) (1 diff)
• QTMovie+MetaData.m (modified) (8 diffs)
• QTSplit.xcodeproj/project.pbxproj (modified) (5 diffs)
• TestCase.m (modified) (2 diffs)

QTSplit/QTChapter.m

@@ -97 +97 @@
         [mov setEditable: NO];
     
-    [mov printMetaData];
 
     // Add meta-data to indicate title and track
     [mov setMetaData: [self name] forTag: QTMetaDataName];
-    [mov printMetaData];
     [mov setMetaData: [NSNumber numberWithInt: [self index] + 1]
         forTag: QTMetaDataTrackNum];

QTSplit/QTMovie+MetaData.m

@@ -8 +8 @@
 
 // This appears to be missing in Movies.h
-#define kQTMetaDataCommonKeyTrackNum 'trkn'
+#define kQTMetaDataUserDataKeyTrackNum 'trkn'
 
 /**** Private ****/
@@ -47 +47 @@
 static id getMetaData(QTMetaDataRef ref, OSType key);
 
+/* Sometimes when there's no metadata for a given key, QuickTime will just go
+ * nuts and give an error. This prevents those exceptions. */
+static id tryGetMetaData(QTMetaDataRef ref, OSType key);
+
 /* Check if data is an image which can be stored in metadata. If so, return
  * an appropriate data type for storing the image. Otherwise, return
@@ -60 +64 @@
 // Dict of regexes per pat
 static NSMutableDictionary *patDict = nil;
+
+// Get the proper format for a key
+
 
 
@@ -93 +100 @@
     // Custom types
     switch (key) {
-        case kQTMetaDataCommonKeyTrackNum: { // Fix up the old data
-            NSData *old = getMetaData(ref, key);
+        case kQTMetaDataUserDataKeyTrackNum: { // Fix up the old data
+            NSData *old = tryGetMetaData(ref, key);
             NSMutableData *new = old ? [[old mutableCopy] autorelease]
                 : [NSMutableData dataWithLength: 8];
@@ -151 +158 @@
     // Custom keys
     switch (key) {
-        case kQTMetaDataCommonKeyTrackNum:
+        case kQTMetaDataUserDataKeyTrackNum:
             return [NSNumber numberWithUnsignedInt: *(uint32_t*)[data bytes]];
     }
@@ -234 +241 @@
 }
 
+static id tryGetMetaData(QTMetaDataRef ref, OSType key) {
+    id ret;
+    @try {
+        ret = getMetaData(ref, key);
+    } @catch (NSException *exc) {
+        ret = nil;
+    }
+    return ret;
+}
+
 static id getMetaData(QTMetaDataRef ref, OSType key) {
     QTMetaDataItem item;
@@ -274 +291 @@
         addTag(QTMetaDataArtist,    kQTMetaDataCommonKeyArtist);
         addTag(QTMetaDataAlbum,     kQTMetaDataCommonKeyAlbum);
-        addTag(QTMetaDataTrackNum,  kQTMetaDataCommonKeyTrackNum);
+        addTag(QTMetaDataTrackNum,  kQTMetaDataUserDataKeyTrackNum);
         addTag(QTMetaDataCoverArt,  kQTMetaDataCommonKeyArtwork);
         actualTagDict = [d retain];
@@ -340 +357 @@
     
     QTMetaDataRemoveItemsWithKey(meta, kQTMetaDataStorageFormatQuickTime,
-        kQTMetaDataKeyFormatCommon, (UInt8*)&key, sizeof(key)); // Ignore errors
+        keyFormat, (UInt8*)&key, sizeof(key)); // Ignore errors
     
     QTMetaDataItem item;
     OSStatus err = QTMetaDataAddItem(meta, kQTMetaDataStorageFormatQuickTime,
-        kQTMetaDataKeyFormatCommon, (UInt8*)&key, sizeof(key),
+        keyFormat, (UInt8*)&key, sizeof(key),
         [data bytes], [data length], type, &item);
     if (err) [ErrorException raise: QTMovieMetaDataException status: err

QTSplit/QTSplit.xcodeproj/project.pbxproj

@@ -14 +14 @@
                 595DA4FF0B9407A500E14579 /* Tempfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 595DA4FC0B94078A00E14579 /* Tempfile.m */; };
                 596E1F9F0B9445D5006888A9 /* SaveChapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 596E1F9D0B9445D5006888A9 /* SaveChapter.m */; };
+                596E21010B945B0F006888A9 /* QTMovie+MetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = 592859180B9185CE007D691F /* QTMovie+MetaData.m */; };
+                596E21030B945B25006888A9 /* ErrorException.m in Sources */ = {isa = PBXBuildFile; fileRef = 592252230B5ED657003047FF /* ErrorException.m */; };
+                596E21040B945B2D006888A9 /* AGRegex.m in Sources */ = {isa = PBXBuildFile; fileRef = 59285CF40B922DFF007D691F /* AGRegex.m */; };
+                596E21050B945B35006888A9 /* libpcre.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 59285C8D0B9224D8007D691F /* libpcre.dylib */; };
+                596E210C0B945C02006888A9 /* NSString+MacTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E11E490B60B6EA002BF908 /* NSString+MacTypes.m */; };
                 599C82740B9295B2000864BE /* QTTime+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 592255880B5F19FA003047FF /* QTTime+Extensions.m */; };
                 599C82750B9295B3000864BE /* QTMovie+MetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = 592859180B9185CE007D691F /* QTMovie+MetaData.m */; };
@@ -108 +113 @@
                         buildActionMask = 2147483647;
                         files = (
+                                596E21050B945B35006888A9 /* libpcre.dylib in Frameworks */,
                                 595DA0800B937C8500E14579 /* QTKit.framework in Frameworks */,
                                 595DA0810B937C8600E14579 /* QuickTime.framework in Frameworks */,
@@ -335 +341 @@
                         files = (
                                 595DA08C0B937CB700E14579 /* TestCase.m in Sources */,
+                                596E21010B945B0F006888A9 /* QTMovie+MetaData.m in Sources */,
+                                596E21030B945B25006888A9 /* ErrorException.m in Sources */,
+                                596E21040B945B2D006888A9 /* AGRegex.m in Sources */,
+                                596E210C0B945C02006888A9 /* NSString+MacTypes.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -454 +464 @@
                                 PREBINDING = NO;
                                 PRODUCT_NAME = TestCase;
+                                USER_HEADER_SEARCH_PATHS = "$(value) $(SRCROOT)/AGRegex/pcre";
                                 ZERO_LINK = NO;
                         };
@@ -476 +487 @@
                                 PREBINDING = NO;
                                 PRODUCT_NAME = TestCase;
+                                USER_HEADER_SEARCH_PATHS = "$(value) $(SRCROOT)/AGRegex/pcre";
                                 ZERO_LINK = NO;
                         };

QTSplit/TestCase.m

@@ -1 @@
-#import <objc/objc-class.h>
-#import <QTKit/QTKit.h>
-
-#define Check(op) ({ \
-    OSStatus _err = (op); \
-    if (_err) [NSException raise: nil format: @"Err %d on line %d", \
-        _err, __LINE__]; \
-})
-
-static void setTitle(Movie mov) {
-    NSData *data = [@"test" dataUsingEncoding: NSUTF8StringEncoding];
-    OSType key = kQTMetaDataCommonKeyDisplayName;
-    
-    QTMetaDataRef meta;
-    Check(QTCopyMovieMetaData(mov, &meta));
-    Check(QTMetaDataAddItem(meta, kQTMetaDataStorageFormatQuickTime,
-        kQTMetaDataKeyFormatCommon, (UInt8*)&key, sizeof(key), [data bytes],
-        [data length], kQTMetaDataTypeUTF8, NULL));
-    QTMetaDataRelease(meta);
-}
-
-static void removeChapterTrack(Movie mov) {
-    long count = GetMovieTrackCount(mov);
-    
-    for (int i = 0; i < count; ++i) {
-        Track t = GetMovieIndTrack(mov, i + 1);
-        if (!GetTrackEnabled(t)) continue;
-        
-        Track chap = GetTrackReference(t, kTrackReferenceChapterList, 1);
-        if (chap) {
-            QTTrack *t1 = [QTTrack trackWithQuickTimeTrack: chap error: nil];
-            [t1 setTrack: nil];
-            DisposeMovieTrack(chap);
-            return;
-        }
-    }
-
-    [NSException raise: nil format: @"Can't find chapter track"];
-}
-
-static QTMovie *extractRange(QTMovie *src, QTTimeRange range) {
-        QTMovie *mov = [QTMovie movie];
-    printf("New movie has class %s\n", [mov class]->name);
-    
-    QTTime start = QTMakeTime(0, 1);
-    [mov setAttribute: [NSNumber numberWithBool: YES]
-        forKey: QTMovieEditableAttribute];
-        [mov insertSegmentOfMovie: src timeRange: range atTime: start];
-    
-    removeChapterTrack([mov quickTimeMovie]);
-    setTitle([mov quickTimeMovie]);
-        return mov;
-}
-
+#import "QTMovie+MetaData.h"
 
 /* Usage: ./TestCase mov.m4a
@@ -67 +14 @@
         [err code], [err localizedDescription]];
     
-    for (int i = 0; i < 10; ++i) {
-        QTTimeRange range = QTMakeTimeRange(QTMakeTime(i, 1), QTMakeTime(1, 1));
-        extractRange(src, range);
-    }
+    [src printMetaData];
     
     [pool release];