Changeset 1043

Timestamp:

04/20/09 21:32:46 (11 months ago)

Author:

astrange

Message:

Fix the last fix.
- typo (&cookie instead of cookie) annoyed CoreAudio?
- FormatInfo? should have been requested after setting channels and sample rate

Files:

• trunk/ff_private.c (modified) (3 diffs)

trunk/ff_private.c

@@ -235 +235 @@
-        cookie = create_cookie(codec, &cookieSize, asbd.mFormatID, map->vbr);
-        
-        /* ask the toolbox about more information */
-        // FIXME the cookie for AAC is wrong somehow, passing it in breaks FormatInfo & ASBDFromESDS
-        // either fix it (like in MKV) or just ignore it
-        if (asbd.mFormatID != kAudioFormatMPEG4AAC) {
-                ioSize = sizeof(AudioStreamBasicDescription);
-                err = AudioFormatGetProperty(kAudioFormatProperty_FormatInfo, cookieSize, &cookie, &ioSize, &asbd);
-                if (err || !asbd.mFormatID)
-                        fprintf(stderr, "AudioFormatGetProperty dislikes the magic cookie (error %ld / format id %lx)\n", err, asbd.mFormatID);
-        }
-        
-        /* Set some fields of the AudioStreamBasicDescription. Then ask the AudioToolbox
-                * to fill as much as possible before creating the SoundDescriptionHandle */
@@ -252 +242 @@
-                asbd.mBytesPerPacket = codec->block_align; /* this is tested for alaw/mulaw/msadpcm */
-        
+        /* ask the toolbox about more information */
+        ioSize = sizeof(AudioStreamBasicDescription);
+        err = AudioFormatGetProperty(kAudioFormatProperty_FormatInfo, cookieSize, cookie, &ioSize, &asbd);
+        if (err || !asbd.mFormatID)
+                fprintf(stderr, "AudioFormatGetProperty dislikes the magic cookie (error %ld / format id %lx)\n", err, asbd.mFormatID);
+        
-        /*
-         FIXME: 
-         - at least ffmp3 does not set these values without parsing+the decoder being enabled
-           (so we avoid overwriting them from above for now)
-
-
-
+
+
-         */
-        if (!asbd.mFramesPerPacket)
-                asbd.mFramesPerPacket = codec->frame_size;
-
-
-
+
-                asbd.mFramesPerPacket = 1;
-        asbd.mBitsPerChannel = codec->bits_per_coded_sample;
@@ -332 +325 @@
-                        fprintf(stderr, "AVI IMPORTER: Error %ld creating the sound description\n", err);
-                        goto bail;
-                }
-                
-                // QTSoundDescriptionCreate sets this to 576 which is wrong
-                if ((**sndHdl).version == 1 && asbd.mFormatID == kAudioFormatMPEGLayer3) {
-                        SoundDescriptionV1Handle v1h = (SoundDescriptionV1Handle)sndHdl;
-                        (**v1h).samplesPerPacket = 1152;
-                }
-        }