Changeset 1000

Timestamp:

12/19/08 19:27:50 (1 year ago)

Author:

gbooker

Message:

• Added field to ExtractVobSubPacket? to figure return the amount of data used from the source as well as return the extracted size
  
• Corrected idx/sub parser to handle a wider variety of cases and not crash
  

Files:

• trunk/Subtitles/SubImport.mm (modified) (11 diffs)
• trunk/VobSubCodec.c (modified) (5 diffs)

trunk/Subtitles/SubImport.mm

@@ -18 +18 @@
-
-extern "C" {
-void ExtractVobSubPacket(UInt8 *dest, const UInt8 *framedSrc, int srcSize
+int ExtractVobSubPacket(UInt8 *dest, const UInt8 *framedSrc, int srcSize, int *usedSrcBytes
-}
-
@@ -753 +753 @@
-        {       
-                uint8_t *controlSeq = packet + controlOffset;
-
+
+
-                uint16_t timestamp = (controlSeq[0] << 8) | controlSeq[1];
-                uint16_t nextOffset = (controlSeq[2] << 8) + controlSeq[3];
@@ -799 +800 @@
-                                                loop = false;
-                                        controlOffset = nextOffset;
-end
+0x7fffffff
-                                        break;
-                                        
@@ -808 +809 @@
-                        }
-                }
+                if(i != 0x7fffffff)
+                {
+                        //End of packet
+                        loop = false;
+                }
-        }
-}       
@@ -830 +836 @@
-        
-        VobSubState state = VOB_SUB_STATE_READING_PRIVATE;
-
-
+
-        int imageWidth = 0, imageHeight = 0;
-        long delay=0;
@@ -841 +846 @@
-        if(![idxContent length])
-                goto bail;
+        
+        int subFileSize = [[[[NSFileManager defaultManager] fileAttributesAtPath:subFileName traverseLink:NO] objectForKey:NSFileSize] intValue];
-        
-        NSArray *lines = [idxContent componentsSeparatedByString:@"\n"];
@@ -889 +896 @@
-                                        NSString *language = [NSString stringWithUTF8String:langStr];
-                                        
-                                        lastTrack = currentTrack;
-                                        currentTrack = [[VobSubTrack alloc] initWithPrivateData:privateData language:language andIndex:index];
-                                        [tracks addObject:currentTrack];
@@ -905 +911 @@
-                                long time = scanTime(timeStr);
-                                free(timeStr);
-                                if(lastTrack)
-                                {
-                                        [lastTrack addSampleTime:movieDuration offset:position];
-                                        lastTrack = nil;
-                                }
-                                [currentTrack addSampleTime:time + delay offset:position];
-                        }
@@ -915 +916 @@
-                }
-        }
-
-
-
-
-
-
+
-        if([tracks count])
-        {
@@ -947 +943 @@
-                        }
-                        
- - 1
+
-                        int totalSamples = sampleCount;
-                        SampleReference64Ptr samples = (SampleReference64Ptr)calloc(sampleCount*2, sizeof(SampleReference64Record));
-                        SampleReference64Ptr sample = samples;
-                        VobSubSample *lastSample = [track->samples objectAtIndex:0];
-                        int i;
-                        uint32_t lastTime = 0;
-                        for(i=0; i<sampleCount; i++)
-                        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                
-                                NSData *subData = [subFileData subdataWithRange:NSMakeRange(offset, size)];
-                                uint8_t *extracted = (uint8_t *)malloc(size);
-ExtractVobSubPacket(extracted, (const UInt8 *)[subData bytes], 
+int extractedSize = ExtractVobSubPacket(extracted, (const UInt8 *)[subData bytes], size, &
-                                
-                                uint16_t startTimestamp, endTimestamp;
-s
+extractedS
-                                free(extracted);
-
-
+
+
+
+
+
+
-                                if(i == 0)
-las
+curren
-                                else if(lastTime != startTime)
-                                {
@@ -984 +991 @@
-                                sample->dataOffset.hi = 0;
-                                sample->dataOffset.lo = offset;
-nextSample->fileOffset - lastSample->fileOffset
+size
-                                sample->sampleFlags = 0;
-endTimestamp - startTimestamp
+duration
-                                sample->numberOfSamples = 1;
-                                lastTime = endTime;
-                                
-                                lastSample = nextSample;
-                                sample++;
-                        }

trunk/VobSubCodec.c

@@ -62 +62 @@
-
-// dest must be at least as large as src
-void ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize
+int ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize, int *usedSrcBytes
-static ComponentResult ReadPacketControls(UInt8 *packet, UInt32 palette[16], PacketControlData *controlDataOut);
-extern void initLib();
@@ -308 +308 @@
-        } else if (data[0] + data[1] == 0) {
-                // remove the MPEG framing
-ExtractVobSubPacket(glob->codecData, data, myDrp->bufferSize
+myDrp->bufferSize = ExtractVobSubPacket(glob->codecData, data, myDrp->bufferSize, NULL
-        } else {
-                memcpy(glob->codecData, drp->codecData, myDrp->bufferSize);
@@ -414 +414 @@
-}
-
-void ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize
+int ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize, int *usedSrcBytes
-        int copiedBytes = 0;
-        UInt8 *currentPacket = framedSrc;
-
-
+
+
+
-                // 3-byte start code: 0x00 00 01
-                if (currentPacket[0] + currentPacket[1] != 0 || currentPacket[2] != 1) {
-                        Codecprintf(NULL, "VobSub Codec: !! Unknown header: %02x %02x %02x\n", currentPacket[0], currentPacket[1], currentPacket[2]);
-
+ copiedBytes
-                }
-                
@@ -461 +462 @@
-                                           packet_length - 1 - (header_data_length + 3));
-                                
+                                if(packetSize == 0x7fffffff)
+                                {
+                                        packetSize = dest[0] << 8 | dest[1];
+                                }
-                                copiedBytes += packet_length - 1 - (header_data_length + 3);
-                                currentPacket += packet_length + 6;
@@ -468 +473 @@
-                                // unknown packet, probably video, return for now
-                                Codecprintf(NULL, "VobSubCodec - Unknown packet type %x, aborting\n", (int)currentPacket[3]);
-
+ copiedBytes
-                } // switch (currentPacket[3])
-        } // while (currentPacket - framedSrc < srcSize)
+        if(usedSrcBytes != NULL)
+                *usedSrcBytes = currentPacket - framedSrc;
+        
+        return copiedBytes;
-}
-