Changeset 1114

Timestamp:

07/26/09 00:01:19 (12 months ago)

Author:

astrange

Message:

Merge fixes from trunk to release branch.

This leaves the old resources in place, just in case.

Location:

branches/perian-1.1

Files:

• . (modified) (1 prop)
• Perian.xcodeproj/project.pbxproj (modified) (1 diff)
• Release/Changes.txt (modified) (2 diffs)
• Subtitles/SubATSUIRenderer.m (modified) (1 diff)
• Subtitles/SubImport.mm (modified) (6 diffs)
• Subtitles/SubParsing.h (modified) (1 diff)
• Subtitles/SubParsing.m.rl (modified) (2 diffs)
• VobSubCodec.c (modified) (4 diffs)

branches/perian-1.1/Perian.xcodeproj/project.pbxproj

@@ -1520 +1520 @@
                         isa = PBXProject;
                         buildConfigurationList = 11D4ED470A3CE59A0066D45F /* Build configuration list for PBXProject "Perian" */;
-                        compatibilityVersion = "Xcode 2.4";
+                        compatibilityVersion = "Xcode 3.1";
                         hasScannedForEncodings = 1;
                         knownRegions = (

branches/perian-1.1/Release/Changes.txt

@@ -7 +7 @@
 Fixes:
 - Fixed "Load External Subtitles" checkbox [r998]
-- Fixed crash/freeze when loading broken VobSub subtitles [r1000, 1034]
+- Fixed crash/freeze when loading broken VobSub subtitles [r1000, r1034]
 - Fixed import of uncompressed audio in FLV [r1007]
-- Fixed import of some audio tracks; should improve iApps [r1042,r1088]
+- Fixed import of some audio tracks; should improve iApps [r1042, r1088]
 - Fixed CRAM codec AVI in browsers [r1010]
 - Worked around bug in iChat codec loading [r1008]
@@ -27 +27 @@
 - Fixed rendering of multi-layer subtitles [r1016]
 - Fixed SRT files using ',' for decimals [r1019]
-- Ignored SSA shapes and \blur instead of misparsing them [r1027, 1036]
+- Ignored SSA shapes and \blur instead of misparsing them [r1027, r1036]
 - Disabled vertical font support again to fix files wrongly using it for Latin text [r1027]
 - Fixed subtitles in MKV wrongly displaying at the end of a video [r1036]
-- Fixed text position with \move [r1063]
+- Better handling of \move and \org [r1063, r1103]
+Notes:
+- Compilation under 10.4 is no longer supported.
+- AC3Codec has been deprecated and will be replaced by an LGPL decoder in a future release.
 
 1.1.3

branches/perian-1.1/Subtitles/SubATSUIRenderer.m

@@ -1096 +1096 @@
                 const unichar *ubuffer = STUnicodeForString(div->text, &ubufferData);
                 
-                if (div->layer != lastLayer) {
+                if (div->layer != lastLayer || div->shouldResetPens) {
                         resetPens = YES;
                         lastLayer = div->layer;

branches/perian-1.1/Subtitles/SubImport.mm

@@ -31 +31 @@
 
 extern "C" {
-        int ExtractVobSubPacket(UInt8 *dest, const UInt8 *framedSrc, int srcSize, int *usedSrcBytes);
+        int ExtractVobSubPacket(UInt8 *dest, const UInt8 *framedSrc, int srcSize, int *usedSrcBytes, int index);
 }
 
@@ -812 +812 @@
 static OSErr loadTrackIntoMovie(VobSubTrack *track, VobSubInfo info, uint8_t onlyForced, Track *theTrack, uint8_t *hasForcedSubtitles)
 {
+        int sampleCount = [track->samples count];
+        if(sampleCount == 0)
+                return noErr;
+        
         ImageDescriptionHandle imgDesc;
         Media trackMedia = createVobSubMedia(info.theMovie, info.movieBox, &imgDesc, info.dataRef, info.dataRefType, track);
@@ -820 +824 @@
         }
         
-        int sampleCount = [track->samples count];
         int totalSamples = 0;
         SampleReference64Ptr samples = (SampleReference64Ptr)calloc(sampleCount*2, sizeof(SampleReference64Record));
@@ -843 +846 @@
                 NSData *subData = [info.subFileData subdataWithRange:NSMakeRange(offset, size)];
                 uint8_t *extracted = (uint8_t *)malloc(size);
-                int extractedSize = ExtractVobSubPacket(extracted, (const UInt8 *)[subData bytes], size, &size);
+                //The index here likely should really be track->index, but I'm not sure we can really trust it.
+                int extractedSize = ExtractVobSubPacket(extracted, (const UInt8 *)[subData bytes], size, &size, -1);
                 
                 uint16_t startTimestamp, endTimestamp;
@@ -1030 +1034 @@
                 while((track = [trackEnum nextObject]) != nil)
                 {
-                        Track theTrack;
+                        Track theTrack = NULL;
                         VobSubInfo info = {theMovie, dataRefType, dataRef, imageWidth, imageHeight, movieBox, subFileData};
                         uint8_t hasForced = 0;
                         err = loadTrackIntoMovie(track, info, 0, &theTrack, &hasForced);
-                        if(hasForced)
+                        if(theTrack && hasForced)
                         {
                                 Track forcedTrack;
@@ -1046 +1050 @@
                         if (*firstSubTrack == NULL)
                                 *firstSubTrack = theTrack;
-                        else
+                        else if(theTrack)
                                 SetTrackAlternate(*firstSubTrack, theTrack);
                 }

branches/perian-1.1/Subtitles/SubParsing.h

@@ -39 +39 @@
         float posX, posY;
         UInt8 alignH, alignV, wrapStyle, render_complexity;
-        BOOL positioned;
+        BOOL positioned, shouldResetPens;
         
         unsigned layer;

branches/perian-1.1/Subtitles/SubParsing.m.rl

@@ -359 +359 @@
                                         }
                                 }
+                                
+                                action origin {
+                                        div->shouldResetPens = YES;
+                                }
 
                                 intnum = ("-"? [0-9]+) >paramset %setintnum;
@@ -405 +409 @@
                                                         |"move" move %position
                                                         |"t" parens
-                                                        |"org" parens
+                                                        |"org" parens %origin
                                                         |("fad" "e"? parens)
                                                         |"clip" parens

branches/perian-1.1/VobSubCodec.c

@@ -83 +83 @@
 
 // dest must be at least as large as src
-int ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize, int *usedSrcBytes);
+int ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize, int *usedSrcBytes, int index);
 static ComponentResult ReadPacketControls(UInt8 *packet, UInt32 palette[16], PacketControlData *controlDataOut);
 extern void initLib();
@@ -331 +331 @@
         } else if (data[0] + data[1] == 0) {
                 // remove the MPEG framing
-                myDrp->bufferSize = ExtractVobSubPacket(glob->codecData, data, myDrp->bufferSize, NULL);
+                myDrp->bufferSize = ExtractVobSubPacket(glob->codecData, data, myDrp->bufferSize, NULL, -1);
         } else {
                 memcpy(glob->codecData, drp->codecData, myDrp->bufferSize);
@@ -442 +442 @@
 }
 
-int ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize, int *usedSrcBytes) {
+int ExtractVobSubPacket(UInt8 *dest, UInt8 *framedSrc, int srcSize, int *usedSrcBytes, int index) {
         int copiedBytes = 0;
         UInt8 *currentPacket = framedSrc;
@@ -483 +483 @@
                                 
                                 int header_data_length = currentPacket[8];
-                                
-                                memcpy(&dest[copiedBytes], 
-                                           // header's 9 bytes + extension, we don't want 1st byte of packet
-                                           &currentPacket[9 + header_data_length + 1], 
-                                           // we don't want the 1-byte stream ID, or the header
-                                           packet_length - 1 - (header_data_length + 3));
-                                
-                                if(packetSize == INT_MAX)
+                                int packetIndex = currentPacket[header_data_length + 9] & 0x1f;
+                                if(index == -1)
+                                        index = packetIndex;
+                                if(index == packetIndex)
                                 {
-                                        packetSize = dest[0] << 8 | dest[1];
+                                        int blockSize = packet_length - 1 - (header_data_length + 3);
+                                        memcpy(&dest[copiedBytes], 
+                                                   // header's 9 bytes + extension, we don't want 1st byte of packet
+                                                   &currentPacket[9 + header_data_length + 1], 
+                                                   // we don't want the 1-byte stream ID, or the header
+                                                   blockSize);
+                                        copiedBytes += blockSize;
+
+                                        if(packetSize == INT_MAX)
+                                        {
+                                                packetSize = dest[0] << 8 | dest[1];
+                                        }
                                 }
-                                copiedBytes += packet_length - 1 - (header_data_length + 3);
                                 currentPacket += packet_length + 6;
                                 break;