Changeset 263

Timestamp:

01/07/07 16:27:30 (2 years ago)

Author:

gbooker

Message:

• Set all of the AudioStreamBasicDescription? in case the caller wishes to just use it.
  
• Replaced the fourccs with the constants. Cleaner code, same function.
  

Files:

• trunk/bitstream_info.c (modified) (2 diffs)
• trunk/ff_private.c (modified) (1 diff)

trunk/bitstream_info.c

@@ -94 +94 @@
-        uint8_t lfe = (buffer[offset + 6] >> shift) & 0x01;
-        
-/This is a valid frame!!!
+* This is a valid frame!!! */
-        uint8_t bitrate = ac3_bitratetab[frmsizecod >> 1];
-        int sample_rate = ac3_freqs[fscod];
@@ -102 +102 @@
-                shift = bsid - 8;
-        
+        /* Setup the AudioStreamBasicDescription and AudioChannelLayout */
+        memset(asbd, 0, sizeof(AudioStreamBasicDescription));
-        asbd->mSampleRate = sample_rate >> shift;
+        asbd->mFormatID = kAudioFormatAC3;
+        asbd->mFramesPerPacket = 1;
-        asbd->mChannelsPerFrame = nfchans_tbl[acmod] + lfe;
+        
+        memset(acl, 0, sizeof(AudioChannelLayout));
-        if(lfe)
-                acl->mChannelLayoutTag = ac3_layout_lfe[acmod];

trunk/ff_private.c

@@ -250 +250 @@
-        /* We have to parse the format */
-        int useDefault = 1;
-'ac-3' || asbd.mFormatID == 'ms \0'
+kAudioFormatAC3 || asbd.mFormatID == kAudioFormatAC3MS
-        {
-                if(parse_ac3_bitstream(&asbd, &acl, firstFrame->data, firstFrame->size))