Changeset 333

Timestamp:

02/08/07 02:35:51 (2 years ago)

Author:

astrange

Message:

Apply overlap handling to Matroska.
This should make the vast majority of files playable.
Refs #17

Files:

• trunk/MatroskaImport.cpp (modified) (3 diffs)
• trunk/MatroskaImport.h (modified) (4 diffs)
• trunk/MatroskaImportPrivate.cpp (modified) (10 diffs)
• trunk/SubImport.h (modified) (2 diffs)
• trunk/SubImport.mm (modified) (6 diffs)

trunk/MatroskaImport.cpp

@@ -271 +271 @@
-                        if (!NextLevel1Element())
-                                *outFlags |= movieImportResultComplete;
-
+ {
-                                *outFlags |= movieImportResultNeedIdles;
+                                return noErr;
+                        }
-                        
-                        return noErr;
-                }
-                
@@ -291 +292 @@
-                // insert the a/v tracks' samples
-                for (int i = 0; i < tracks.size(); i++)
-AddSamplesTo
+Finish
-                
-        } catch (CRTError &err) {
@@ -336 +337 @@
-                *outFlags |= movieImportResultComplete;
-                loadState = kMovieLoadStateComplete;
+                
+                for (int i = 0; i < tracks.size(); i++)
+                        tracks[i].FinishTrack();
-        }
-        

trunk/MatroskaImport.h

@@ -29 +29 @@
-#include <QuickTime/QuickTime.h>
-#include "DataHandlerCallback.h"
+#include "SubImport.h"
-
-#include <ebml/EbmlStream.h>
@@ -49 +50 @@
-        SInt64                  size;
-        short                   flags;
+        DataBuffer         *buffer;
-};
-
@@ -69 +71 @@
-        // added, e.g. from a previous call to AddSamplesToTrack()
-        void AddSamplesToTrack();
+        
+        void FinishTrack();
-        
-        UInt16                                  number;
@@ -79 +83 @@
-        SInt64                                  timecodeScale;
-        TimeValue64                             maxLoadedTime;
+        CXXSubtitleSerializer   *subtitleSerializer;
+        Handle                                  subDataRefHandler;
-        
-private:

trunk/MatroskaImportPrivate.cpp

@@ -463 +463 @@
-        } else if ((*imgDesc)->cType == kSubFormatUTF8 || (*imgDesc)->cType == kSubFormatSSA || (*imgDesc)->cType == kSubFormatASS) {
-                if ((*imgDesc)->cType == kSubFormatASS) (*imgDesc)->cType = kSubFormatSSA; // no real reason to treat them differently
-
-
+
+
+
+
+
+
+
+
-                if (mkvTrack.theTrack == NULL)
-                        return GetMoviesError();
@@ -471 +477 @@
-                mh = GetMediaHandler(mkvTrack.theMedia);
-                MediaSetGraphicsMode(mh, graphicsModePreBlackAlpha, NULL);
+                
+                BeginMediaEdits(mkvTrack.theMedia);
-        } else {
-                Codecprintf(NULL, "MKV: Unsupported subtitle type\n");
@@ -580 +588 @@
-        while (attachedFile && attachedFile->GetSize() > 0) {
-                string fileMimeType = GetChild<KaxMimeType>(*attachedFile);
-
-
+
+
+
-                        KaxFileData & fontData = GetChild<KaxFileData>(*attachedFile);
-                        
@@ -641 +650 @@
-        firstSample = -1;
-        amountToAdd = 0;
+        subtitleSerializer = new CXXSubtitleSerializer;
+        subDataRefHandler = NULL;
-}
-
@@ -670 +681 @@
-        firstSample = copy.firstSample;
-        amountToAdd = copy.amountToAdd;
+        
+        subtitleSerializer = copy.subtitleSerializer;
+        subtitleSerializer->retain();
+                
+        subDataRefHandler = copy.subDataRefHandler;
-}
-
@@ -679 +695 @@
-        if (sampleTable)
-                QTSampleTableRelease(sampleTable);
+        
+        if (subtitleSerializer)
+                subtitleSerializer->release();
-}
-
@@ -729 +748 @@
-                newFrame.size = block.GetFrameSize(i);
-                newFrame.flags = blockGroup.ReferenceCount() > 0 ? mediaSampleNotSync : 0;
-
-
+
+
+
-                        AddFrame(newFrame);
+                }
-                else
-                        lastFrames.push_back(newFrame);
+                
+                newFrame.buffer = NULL;
-        }
-}
@@ -743 +766 @@
-        TimeValue sampleTime;
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                err = QTSampleTableAddSampleReferences(sampleTable, frame.offset, frame.size, frame.duration, 
-                                                                                           0, 1, frame.flags, qtSampleDesc, &sampleNum);
@@ -773 +813 @@
-        if (type == track_subtitle) {
-                if (sampleTable) {
-
-
-
-
-
-
-
-
+
+
-                }
-                err = InsertMediaIntoTrack(theTrack, frame.timecode, sampleTime, frame.duration, fixed1);
@@ -797 +831 @@
-        OSStatus err = noErr;
-        
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (err)
-
-
-
-
-
-
-
-
-
+
+
+
-        maxLoadedTime += amountToAdd;
-        firstSample = -1;
-        amountToAdd = 0;
-}
+
+void MatroskaTrack::FinishTrack()
+{
+        OSStatus err = noErr;
+        
+        if (type == track_subtitle)
+        {
+                 subtitleSerializer->setFinished();
+                 do {
+                         MatroskaFrame fr = {0};
+                         AddFrame(fr); // add empty frames to flush the subtitle packet queue
+                 } while (!subtitleSerializer->empty());
+                 EndMediaEdits(theMedia);
+        }
+        
+        AddSamplesToTrack();
+}

trunk/SubImport.h

@@ -48 +48 @@
-}
--(void)addLine:(SubLine *)sline;
--(void)addLineWithString:(NSString*)string start:(unsigned)start end:(unsigned)end;
--(void)setFinished:(BOOL)finished;
--(SubLine*)getSerializedPacket;
@@ -54 +53 @@
-#endif
-
+#ifdef __cplusplus
+class CXXSubtitleSerializer
+{
+        void *priv;
+        
+public:
+        CXXSubtitleSerializer();
+        ~CXXSubtitleSerializer();
+        
+        void pushLine(const char *line, size_t size, unsigned start, unsigned end);
+        void setFinished();
+        const char *popPacket(size_t *size, unsigned *start, unsigned *end);
+        void release();
+        void retain();
+        bool empty();
+};
-#endif
+#endif

trunk/SubImport.mm

@@ -355 +355 @@
-}
-
--(void)addLineWithString:(NSString*)string start:(unsigned)start end:(unsigned)end
-{
-        SubLine *sl = [[[SubLine alloc] init] autorelease];
-        
-        sl->line = [string retain];
-        sl->begin_time = start;
-        sl->end_time = end;
-        
-        [lines addObject:sl];
-}
-
-static int cmp_line(id a, id b, void* unused)
-{                       
@@ -396 +385 @@
-{
-        unsigned num = [lines count];
+        if (num == 0) return;
-        unsigned times[num*2+1];
-        SubLine *slines[num];
-        
-        [lines sortUsingFunction:cmp_line context:nil];
-        [lines getObjects:slines];
-
+pre - 
-        for (int i=0;i < num;i++) {
-                times[i*2]   = slines[i]->begin_time;
@@ -432 +421 @@
-                if (finishedOutput && startedOutput) {
-                        [accum deleteCharactersInRange:NSMakeRange([accum length] - 1, 1)]; // delete last newline
-[SubLine alloc] initWithLine:accum start:start end:end] autorelease
+SubLine alloc] initWithLine:accum start:start end:end
-                        
-                        [outpackets addObject:event];
@@ -438 +427 @@
-        }
-        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
--(SubLine*)getSerializedPacket
-{
-
-
+
+
+
+
+
-        
-        SubLine *sl = [outpackets objectAtIndex:0];
-        [outpackets removeObjectAtIndex:0];
-        
+        [sl autorelease];
-        return sl;
-}
@@ -458 +457 @@
-{
-        finished = f;
+}
+
+-(BOOL)isEmpty
+{
+        return [lines count] == 0 && [outpackets count] == 0;
+}
+
+-(NSString*)description
+{
+        return [NSString stringWithFormat:@"i: %d o: %d finished inputting: %d",[lines count],[outpackets count],finished];
-}
-@end
@@ -484 +493 @@
-}
-@end
+
+CXXSubtitleSerializer::CXXSubtitleSerializer()
+{
+        priv = [[SubtitleSerializer alloc] init];
+}
+
+CXXSubtitleSerializer::~CXXSubtitleSerializer()
+{
+        if (priv) {[(SubtitleSerializer*)priv release]; priv = NULL;}
+}
+
+void CXXSubtitleSerializer::pushLine(const char *line, size_t size, unsigned start, unsigned end)
+{
+        NSString *str = [[NSString alloc] initWithBytes:line length:size encoding:NSUTF8StringEncoding];
+        NSString *strn = [str stringByAppendingString:@"\n"];
+        [str release];
+        
+        SubLine *sl = [[SubLine alloc] initWithLine:strn start:start end:end];
+        
+        [sl autorelease];
+        
+        [(SubtitleSerializer*)priv addLine:sl];
+}
+
+
+void CXXSubtitleSerializer::setFinished()
+{
+        [(SubtitleSerializer*)priv setFinished:YES];
+}
+
+const char *CXXSubtitleSerializer::popPacket(size_t *size, unsigned *start, unsigned *end)
+{
+        SubLine *sl = [(SubtitleSerializer*)priv getSerializedPacket];
+        if (!sl) return NULL;
+        const char *u = [sl->line UTF8String];
+        *start = sl->begin_time;
+        *end   = sl->end_time;
+        
+        *size = strlen(u);
+        return u;
+}
+
+void CXXSubtitleSerializer::release()
+{
+        SubtitleSerializer *s = (SubtitleSerializer*)priv;
+        int r = [s retainCount];
+        [s release];
+        
+        if (r == 1) {priv = nil; delete this;}
+}
+
+void CXXSubtitleSerializer::retain()
+{
+        [(SubtitleSerializer*)priv retain];
+}
+
+bool CXXSubtitleSerializer::empty()
+{
+        return [(SubtitleSerializer*)priv isEmpty];
+}