Changeset 1007

Timestamp:

12/29/08 08:24:20 (1 year ago)

Author:

gbooker

Message:

Set the mFramesPerPacket for linear PCM audio formats. This fixes lPCM in flv files

Files:

• trunk/ff_private.c (modified) (4 diffs)
• trunk/ff_private.h (modified) (1 diff)

trunk/ff_private.c

@@ -219 +219 @@
-        
-        memset(&asbd,0,sizeof(asbd));
-
+, codec->channels
-        if(asbd.mFormatID == 0) /* no know codec, use the ms tag */
-                asbd.mFormatID = 'ms\0\0' + codec->codec_tag; /* the number is stored in the last byte => big endian */
@@ -235 +235 @@
-        asbd.mSampleRate = codec->sample_rate;
-        asbd.mChannelsPerFrame = codec->channels;
-
+ && asbd.mBytesPerPacket == 0
-                asbd.mBytesPerPacket = codec->block_align; /* this is tested for alaw/mulaw/msadpcm */
-        asbd.mFramesPerPacket = codec->frame_size; /* works for mp3, all other codecs this is 0 anyway */
@@ -354 +354 @@
-
-/* maps the codec_id tag of libavformat to a constant the AudioToolbox can work with */
-
+, int channels
-{
-        switch(codec_id) {
@@ -370 +370 @@
-                        asbd->mFormatID = kAudioFormatLinearPCM;
-                        asbd->mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;
+                        asbd->mBytesPerPacket = 2 * channels;
-                        break;
-                case CODEC_ID_PCM_U8:
-                        asbd->mFormatID = kAudioFormatLinearPCM;
-                        asbd->mFormatFlags = kLinearPCMFormatFlagIsBigEndian;
+                        asbd->mBytesPerPacket = channels;
-                        break;
-                case CODEC_ID_PCM_ALAW:

trunk/ff_private.h

@@ -109 +109 @@
-OSType map_video_codec_to_mov_tag(enum CodecID codec_id);
-OSType forced_map_video_codec_to_mov_tag(enum CodecID codec_id);
-
+, int channels
-uint8_t *create_cookie(AVCodecContext *codec, size_t *cookieSize, UInt32 formatID, int vbr);
-Handle create_strf_ext(AVCodecContext *codec);