Changeset 1093

Timestamp:

07/08/09 01:33:40 (14 months ago)

Author:

astrange

Message:

Merge trunk to release branch.

Location:

branches/perian-1.1

Files:

• . (modified) (1 prop)
• MatroskaCodecIDs.cpp (modified) (4 diffs)
• MatroskaImportPrivate.cpp (modified) (2 diffs)
• Plists/Perian-Info.plist (modified) (2 diffs)
• Plists/PerianPane-Info.plist (modified) (1 diff)
• Release/Makefile (modified) (1 diff)
• createStaticLibs.sh (modified) (4 diffs)

branches/perian-1.1/MatroskaCodecIDs.cpp

@@ -365 +365 @@
         {"A_AAC/MPEG2/MAIN", 1},
         {"A_AAC/MPEG2/LC", 2},
-        {"A_AAC/MPEG2/LC/SBR", 5},
+        {"A_AAC/MPEG2/LC/SBR", 2},
         {"A_AAC/MPEG2/SSR", 3},
         {"A_AAC/MPEG4/MAIN", 1},
         {"A_AAC/MPEG4/LC", 2},
-        {"A_AAC/MPEG4/LC/SBR", 5},
+        {"A_AAC/MPEG4/LC/SBR", 2},
         {"A_AAC/MPEG4/SSR", 3},
         {"A_AAC/MPEG4/LTP", 4}
@@ -379 +379 @@
 };
 
+static int FindAACFreqIndex(double freq)
+{
+        unsigned ifreq = freq;
+        
+        for (int i = 0; i < sizeof(kAACFrequencyIndexes)/sizeof(unsigned); i++) {
+                if (kAACFrequencyIndexes[i] == ifreq) return i;
+        }
+        
+        return 15;
+}
+
 static void RecreateAACVOS(KaxTrackEntry *tr_entry, uint8_t *vosBuf, size_t *vosLen)
 {
-        unsigned char profile = 2, 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);
-
+        KaxAudioOutputSamplingFreq * outputFreq = FindChild<KaxAudioOutputSamplingFreq>(audioTrack);
+        unsigned channels = unsigned(numChannels);
+        unsigned profile = 2, freq_index = FindAACFreqIndex(sampleFreq);
+        uint8_t *vosStart = vosBuf;
         string codecString(*tr_codec);
 
@@ -395 +407 @@
         }
         
-        for (int i = 0; i < sizeof(kAACFrequencyIndexes)/sizeof(unsigned); i++) {
-                if (kAACFrequencyIndexes[i] == freq) {freq_index = i; break;}
-        }
-        
-        if (profile == 5)
-                profile = 2; // disable SBR
-        
-        if (freq_index != 15) {
-                *vosBuf++ = (profile << 3) | (freq_index >> 1);
-                *vosBuf++ = (freq_index << 7) | (channels << 3);
-                *vosLen = 2;
-        } else {                
-                *vosBuf++ = (profile << 3) | (freq_index >> 1);
-                *vosBuf++ = (freq_index << 7) | (freq >> (24 - 7));
-                *vosBuf++ = (freq >> (24 - 7 - 8));
-                *vosBuf++ = (freq >> (24 - 7 - 16));
-                *vosBuf++ = ((freq & 1) << 7) | (channels << 3);
-                *vosLen = 5;
-        }
-        
-        //FIXME for when SBR is supported:
-        //write the extension data here
-        //(see libavformat matroskadec.c)
+        *vosBuf++ = (profile << 3) | (freq_index >> 1);
+        *vosBuf++ = (freq_index << 7) | (channels << 3);
+        
+        if (freq_index == 15)
+                Codecprintf(NULL, "unrecognized AAC frequency not supported\n");
+        
+        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);
+        }
+        
+        *vosLen = vosBuf - vosStart;
 }
 
@@ -520 +526 @@
         size_t esdsLen;
         
-        // QT doesn't like most SBR setup data (5 bytes) so pretend it's LC
-        if (audio && (!vosBuf || vosLen > 2)) {
+        if (audio && !vosBuf) {
                 RecreateAACVOS(tr_entry, aacBuf, &vosLen);
                 vosBuf = aacBuf;
         } else if (!audio && !vosBuf)
                 return NULL;
-
+        
         uint8_t *esds = CreateEsdsFromSetupData(vosBuf, vosLen, &esdsLen, trackID, audio, !audio);
         

branches/perian-1.1/MatroskaImportPrivate.cpp

@@ -517 +517 @@
         asbd.mSampleRate = Float64(sampleFreq);
         asbd.mChannelsPerFrame = uint32(numChannels);
-        asbd.mFramesPerPacket = 1;              // needed for mp3 and v1 SoundDescription, maybe others
         
         MkvFinishAudioDescriptions(&kaxTrack, &asbd, &acl);
@@ -525 +524 @@
         if(asbd.mChannelsPerFrame == 0)
                 asbd.mChannelsPerFrame = 1;             // avoid a div by zero
+        if(asbd.mFramesPerPacket == 0)
+                asbd.mFramesPerPacket = 1; //in case of PCM or broken codecs
+                                       //note: this is completely wrong, but less so than 0
+
         
         // FIXME mChannelLayoutTag == 0 is valid

branches/perian-1.1/Plists/Perian-Info.plist

@@ -8 +8 @@
         <string>Perian</string>
         <key>CFBundleGetInfoString</key>
-        <string>1.1.4b1 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2007 The Perian Team</string>
+        <string>1.1.4 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2007 The Perian Team</string>
         <key>CFBundleIdentifier</key>
         <string>org.perian.Perian</string>
@@ -16 +16 @@
         <string>BNDL</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.1.4b1</string>
+        <string>1.1.4</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.1.4b1</string>
+        <string>1.1.4</string>
         <key>CSResourcesFileMapped</key>
         <string>yes</string>

branches/perian-1.1/Plists/PerianPane-Info.plist

@@ -33 +33 @@
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.1.4b1</string>
+        <string>1.1.4</string>
         <key>CFBundleGetInfoString</key>
-        <string>1.1.4b1 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2007 The Perian Team</string>
+        <string>1.1.4 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2007 The Perian Team</string>
         <key>CFBundleName</key>
         <string>Perian</string>

branches/perian-1.1/Release/Makefile

@@ -4 +4 @@
 # Check the Perian.component target and PerianPane target.
 
-VERSION=1.1.4b1
-BETA=TRUE
+VERSION=1.1.4
+BETA=FALSE
 SRC_DIR=..
 BUILD_DIR=build

branches/perian-1.1/createStaticLibs.sh

@@ -7 +7 @@
 fi
 
-generalConfigureOptions="--disable-muxers --disable-encoders --disable-stripping --enable-pthreads --disable-ffmpeg --disable-network --disable-ffplay --disable-ffserver"
+generalConfigureOptions="--disable-muxers --disable-encoders --disable-stripping --disable-amd3dnow --enable-runtime-cpudetect --enable-pthreads --disable-ffmpeg --disable-network --disable-ffplay --disable-ffserver"
 cflags="-isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -g -Dattribute_deprecated= -w"
 
@@ -14 +14 @@
         buildid_ffmpeg="${buildid_ffmpeg}Dev"
 else
-    optcflags="-falign-loops=16 -fweb -fstrict-aliasing -finline-limit=1000"
+    optcflags="-falign-loops=16 -fweb -fstrict-aliasing -finline-limit=1000 -freorder-blocks"
         buildid_ffmpeg="${buildid_ffmpeg}Dep"
 fi
@@ -114 +114 @@
                 if [ "$BUILD_STYLE" != "Development" ] ; then
                 optcflags="$optcflags -mtune=$x86tune -frerun-cse-after-loop" 
+                appendcflags="-fno-unswitch-loops" #these disable things in -O3 so must be at the end
         fi
 
@@ -132 +133 @@
             cd ..
         fi
+        
+        perl -pi -e "s/-O3/-O3 $appendcflags/g" config.mak
+        
         make -j3
     fi