Changeset 410

Timestamp:

04/12/07 02:28:56 (2 years ago)

Author:

dconrad

Message:

Don't open the decoder until we're asked to decode something, since we're often given bogus formats before then.

Files:

• trunk/FFissionCodec/FFissionDecoder.cpp (modified) (3 diffs)
• trunk/FFissionCodec/FFissionDecoder.h (modified) (1 diff)

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -186 +186 @@
-        CodecID codecID = GetCodecID(inInputFormat.mFormatID);
-        
-        avCodec = avcodec_find_decoder(codecID);
-        
-        // check to make sure the input format is legal
-Codec
+codec_find_decoder(codecID)
-                Codecprintf(NULL, "Unsupported input format id %4.4s\n", &inInputFormat.mFormatID);
-                CODEC_THROW(kAudioCodecUnsupportedFormatError);
-        }
-        
+        // tell our base class about the new format
+        FFissionCodec::SetCurrentInputFormat(inInputFormat);
+}
+        
+void FFissionDecoder::OpenAVCodec()
+{
+        if (!mIsInitialized)
+                CODEC_THROW(kAudioCodecStateError);
+        
+        CodecID codecID = GetCodecID(mInputFormat.mFormatID);
+        
+        avCodec = avcodec_find_decoder(codecID);
+        
-        avcodec_get_context_defaults(avContext);
-        
-in
-in
-in
-in
-in
+m
+m
+m
+m
+m
-        
-        if (avContext->sample_rate == 0) {
@@ -209 +220 @@
-        
-        if (magicCookie) {
-in
+m
-        }
-        
-        if (avcodec_open(avContext, avCodec)) {
-                Codecprintf(NULL, "error opening audio avcodec\n");
-                
-                avCodec = NULL;
-
-
-
-
-
+
+
-}
-
@@ -275 +282 @@
-        UInt32 ans = kAudioCodecProduceOutputPacketSuccess;
-        
-
+
+
+
+
-                CODEC_THROW(kAudioCodecStateError);
-        

trunk/FFissionCodec/FFissionDecoder.h

@@ -49 +49 @@
-private:
-        void SetupExtradata(OSType formatID);
+        void OpenAVCodec();
-        
-        UInt32 kIntPCMOutFormatFlag;