Changeset 411

Timestamp:

04/12/07 02:35:25 (1 year ago)

Author:

dconrad

Message:

Vorbis decoder (doesn't work with ogg-framed vorbis.) Refs #23

Files:

• trunk/FFissionCodec/FFissionCodec.r (modified) (1 diff)
• trunk/FFissionCodec/FFissionDecoder.cpp (modified) (6 diffs)
• trunk/FFissionCodec/FFissionDecoder.h (modified) (2 diffs)
• trunk/exportedSymbols (modified) (1 diff)
• trunk/ff_MovieImport.c (modified) (1 diff)

trunk/FFissionCodec/FFissionCodec.r

@@ -53 +53 @@
-#define kComponentInfo                                  "An AudioCodec that decodes Flash ADPCM into linear PCM"
-#include "XCAResources.r"
+
+
+#define kComponentEntryPoint                    "FFissionVBRDecoderEntry"
+
+#define kPrimaryResourceID                              134
+#define kComponentType                                  'adec'
+#define kComponentSubtype                               kAudioFormatXiphVorbis
+#define kComponentName                                  "Vorbis"
+#define kComponentInfo                                  "An AudioCodec that decodes Vorbis audio into linear PCM"
+#include "XCAResources.r"

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -26 +26 @@
-#include "CodecIDs.h"
-
+typedef struct CookieAtomHeader {
+    long           size;
+    long           type;
+    unsigned char  data[1];
+} CookieAtomHeader;
+
-struct CodecPair {
-        OSType mFormatID;
@@ -36 +42 @@
-        { kAudioFormatWMA2MS, CODEC_ID_WMAV2 },
-        { kAudioFormatFlashADPCM, CODEC_ID_ADPCM_SWF },
+        { kAudioFormatXiphVorbis, CODEC_ID_VORBIS },
-        { 0, CODEC_ID_NONE }
-};
@@ -132 +139 @@
-                        break;
-                        
+                case kAudioFormatXiphVorbis:
+                        avContext->extradata_size = ConvertXiphVorbisCookie();
+                        avContext->extradata = magicCookie;
+                        break;
+                        
-                default:
-                        return;
@@ -138 +150 @@
-        // this is safe because we always allocate this amount of additional memory for our copy of the magic cookie
-        memset(avContext->extradata + avContext->extradata_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+}
+
+int FFissionDecoder::ConvertXiphVorbisCookie()
+{
+        Byte *ptr = magicCookie;
+        Byte *cend = magicCookie + magicCookieSize;
+        Byte *headerData[3] = {NULL};
+        int headerSize[3] = {0};
+        
+        while (ptr < cend) {
+                CookieAtomHeader *aheader = reinterpret_cast<CookieAtomHeader *>(ptr);
+                int size = EndianU32_BtoN(aheader->size);
+                ptr += size;
+                if (ptr > cend || size <= 0)
+                        break;
+                
+                switch(EndianS32_BtoN(aheader->type)) {
+                        case kCookieTypeVorbisHeader:
+                                headerData[0] = aheader->data;
+                                headerSize[0] = size - 8;
+                                break;
+                                
+                        case kCookieTypeVorbisComments:
+                                headerData[1] = aheader->data;
+                                headerSize[1] = size - 8;
+                                break;
+                                
+                        case kCookieTypeVorbisCodebooks:
+                                headerData[2] = aheader->data;
+                                headerSize[2] = size - 8;
+                                break;
+                }
+        }
+        
+    if (headerSize[0] <= 0 || headerSize[1] <= 0 || headerSize[2] <= 0) {
+                Codecprintf(NULL, "Invalid Vorbis extradata\n");
+                return 0;
+        }
+        
+        int len = headerSize[0] + headerSize[1] + headerSize[2];
+        Byte *newCookie = new Byte[len + len/255 + 64];
+        ptr = newCookie;
+        
+        ptr[0] = 2;             // number of packets minus 1
+        int offset = 1;
+        offset += av_xiphlacing(&ptr[offset], headerSize[0]);
+        offset += av_xiphlacing(&ptr[offset], headerSize[1]);
+        for (int i = 0; i < 3; i++) {
+                memcpy(&ptr[offset], headerData[i], headerSize[i]);
+                offset += headerSize[i];
+        }
+        
+        delete[] magicCookie;
+        magicCookie = newCookie;
+        magicCookieSize = offset;
+        
+        return offset;
-}
-
@@ -349 +418 @@
-}
-
+
+void FFissionVBRDecoder::GetProperty(AudioCodecPropertyID inPropertyID, UInt32& ioPropertyDataSize, void* outPropertyData)
+{
+        switch (inPropertyID) {
+                case kAudioCodecPropertyPacketFrameSize:
+                case kAudioCodecPropertyHasVariablePacketByteSizes:
+                        if (ioPropertyDataSize != sizeof(UInt32))
+                                CODEC_THROW(kAudioCodecBadPropertySizeError);
+                        break;
+        }
+        
+        switch (inPropertyID) {
+                case kAudioCodecPropertyPacketFrameSize:
+                        *reinterpret_cast<UInt32*>(outPropertyData) = 0;
+                        break;
+                        
+                case kAudioCodecPropertyHasVariablePacketByteSizes:
+                        *reinterpret_cast<UInt32*>(outPropertyData) = true;
+                        break;
+                        
+                default:
+                        FFissionDecoder::GetProperty(inPropertyID, ioPropertyDataSize, outPropertyData);
+        }
+}
+
+
-extern "C"
-ComponentResult FFissionDecoderEntry(ComponentParameters* inParameters, FFissionDecoder* inThis)
@@ -354 +449 @@
-        return ACCodecDispatch(inParameters, inThis);
-}
+
+extern "C"
+ComponentResult FFissionVBRDecoderEntry(ComponentParameters* inParameters, FFissionVBRDecoder* inThis)
+{
+        return ACCodecDispatch(inParameters, inThis);
+}

trunk/FFissionCodec/FFissionDecoder.h

@@ -49 +49 @@
-private:
-        void SetupExtradata(OSType formatID);
+        int ConvertXiphVorbisCookie();
-        void OpenAVCodec();
-        
@@ -61 +62 @@
-};
-
+// kAudioCodecPropertyHasVariablePacketByteSizes is queried before our input format is set,
+// so we can't use that to determine our answer...
+class FFissionVBRDecoder : public FFissionDecoder
+{
+public:
+        FFissionVBRDecoder() : FFissionDecoder() { }
+        virtual void GetProperty(AudioCodecPropertyID inPropertyID, UInt32& ioPropertyDataSize, void* outPropertyData);
+};
+
-#endif

trunk/exportedSymbols

@@ -5 +5 @@
-_TextSubCodecComponentDispatch
-_FFissionDecoderEntry
+_FFissionVBRDecoderEntry

trunk/ff_MovieImport.c

@@ -86 +86 @@
-                register_avcodec(&wmav2_decoder);
-                register_avcodec(&adpcm_swf_decoder);
+                register_avcodec(&vorbis_decoder);
-                
-                av_log_set_callback(FFMpegCodecprintf);