Changeset 1148

Timestamp:

09/13/09 01:59:21 (11 months ago)

Author:

astrange

Message:

Revert r1145.

Instead parse it in FFission so it gets picked up
by FormatInfo?.

Not actually tested since I realized MKV+MS ACM
codecs don't even work in the first place, but
it might fix some WMA2 AVI where we didn't
set bit_rate properly before.

Location:

trunk

Files:

• CodecIDs.h (modified) (1 diff)
• FFissionCodec/FFissionDecoder.cpp (modified) (6 diffs)
• MatroskaCodecIDs.cpp (modified) (2 diffs)

trunk/CodecIDs.h

@@ -105 +105 @@
 
 #ifndef REZ
+struct WaveFormatEx {
+        uint16_t wFormatTag;
+        uint16_t nChannels;
+        uint32_t nSamplesPerSec;
+        uint32_t nAvgBytesPerSec;
+        uint16_t nBlockAlign;
+        uint16_t wBitsPerSample;
+        uint16_t cbSize;
+} __attribute__((packed));
+
+typedef struct WaveFormatEx WaveFormatEx;
+
 int getCodecID(OSType componentType);
 #endif

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -50 +50 @@
         { kAudioFormatMPEGLayer2, CODEC_ID_MP2 },
         { kAudioFormatMPEGLayer1, CODEC_ID_MP1 },
-        { 0x6d730050, CODEC_ID_MP2 },
-        { kAudioFormatTTA, CODEC_ID_TTA },
+        { 'ms\0\0' + 0x50, CODEC_ID_MP2 },
         { kAudioFormatDTS, CODEC_ID_DTS },
         { kAudioFormatNellymoser, CODEC_ID_NELLYMOSER },
+        { kAudioFormatTTA, CODEC_ID_TTA},
         { 0, CODEC_ID_NONE }
 };
@@ -80 +80 @@
         
         return false;
+}
+
+// parse waveformatex in extradata back into the AVCodecContext
+// block_align is then put into the ASBD when clients call FormatInfo (well, hopefully)
+static void ParseWaveFormat(const WaveFormatEx *wEx, AVCodecContext *avContext)
+{
+        avContext->block_align = wEx->nBlockAlign;
+        avContext->bit_rate = wEx->nAvgBytesPerSec * 8;
 }
 
@@ -135 +143 @@
         if (inMagicCookieByteSize > 0)
                 SetMagicCookie(inMagicCookie, inMagicCookieByteSize);
-        
+                
         FFissionCodec::Initialize(inInputFormat, inOutputFormat, inMagicCookie, inMagicCookieByteSize);
         
@@ -178 +186 @@
 {
         if (!magicCookie) return;
-        
+                
         switch (formatID) {
                 case kAudioFormatWMA1MS:
@@ -186 +194 @@
                                 return;
                         
+                        ParseWaveFormat((WaveFormatEx*)(magicCookie + 12 + 8), avContext);
+                                                
                         avContext->extradata = magicCookie + 12 + 18 + 8;
                         avContext->extradata_size = magicCookieSize - 12 - 18 - 8 - 8;
@@ -304 +314 @@
         // check to make sure the input format is legal
         if (avcodec_find_decoder(codecID) == NULL) {
-                Codecprintf(NULL, "Unsupported input format id %4.4s\n", &inInputFormat.mFormatID);
+                Codecprintf(NULL, "Unsupported input format id %s\n", FourCCString(inInputFormat.mFormatID));
                 CODEC_THROW(kAudioCodecUnsupportedFormatError);
         }

trunk/MatroskaCodecIDs.cpp

@@ -585 +585 @@
 }
 
-struct WAVEFORMATEX {
-        uint16_t wFormatTag;
-        uint16_t nChannels;
-        uint32_t nSamplesPerSec;
-        uint32_t nAvgBytesPerSec;
-        uint16_t nBlockAlign;
-        uint16_t wBitsPerSample;
-        uint16_t cbSize;
-} __attribute__((packed));
-
-ComponentResult ASBDExt_MSACM(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd)
-{
-        if (!tr_entry || !asbd) return paramErr;
-        KaxCodecPrivate *codecPrivate = FindChild<KaxCodecPrivate>(*tr_entry);
-        if (!codecPrivate || codecPrivate->GetSize() < sizeof(WAVEFORMATEX)) return noErr;
-        WAVEFORMATEX *wEx = (WAVEFORMATEX*)codecPrivate->GetBuffer();
-        
-        asbd->mBytesPerPacket = EndianU16_LtoN(wEx->nBlockAlign);
-        
-        return noErr;
-}
-
 ComponentResult MkvFinishSampleDescription(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir)
 {
@@ -771 +749 @@
         if (codecString == MKV_A_MS) {
                 PtrToHand(codecPrivate.GetBuffer(), cookie, codecPrivate.GetSize());
-                ASBDExt_MSACM(tr_entry, asbd);
         }