Changeset 1128

Timestamp:

08/27/09 12:04:50 (12 months ago)

Author:

astrange

Message:

Fake some 96khz SBR AAC as 48khz LC AAC.

They tend to play silence or weird noises in QT
when other decoders work fine. Might be our fault
or theirs, not quite sure yet.

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (3 diffs)

trunk/MatroskaCodecIDs.cpp

@@ -379 +379 @@
 };
 
+static bool ShouldWriteSBRExt(unsigned output_freq_index)
+{
+        if (output_freq_index == 0)
+                return CFPreferencesGetAppBooleanValue(CFSTR("Allow96kSBR"), PERIAN_PREF_DOMAIN, NULL);
+        
+        return true;
+}
+
 static int FindAACFreqIndex(double freq)
 {
@@ -415 +423 @@
         if (outputFreq) {
                 unsigned output_freq_index = FindAACFreqIndex(*outputFreq);
-                
-                //SBR extension
-                //not sure why we still use object type 2 (LC) instead of 5 (HE)
-                *vosBuf++ = 0x56;
-                *vosBuf++ = 0xE5;
-                *vosBuf++ = 0x80 | (output_freq_index << 3);
+                                
+                if (ShouldWriteSBRExt(output_freq_index)) {
+                        *vosBuf++ = 0x56;
+                        *vosBuf++ = 0xE5;
+                        *vosBuf++ = 0x80 | (output_freq_index << 3);
+                }
         }
         
@@ -526 +534 @@
         size_t esdsLen;
         
-        if (audio && !vosBuf) {
+        // vosLen > 2 means SBR; some of those must be rewritten to avoid QT bugs(?)
+        // FIXME remove when QT works with them
+        if (audio && (!vosBuf || vosLen > 2)) {
                 RecreateAACVOS(tr_entry, aacBuf, &vosLen);
                 vosBuf = aacBuf;