Changeset 811

Timestamp:

02/18/08 18:37:08 (7 months ago)

Author:

astrange

Message:

Properly generate the VOS for AAC in Matroska files without one.
Untested in the case of custom frequencies.
(This should probably be backported to 1.1)

Fix Development build.

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (4 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/MatroskaCodecIDs.cpp

@@ -27 +27 @@
-#include <matroska/KaxTracks.h>
-#include <matroska/KaxTrackEntryData.h>
+#include <matroska/KaxTrackAudio.h>
-#include "MatroskaCodecIDs.h"
-#include "CommonUtils.h"
@@ -341 +342 @@
-        }
-        return noErr;
+}
+
+// c.f. http://wiki.multimedia.cx/index.php?title=Understanding_AAC
+
+struct MatroskaQT_AACProfileName
+{
+        char *name;
+        char profile;
+};
+
+static const MatroskaQT_AACProfileName kMatroskaAACProfiles[] = {
+        {"A_AAC/MPEG2/MAIN", 1},
+        {"A_AAC/MPEG2/LC", 2},
+        {"A_AAC/MPEG2/LC/SBR", 5},
+        {"A_AAC/MPEG2/SSR", 3},
+        {"A_AAC/MPEG4/MAIN", 1},
+        {"A_AAC/MPEG4/LC", 2},
+        {"A_AAC/MPEG4/LC/SBR", 5},
+        {"A_AAC/MPEG4/SSR", 3},
+        {"A_AAC/MPEG4/LTP", 4}
+};
+
+static const unsigned kAACFrequencyIndexes[] = {
+        96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000,
+        11025, 8000, 7350
+};
+
+static void RecreateAACVOS(KaxTrackEntry *tr_entry, uint8_t *vosBuf, size_t *vosLen)
+{
+        unsigned char profile = 0, freq_index = 15;
+        KaxCodecID *tr_codec = FindChild<KaxCodecID>(*tr_entry);
+        KaxTrackAudio & audioTrack = GetChild<KaxTrackAudio>(*tr_entry);
+        KaxAudioSamplingFreq & sampleFreq = GetChild<KaxAudioSamplingFreq>(audioTrack);
+        KaxAudioChannels & numChannels = GetChild<KaxAudioChannels>(audioTrack);
+        unsigned freq = unsigned((double)sampleFreq), channels = unsigned(numChannels);
+
+        string codecString(*tr_codec);
+
+        for (int i = 0; i < sizeof(kMatroskaAACProfiles)/sizeof(MatroskaQT_AACProfileName); i++) {
+                const MatroskaQT_AACProfileName *prof = &kMatroskaAACProfiles[i];
+                if (strcmp(codecString.c_str(), prof->name) == 0) {profile = prof->profile; break;}
+        }
+        
+        for (int i = 0; i < sizeof(kAACFrequencyIndexes)/sizeof(unsigned); i++) {
+                if (kAACFrequencyIndexes[i] == freq) {freq_index = i; break;}
+        }
+        
+        if (freq_index != 15) {
+                *vosBuf++ = (profile << 3) | (freq_index >> 1);
+                *vosBuf++ = (freq_index << 7) | (channels << 3);
+                *vosLen = 2;
+        } else {
+                freq = EndianU32_NtoB(freq);
+                
+                *vosBuf++ = (profile << 3) | (freq_index >> 1);
+                *vosBuf++ = (freq_index << 7) | (freq >> (24 - 7));
+                *vosBuf++ = (freq >> (24 - 7 - 8)) & 0xff;
+                *vosBuf++ = (freq >> (24 - 7 - 16)) & 0xff;
+                *vosBuf++ = ((freq & 1) << 7) | (channels << 3);
+                *vosLen = 5;
+        }
-}
-
@@ -427 +489 @@
-}
-
-static const unsigned char aac_lc_vos[] = {0x11, 0x90};
-
-static Handle CreateEsdsExt(KaxTrackEntry *tr_entry, bool audio)
-{
@@ -434 +494 @@
-        KaxTrackNumber *trackNum = FindChild<KaxTrackNumber>(*tr_entry);
-        
-in
+size_
-        int trackID = trackNum ? uint16(*trackNum) : 1;
-
+
+
-        size_t esdsLen;
-        
-!vosBuf) { // minimal AAC-LC descriptor
-vosBuf = (uint8_t*)aac_lc_vos
-Len = 2
+audio && !vosBuf) {
+RecreateAACVOS(tr_entry, aacBuf, &vosLen)
+Buf = aacBuf
-        }
-

trunk/Perian.xcodeproj/project.pbxproj

@@ -1856 +1856 @@
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-NO
+YES
-                                EXPORTED_SYMBOLS_FILE = "$(SOURCE_ROOT)/exportedSymbols";
-                                GCC_DYNAMIC_NO_PIC = NO;
@@ -1891 +1891 @@
-                                OTHER_REZFLAGS = "-rd -d ppc_$(ppc) -d i386_$(i386) -d TARGET_REZ_CARBON_MACHO=1";
-                                PREBINDING = NO;
-                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
-                                PRODUCT_NAME = Perian;
-                                REZ_PREPROCESSOR_DEFINITIONS = "";