Changeset 1015

Timestamp:

01/19/09 18:50:57 (1 year ago)

Author:

gbooker

Message:

Check for existence of force subtitles, and import them as a separate track (with it given priority over total subtitles)

Files:

• trunk/Subtitles/SubImport.mm (modified) (4 diffs)

trunk/Subtitles/SubImport.mm

@@ -744 +744 @@
-}
-
-
+, uint8_t *forced
-        // to set whether the key sequences 0x01 - 0x02 have been seen
-        Boolean loop = TRUE;
-        *startTime = *endTime = 0;
+        *forced = 0;
-
-        int controlOffset = (packet[2] << 8) + packet[3];
@@ -760 +761 @@
-                        switch (controlSeq[i]) {
-                                case 0x00:
-// subpicture identifier, we don't care
+*forced = 1;
-                                        i++;
-                                        break;
@@ -815 +816 @@
-                }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-typedef enum {
@@ -933 +1047 @@
-                while((track = [trackEnum nextObject]) != nil)
-                {
-
-
-
+
+
+
+
+
-                        {
-
-
+
+
+
+
+
+
-                        }
-                        
-                        int sampleCount = [track->samples count];
-                        int totalSamples = sampleCount;
-                        SampleReference64Ptr samples = (SampleReference64Ptr)calloc(sampleCount*2, sizeof(SampleReference64Record));
-                        SampleReference64Ptr sample = samples;
-                        int i;
-                        uint32_t lastTime = 0;
-                        for(i=0; i<sampleCount; i++)
-                        {
-                                VobSubSample *currentSample = [track->samples objectAtIndex:i];
-                                int offset = currentSample->fileOffset;
-                                int nextOffset;
-                                if(i == sampleCount - 1)
-                                        nextOffset = subFileSize;
-                                else
-                                        nextOffset = ((VobSubSample *)[track->samples objectAtIndex:i+1])->fileOffset;
-                                int size = nextOffset - offset;
-                                if(size < 0)
-                                        //Skip samples for which we cannot determine size
-                                        continue;
-                                
-                                NSData *subData = [subFileData subdataWithRange:NSMakeRange(offset, size)];
-                                uint8_t *extracted = (uint8_t *)malloc(size);
-                                int extractedSize = ExtractVobSubPacket(extracted, (const UInt8 *)[subData bytes], size, &size);
-                                
-                                uint16_t startTimestamp, endTimestamp;
-                                ReadPacketTimes(extracted, extractedSize, &startTimestamp, &endTimestamp);
-                                free(extracted);
-                                uint32_t startTime = currentSample->timeStamp + startTimestamp;
-                                uint32_t endTime = currentSample->timeStamp + endTimestamp;
-                                int duration = endTimestamp - startTimestamp;
-                                if(duration <= 0)
-                                        //Skip samples which are broken
-                                        continue;
-                                if(i == 0)
-                                        currentSample->timeStamp = startTime;
-                                else if(lastTime != startTime)
-                                {
-                                        //insert a sample with no real data, to clear the subs
-                                        memset(sample, 0, sizeof(SampleReference64Record));
-                                        sample->durationPerSample = startTime - lastTime;
-                                        sample->numberOfSamples = 1;
-                                        sample->dataSize = 1;
-                                        totalSamples++;
-                                        sample++;
-                                }
-                                
-                                sample->dataOffset.hi = 0;
-                                sample->dataOffset.lo = offset;
-                                sample->dataSize = size;
-                                sample->sampleFlags = 0;
-                                sample->durationPerSample = duration;
-                                sample->numberOfSamples = 1;
-                                lastTime = endTime;
-                                
-                                sample++;
-                        }
-                        AddMediaSampleReferences64(trackMedia, (SampleDescriptionHandle)imgDesc, totalSamples, samples, NULL);
-                        free(samples);
-                        NSString *langStr = track->language;
-                        int lang = langUnspecified;
-                        if([langStr length] == 3)
-                        {
-                                char langCStr[4] = "";
-                                
-                                CFStringGetCString((CFStringRef)langStr, langCStr, 4, kCFStringEncodingASCII);
-                                lang = ISO639_2ToQTLangCode(langCStr);
-                        }
-                        else if([langStr length] == 2)
-                        {
-                                char langCStr[3] = "";
-                                
-                                CFStringGetCString((CFStringRef)langStr, langCStr, 3, kCFStringEncodingASCII);
-                                lang = ISO639_1ToQTLangCode(langCStr);                          
-                        }
-                        SetMediaLanguage(trackMedia, lang);
-                        
-                        TimeValue mediaDuration = GetMediaDuration(trackMedia);
-                        TimeValue movieTimeScale = GetMovieTimeScale(theMovie);
-                        Track theTrack = GetMediaTrack(trackMedia);
-                        VobSubSample *firstSample = [track->samples objectAtIndex:0];
-                        err = InsertMediaIntoTrack(theTrack, (firstSample->timeStamp * movieTimeScale)/1000, 0, mediaDuration, fixed1);
-                        if (*firstSubTrack == NULL)
-                                *firstSubTrack = theTrack;