Changeset 261

Timestamp:

01/06/07 22:12:17 (2 years ago)

Author:

dconrad

Message:

Use the first AC3 packet to determine audio parameters in MKV as well.

Files:

• trunk/MatroskaImport.h (modified) (1 diff)
• trunk/MatroskaImportPrivate.cpp (modified) (4 diffs)
• trunk/bitstream_info.h (modified) (1 diff)

trunk/MatroskaImport.h

@@ -73 +73 @@
-        QTSampleDescriptionID   qtSampleDesc;
-        SInt64                                  timecodeScale;
+        bool                                    seenFirstFrame;
-        
-private:

trunk/MatroskaImportPrivate.cpp

@@ -45 +45 @@
-#include "CommonUtils.h"
-#include "Codecprintf.h"
+#include "bitstream_info.h"
-
-using namespace std;
@@ -559 +560 @@
-        qtSampleDesc = 0;
-        timecodeScale = 1000000;
+        seenFirstFrame = false;
-}
-
@@ -580 +582 @@
-        qtSampleDesc = copy.qtSampleDesc;
-        timecodeScale = copy.timecodeScale;
+        seenFirstFrame = copy.seenFirstFrame;
-        
-        for (int i = 0; i < copy.lastFrames.size(); i++)
@@ -598 +601 @@
-        KaxBlock & block = GetChild<KaxBlock>(blockGroup);
-        KaxBlockDuration & blockDuration = GetChild<KaxBlockDuration>(blockGroup);
+        
+        if (!seenFirstFrame) {
+                // we want to parse the first ac3 frame so that we can get a more correct channel layout
+                if ((*desc)->dataFormat == kAudioFormatAC3) {
+                        AudioStreamBasicDescription asbd = {0};
+                        AudioChannelLayout acl = {0};
+                        
+                        if (parse_ac3_bitstream(&asbd, &acl, block.GetBuffer(0).Buffer(), block.GetFrameSize(0))) {
+                                // successful in parsing, so the acl and asbd are more correct than what we generated in 
+                                // AddAudioTrack() so replace our sound description
+                                SoundDescriptionHandle sndDesc = NULL;
+                                asbd.mFormatID = kAudioFormatAC3;
+                                
+                                OSStatus err = QTSoundDescriptionCreate(&asbd, &acl, sizeof(AudioChannelLayout), NULL, 0, 
+                                                                                                                kQTSoundDescriptionKind_Movie_AnyVersion, &sndDesc);
+                                if (err == noErr) {
+                                        DisposeHandle((Handle) desc);
+                                        desc = (SampleDescriptionHandle) sndDesc;
+                                }
+                        }
+                }
+                seenFirstFrame = true;
+        }
-        
-        for (int i = 0; i < lastFrames.size(); i++) {

trunk/bitstream_info.h

@@ -11 +11 @@
-#include <QuickTime/QuickTime.h>
-
+#ifdef __cplusplus
+extern "C" {
+#endif
+
-int parse_ac3_bitstream(AudioStreamBasicDescription *asbd, AudioChannelLayout *acl, uint8_t *buffer, int buff_size);
+
+#ifdef __cplusplus
+}
+#endif