]> git.sesse.net Git - ffmpeg/blobdiff - libavformat/swf.c
new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
[ffmpeg] / libavformat / swf.c
index 52b7febbf429a8910c760ad381519173c7422ba7..405fb6867b1dc452bdcff21c6c100bdc4d552605 100644 (file)
@@ -40,6 +40,7 @@
 #define TAG_STREAMHEAD2   45
 #define TAG_VIDEOSTREAM   60
 #define TAG_VIDEOFRAME    61
+#define TAG_FILEATTRIBUTES 69
 
 #define TAG_LONG         0x100
 
 #include <assert.h>
 
 typedef struct {
-
+    int audio_stream_index;
     offset_t duration_pos;
     offset_t tag_pos;
 
     int samples_per_frame;
     int sound_samples;
-    int video_samples;
     int swf_frame_number;
     int video_frame_number;
-    int ms_per_frame;
-    int ch_id;
+    int frame_rate;
     int tag;
 
-    uint8_t *audio_fifo;
+    uint8_t audio_fifo[AUDIO_FIFO_SIZE];
     int audio_in_pos;
-    int audio_out_pos;
-    int audio_size;
 
     int video_type;
     int audio_type;
 } SWFContext;
 
-static const CodecTag swf_codec_tags[] = {
+static const AVCodecTag swf_codec_tags[] = {
     {CODEC_ID_FLV1, 0x02},
     {CODEC_ID_VP6F, 0x04},
     {0, 0},
 };
 
-static const int sSampleRates[3][4] = {
-    {44100, 48000, 32000, 0},
-    {22050, 24000, 16000, 0},
-    {11025, 12000,  8000, 0},
-};
-
-static const int sBitRates[2][3][15] = {
-    {   {  0, 32, 64, 96,128,160,192,224,256,288,320,352,384,416,448},
-        {  0, 32, 48, 56, 64, 80, 96,112,128,160,192,224,256,320,384},
-        {  0, 32, 40, 48, 56, 64, 80, 96,112,128,160,192,224,256,320}
-    },
-    {   {  0, 32, 48, 56, 64, 80, 96,112,128,144,160,176,192,224,256},
-        {  0,  8, 16, 24, 32, 40, 48, 56, 64, 80, 96,112,128,144,160},
-        {  0,  8, 16, 24, 32, 40, 48, 56, 64, 80, 96,112,128,144,160}
-    },
-};
-
-static const int sSamplesPerFrame[3][3] =
-{
-    {  384,     1152,    1152 },
-    {  384,     1152,     576 },
-    {  384,     1152,     576 }
-};
-
-static const int sBitsPerSlot[3] = {
-    32,
-    8,
-    8
+static const AVCodecTag swf_audio_codec_tags[] = {
+    {CODEC_ID_PCM_S16LE,  0x00},
+    {CODEC_ID_ADPCM_SWF,  0x01},
+    {CODEC_ID_MP3,        0x02},
+    {CODEC_ID_PCM_S16LE,  0x03},
+  //{CODEC_ID_NELLYMOSER, 0x06},
+    {0, 0},
 };
 
-static int swf_mp3_info(void *data, int *byteSize, int *samplesPerFrame, int *sampleRate, int *isMono )
-{
-    uint8_t *dataTmp = (uint8_t *)data;
-    uint32_t header = ( (uint32_t)dataTmp[0] << 24 ) | ( (uint32_t)dataTmp[1] << 16 ) | ( (uint32_t)dataTmp[2] << 8 ) | (uint32_t)dataTmp[3];
-    int layerID = 3 - ((header >> 17) & 0x03);
-    int bitRateID = ((header >> 12) & 0x0f);
-    int sampleRateID = ((header >> 10) & 0x03);
-    int bitRate = 0;
-    int bitsPerSlot = sBitsPerSlot[layerID];
-    int isPadded = ((header >> 9) & 0x01);
-
-    if ( (( header >> 21 ) & 0x7ff) != 0x7ff ) {
-        return 0;
-    }
-
-    *isMono = ((header >>  6) & 0x03) == 0x03;
-
-    if ( (header >> 19 ) & 0x01 ) {
-        *sampleRate = sSampleRates[0][sampleRateID];
-        bitRate = sBitRates[0][layerID][bitRateID] * 1000;
-        *samplesPerFrame = sSamplesPerFrame[0][layerID];
-    } else {
-        if ( (header >> 20) & 0x01 ) {
-            *sampleRate = sSampleRates[1][sampleRateID];
-            bitRate = sBitRates[1][layerID][bitRateID] * 1000;
-            *samplesPerFrame = sSamplesPerFrame[1][layerID];
-        } else {
-            *sampleRate = sSampleRates[2][sampleRateID];
-            bitRate = sBitRates[1][layerID][bitRateID] * 1000;
-            *samplesPerFrame = sSamplesPerFrame[2][layerID];
-        }
-    }
-
-    *byteSize = ( ( ( ( *samplesPerFrame * (bitRate / bitsPerSlot) ) / *sampleRate ) + isPadded ) );
-
-    return 1;
-}
-
 #ifdef CONFIG_MUXERS
 static void put_swf_tag(AVFormatContext *s, int tag)
 {
     SWFContext *swf = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
 
     swf->tag_pos = url_ftell(pb);
     swf->tag = tag;
@@ -175,7 +113,7 @@ static void put_swf_tag(AVFormatContext *s, int tag)
 static void put_swf_end_tag(AVFormatContext *s)
 {
     SWFContext *swf = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     offset_t pos;
     int tag_len, tag;
 
@@ -250,17 +188,17 @@ static void put_swf_line_edge(PutBitContext *pb, int dx, int dy)
     mask = (1 << nbits) - 1;
     put_bits(pb, 4, nbits - 2); /* 16 bits precision */
     if (dx == 0) {
-      put_bits(pb, 1, 0);
-      put_bits(pb, 1, 1);
-      put_bits(pb, nbits, dy & mask);
+        put_bits(pb, 1, 0);
+        put_bits(pb, 1, 1);
+        put_bits(pb, nbits, dy & mask);
     } else if (dy == 0) {
-      put_bits(pb, 1, 0);
-      put_bits(pb, 1, 0);
-      put_bits(pb, nbits, dx & mask);
+        put_bits(pb, 1, 0);
+        put_bits(pb, 1, 0);
+        put_bits(pb, nbits, dx & mask);
     } else {
-      put_bits(pb, 1, 1);
-      put_bits(pb, nbits, dx & mask);
-      put_bits(pb, nbits, dy & mask);
+        put_bits(pb, 1, 1);
+        put_bits(pb, nbits, dx & mask);
+        put_bits(pb, nbits, dy & mask);
     }
 }
 
@@ -307,19 +245,15 @@ static void put_swf_matrix(ByteIOContext *pb,
 static int swf_write_header(AVFormatContext *s)
 {
     SWFContext *swf = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVCodecContext *enc, *audio_enc, *video_enc;
     PutBitContext p;
     uint8_t buf1[256];
     int i, width, height, rate, rate_base;
+    int is_avm2;
 
-    swf->ch_id = -1;
     swf->audio_in_pos = 0;
-    swf->audio_out_pos = 0;
-    swf->audio_size = 0;
-    swf->audio_fifo = av_malloc(AUDIO_FIFO_SIZE);
     swf->sound_samples = 0;
-    swf->video_samples = 0;
     swf->swf_frame_number = 0;
     swf->video_frame_number = 0;
 
@@ -327,22 +261,31 @@ static int swf_write_header(AVFormatContext *s)
     audio_enc = NULL;
     for(i=0;i<s->nb_streams;i++) {
         enc = s->streams[i]->codec;
-        if (enc->codec_type == CODEC_TYPE_AUDIO)
-            audio_enc = enc;
-        else {
-            if ( enc->codec_id == CODEC_ID_VP6F ||
-                 enc->codec_id == CODEC_ID_FLV1 ||
-                 enc->codec_id == CODEC_ID_MJPEG ) {
+        if (enc->codec_type == CODEC_TYPE_AUDIO) {
+            if (enc->codec_id == CODEC_ID_MP3) {
+                if (!enc->frame_size) {
+                    av_log(s, AV_LOG_ERROR, "audio frame size not set\n");
+                    return -1;
+                }
+                audio_enc = enc;
+            } else {
+                av_log(s, AV_LOG_ERROR, "SWF muxer only supports MP3\n");
+                return -1;
+            }
+        } else {
+            if (enc->codec_id == CODEC_ID_VP6F ||
+                enc->codec_id == CODEC_ID_FLV1 ||
+                enc->codec_id == CODEC_ID_MJPEG) {
                 video_enc = enc;
             } else {
-                av_log(enc, AV_LOG_ERROR, "SWF only supports VP6, FLV1 and MJPEG\n");
+                av_log(s, AV_LOG_ERROR, "SWF muxer only supports VP6, FLV1 and MJPEG\n");
                 return -1;
             }
         }
     }
 
     if (!video_enc) {
-        /* currenty, cannot work correctly if audio only */
+        /* currently, cannot work correctly if audio only */
         swf->video_type = 0;
         width = 320;
         height = 200;
@@ -356,18 +299,22 @@ static int swf_write_header(AVFormatContext *s)
         rate_base = video_enc->time_base.num;
     }
 
-    if (!audio_enc ) {
+    if (!audio_enc) {
         swf->audio_type = 0;
-        swf->samples_per_frame = ( 44100. * rate_base ) / rate;
+        swf->samples_per_frame = (44100. * rate_base) / rate;
     } else {
         swf->audio_type = audio_enc->codec_id;
-        swf->samples_per_frame = ( ( audio_enc->sample_rate ) * rate_base ) / rate;
+        swf->samples_per_frame = (audio_enc->sample_rate * rate_base) / rate;
     }
 
+    is_avm2 = !strcmp("avm2", s->oformat->name);
+
     put_tag(pb, "FWS");
-    if ( video_enc && video_enc->codec_id == CODEC_ID_VP6F ) {
+    if (is_avm2) {
+        put_byte(pb, 9);
+    } else if (video_enc && video_enc->codec_id == CODEC_ID_VP6F) {
         put_byte(pb, 8); /* version (version 8 and above support VP6 codec) */
-    } else if ( video_enc && video_enc->codec_id == CODEC_ID_FLV1 ) {
+    } else if (video_enc && video_enc->codec_id == CODEC_ID_FLV1) {
         put_byte(pb, 6); /* version (version 6 and above support FLV1 codec) */
     } else {
         put_byte(pb, 4); /* version (should use 4 for mpeg audio support) */
@@ -380,10 +327,17 @@ static int swf_write_header(AVFormatContext *s)
     swf->duration_pos = url_ftell(pb);
     put_le16(pb, (uint16_t)(DUMMY_DURATION * (int64_t)rate / rate_base)); /* frame count */
 
+    /* avm2/swf v9 (also v8?) files require a file attribute tag */
+    if (is_avm2) {
+        put_swf_tag(s, TAG_FILEATTRIBUTES);
+        put_le32(pb, 1<<3); /* set ActionScript v3/AVM2 flag */
+        put_swf_end_tag(s);
+    }
+
     /* define a shape with the jpeg inside */
-    if ( video_enc && (video_enc->codec_id == CODEC_ID_VP6F ||
-                       video_enc->codec_id == CODEC_ID_FLV1 )) {
-    } else if ( video_enc && video_enc->codec_id == CODEC_ID_MJPEG ) {
+    if (video_enc && (video_enc->codec_id == CODEC_ID_VP6F ||
+                       video_enc->codec_id == CODEC_ID_FLV1)) {
+    } else if (video_enc && video_enc->codec_id == CODEC_ID_MJPEG) {
         put_swf_tag(s, TAG_DEFINESHAPE);
 
         put_le16(pb, SHAPE_ID); /* ID of shape */
@@ -395,7 +349,7 @@ static int swf_write_header(AVFormatContext *s)
         put_le16(pb, BITMAP_ID); /* bitmap ID */
         /* position of the bitmap */
         put_swf_matrix(pb, (int)(1.0 * (1 << FRAC_BITS)), 0,
-                        0, (int)(1.0 * (1 << FRAC_BITS)), 0, 0);
+                       0, (int)(1.0 * (1 << FRAC_BITS)), 0, 0);
         put_byte(pb, 0); /* no line style */
 
         /* shape drawing */
@@ -426,7 +380,7 @@ static int swf_write_header(AVFormatContext *s)
         put_swf_end_tag(s);
     }
 
-    if (audio_enc && audio_enc->codec_id == CODEC_ID_MP3 ) {
+    if (audio_enc && audio_enc->codec_id == CODEC_ID_MP3) {
         int v;
 
         /* start sound */
@@ -445,23 +399,22 @@ static int swf_write_header(AVFormatContext *s)
             break;
         default:
             /* not supported */
-            av_log(s, AV_LOG_ERROR, "swf doesnt support that sample rate, choose from (44100, 22050, 11025)\n");
-            av_free(swf->audio_fifo);
+            av_log(s, AV_LOG_ERROR, "swf does not support that sample rate, choose from (44100, 22050, 11025).\n");
             return -1;
         }
         v |= 0x02; /* 16 bit playback */
         if (audio_enc->channels == 2)
             v |= 0x01; /* stereo playback */
-        put_byte(&s->pb, v);
+        put_byte(s->pb, v);
         v |= 0x20; /* mp3 compressed */
-        put_byte(&s->pb, v);
-        put_le16(&s->pb, swf->samples_per_frame);  /* avg samples per frame */
-        put_le16(&s->pb, 0);
+        put_byte(s->pb, v);
+        put_le16(s->pb, swf->samples_per_frame);  /* avg samples per frame */
+        put_le16(s->pb, 0);
 
         put_swf_end_tag(s);
     }
 
-    put_flush_packet(&s->pb);
+    put_flush_packet(s->pb);
     return 0;
 }
 
@@ -469,163 +422,114 @@ static int swf_write_video(AVFormatContext *s,
                            AVCodecContext *enc, const uint8_t *buf, int size)
 {
     SWFContext *swf = s->priv_data;
-    ByteIOContext *pb = &s->pb;
-    int c = 0;
-    int outSize = 0;
-    int outSamples = 0;
+    ByteIOContext *pb = s->pb;
 
     /* Flash Player limit */
-    if ( swf->swf_frame_number == 16000 ) {
+    if (swf->swf_frame_number == 16000) {
         av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n");
     }
 
-    if ( swf->audio_type ) {
-        /* Prescan audio data for this swf frame */
-retry_swf_audio_packet:
-        if ( ( swf->audio_size-outSize ) >= 4 ) {
-            int mp3FrameSize = 0;
-            int mp3SampleRate = 0;
-            int mp3IsMono = 0;
-            int mp3SamplesPerFrame = 0;
-
-            /* copy out mp3 header from ring buffer */
-            uint8_t header[4];
-            for (c=0; c<4; c++) {
-                header[c] = swf->audio_fifo[(swf->audio_in_pos+outSize+c) % AUDIO_FIFO_SIZE];
-            }
-
-            if ( swf_mp3_info(header,&mp3FrameSize,&mp3SamplesPerFrame,&mp3SampleRate,&mp3IsMono) ) {
-                if ( ( swf->audio_size-outSize ) >= mp3FrameSize ) {
-                    outSize += mp3FrameSize;
-                    outSamples += mp3SamplesPerFrame;
-                    if ( ( swf->sound_samples + outSamples + swf->samples_per_frame ) < swf->video_samples ) {
-                        goto retry_swf_audio_packet;
-                    }
-                }
-            } else {
-                /* invalid mp3 data, skip forward
-                we need to do this since the Flash Player
-                does not like custom headers */
-                swf->audio_in_pos ++;
-                swf->audio_size --;
-                swf->audio_in_pos %= AUDIO_FIFO_SIZE;
-                goto retry_swf_audio_packet;
-            }
+    if (swf->video_type == CODEC_ID_VP6F ||
+        swf->video_type == CODEC_ID_FLV1) {
+        if (swf->video_frame_number == 0) {
+            /* create a new video object */
+            put_swf_tag(s, TAG_VIDEOSTREAM);
+            put_le16(pb, VIDEO_ID);
+            put_le16(pb, 15000); /* hard flash player limit */
+            put_le16(pb, enc->width);
+            put_le16(pb, enc->height);
+            put_byte(pb, 0);
+            put_byte(pb,codec_get_tag(swf_codec_tags,swf->video_type));
+            put_swf_end_tag(s);
+
+            /* place the video object for the first time */
+            put_swf_tag(s, TAG_PLACEOBJECT2);
+            put_byte(pb, 0x36);
+            put_le16(pb, 1);
+            put_le16(pb, VIDEO_ID);
+            put_swf_matrix(pb, 1 << FRAC_BITS, 0, 0, 1 << FRAC_BITS, 0, 0);
+            put_le16(pb, swf->video_frame_number);
+            put_byte(pb, 'v');
+            put_byte(pb, 'i');
+            put_byte(pb, 'd');
+            put_byte(pb, 'e');
+            put_byte(pb, 'o');
+            put_byte(pb, 0x00);
+            put_swf_end_tag(s);
+        } else {
+            /* mark the character for update */
+            put_swf_tag(s, TAG_PLACEOBJECT2);
+            put_byte(pb, 0x11);
+            put_le16(pb, 1);
+            put_le16(pb, swf->video_frame_number);
+            put_swf_end_tag(s);
         }
 
-        /* audio stream is behind video stream, bail */
-        if ( ( swf->sound_samples + outSamples + swf->samples_per_frame ) < swf->video_samples ) {
-            return 0;
+        /* set video frame data */
+        put_swf_tag(s, TAG_VIDEOFRAME | TAG_LONG);
+        put_le16(pb, VIDEO_ID);
+        put_le16(pb, swf->video_frame_number++);
+        put_buffer(pb, buf, size);
+        put_swf_end_tag(s);
+    } else if (swf->video_type == CODEC_ID_MJPEG) {
+        if (swf->swf_frame_number > 0) {
+            /* remove the shape */
+            put_swf_tag(s, TAG_REMOVEOBJECT);
+            put_le16(pb, SHAPE_ID); /* shape ID */
+            put_le16(pb, 1); /* depth */
+            put_swf_end_tag(s);
+
+            /* free the bitmap */
+            put_swf_tag(s, TAG_FREECHARACTER);
+            put_le16(pb, BITMAP_ID);
+            put_swf_end_tag(s);
         }
-    }
-
-            if ( swf->video_type == CODEC_ID_VP6F ||
-                 swf->video_type == CODEC_ID_FLV1 ) {
-                if ( swf->video_frame_number == 0 ) {
-                    /* create a new video object */
-                    put_swf_tag(s, TAG_VIDEOSTREAM);
-                    put_le16(pb, VIDEO_ID);
-                    put_le16(pb, 15000 ); /* hard flash player limit */
-                    put_le16(pb, enc->width);
-                    put_le16(pb, enc->height);
-                    put_byte(pb, 0);
-                    put_byte(pb,codec_get_tag(swf_codec_tags,swf->video_type));
-                    put_swf_end_tag(s);
-
-                    /* place the video object for the first time */
-                    put_swf_tag(s, TAG_PLACEOBJECT2);
-                    put_byte(pb, 0x36);
-                    put_le16(pb, 1);
-                    put_le16(pb, VIDEO_ID);
-                    put_swf_matrix(pb, 1 << FRAC_BITS, 0, 0, 1 << FRAC_BITS, 0, 0);
-                    put_le16(pb, swf->video_frame_number );
-                    put_byte(pb, 'v');
-                    put_byte(pb, 'i');
-                    put_byte(pb, 'd');
-                    put_byte(pb, 'e');
-                    put_byte(pb, 'o');
-                    put_byte(pb, 0x00);
-                    put_swf_end_tag(s);
-                } else {
-                    /* mark the character for update */
-                    put_swf_tag(s, TAG_PLACEOBJECT2);
-                    put_byte(pb, 0x11);
-                    put_le16(pb, 1);
-                    put_le16(pb, swf->video_frame_number );
-                    put_swf_end_tag(s);
-                }
-
-                    /* set video frame data */
-                    put_swf_tag(s, TAG_VIDEOFRAME | TAG_LONG);
-                    put_le16(pb, VIDEO_ID);
-                    put_le16(pb, swf->video_frame_number++ );
-                    put_buffer(pb, buf, size);
-                    put_swf_end_tag(s);
-            } else if ( swf->video_type == CODEC_ID_MJPEG ) {
-                if (swf->swf_frame_number > 0) {
-                    /* remove the shape */
-                    put_swf_tag(s, TAG_REMOVEOBJECT);
-                    put_le16(pb, SHAPE_ID); /* shape ID */
-                    put_le16(pb, 1); /* depth */
-                    put_swf_end_tag(s);
-
-                    /* free the bitmap */
-                    put_swf_tag(s, TAG_FREECHARACTER);
-                    put_le16(pb, BITMAP_ID);
-                    put_swf_end_tag(s);
-                }
 
-                put_swf_tag(s, TAG_JPEG2 | TAG_LONG);
+        put_swf_tag(s, TAG_JPEG2 | TAG_LONG);
 
-                put_le16(pb, BITMAP_ID); /* ID of the image */
+        put_le16(pb, BITMAP_ID); /* ID of the image */
 
-                /* a dummy jpeg header seems to be required */
-                put_byte(pb, 0xff);
-                put_byte(pb, 0xd8);
-                put_byte(pb, 0xff);
-                put_byte(pb, 0xd9);
-                /* write the jpeg image */
-                put_buffer(pb, buf, size);
+        /* a dummy jpeg header seems to be required */
+        put_byte(pb, 0xff);
+        put_byte(pb, 0xd8);
+        put_byte(pb, 0xff);
+        put_byte(pb, 0xd9);
+        /* write the jpeg image */
+        put_buffer(pb, buf, size);
 
-                put_swf_end_tag(s);
-
-                /* draw the shape */
+        put_swf_end_tag(s);
 
-                put_swf_tag(s, TAG_PLACEOBJECT);
-                put_le16(pb, SHAPE_ID); /* shape ID */
-                put_le16(pb, 1); /* depth */
-                put_swf_matrix(pb, 20 << FRAC_BITS, 0, 0, 20 << FRAC_BITS, 0, 0);
-                put_swf_end_tag(s);
-            } else {
-                /* invalid codec */
-            }
+        /* draw the shape */
 
-            swf->swf_frame_number ++;
+        put_swf_tag(s, TAG_PLACEOBJECT);
+        put_le16(pb, SHAPE_ID); /* shape ID */
+        put_le16(pb, 1); /* depth */
+        put_swf_matrix(pb, 20 << FRAC_BITS, 0, 0, 20 << FRAC_BITS, 0, 0);
+        put_swf_end_tag(s);
+    } else {
+        /* invalid codec */
+    }
 
-    swf->video_samples += swf->samples_per_frame;
+    swf->swf_frame_number ++;
 
     /* streaming sound always should be placed just before showframe tags */
-    if ( outSize > 0 ) {
+    if (swf->audio_type && swf->audio_in_pos) {
         put_swf_tag(s, TAG_STREAMBLOCK | TAG_LONG);
-        put_le16(pb, outSamples);
-        put_le16(pb, 0);
-        for (c=0; c<outSize; c++) {
-            put_byte(pb,swf->audio_fifo[(swf->audio_in_pos+c) % AUDIO_FIFO_SIZE]);
-        }
+        put_le16(pb, swf->sound_samples);
+        put_le16(pb, 0); // seek samples
+        put_buffer(pb, swf->audio_fifo, swf->audio_in_pos);
         put_swf_end_tag(s);
 
         /* update FIFO */
-        swf->sound_samples += outSamples;
-        swf->audio_in_pos += outSize;
-        swf->audio_size -= outSize;
-        swf->audio_in_pos %= AUDIO_FIFO_SIZE;
+        swf->sound_samples = 0;
+        swf->audio_in_pos = 0;
     }
 
     /* output the frame */
     put_swf_tag(s, TAG_SHOWFRAME);
     put_swf_end_tag(s);
 
-    put_flush_packet(&s->pb);
+    put_flush_packet(s->pb);
 
     return 0;
 }
@@ -634,24 +538,23 @@ static int swf_write_audio(AVFormatContext *s,
                            AVCodecContext *enc, const uint8_t *buf, int size)
 {
     SWFContext *swf = s->priv_data;
-    int c = 0;
 
     /* Flash Player limit */
-    if ( swf->swf_frame_number == 16000 ) {
+    if (swf->swf_frame_number == 16000) {
         av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n");
     }
 
-    if (enc->codec_id == CODEC_ID_MP3 ) {
-        for (c=0; c<size; c++) {
-            swf->audio_fifo[(swf->audio_out_pos+c)%AUDIO_FIFO_SIZE] = buf[c];
-        }
-        swf->audio_size += size;
-        swf->audio_out_pos += size;
-        swf->audio_out_pos %= AUDIO_FIFO_SIZE;
+    if (swf->audio_in_pos + size >= AUDIO_FIFO_SIZE) {
+        av_log(s, AV_LOG_ERROR, "audio fifo too small to mux audio essence\n");
+        return -1;
     }
 
+    memcpy(swf->audio_fifo +  swf->audio_in_pos, buf, size);
+    swf->audio_in_pos += size;
+    swf->sound_samples += enc->frame_size;
+
     /* if audio only stream make sure we add swf frames */
-    if ( swf->video_type == 0 ) {
+    if (swf->video_type == 0) {
         swf_write_video(s, enc, 0, 0);
     }
 
@@ -670,7 +573,7 @@ static int swf_write_packet(AVFormatContext *s, AVPacket *pkt)
 static int swf_write_trailer(AVFormatContext *s)
 {
     SWFContext *swf = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVCodecContext *enc, *video_enc;
     int file_size, i;
 
@@ -684,19 +587,17 @@ static int swf_write_trailer(AVFormatContext *s)
     put_swf_tag(s, TAG_END);
     put_swf_end_tag(s);
 
-    put_flush_packet(&s->pb);
+    put_flush_packet(s->pb);
 
     /* patch file size and number of frames if not streamed */
-    if (!url_is_streamed(&s->pb) && video_enc) {
+    if (!url_is_streamed(s->pb) && video_enc) {
         file_size = url_ftell(pb);
         url_fseek(pb, 4, SEEK_SET);
         put_le32(pb, file_size);
         url_fseek(pb, swf->duration_pos, SEEK_SET);
         put_le16(pb, video_enc->frame_number);
+        url_fseek(pb, file_size, SEEK_SET);
     }
-
-    av_free(swf->audio_fifo);
-
     return 0;
 }
 #endif //CONFIG_MUXERS
@@ -730,8 +631,6 @@ static int get_swf_tag(ByteIOContext *pb, int *len_ptr)
 static int swf_probe(AVProbeData *p)
 {
     /* check file header */
-    if (p->buf_size <= 16)
-        return 0;
     if ((p->buf[0] == 'F' || p->buf[0] == 'C') && p->buf[1] == 'W' &&
         p->buf[2] == 'S')
         return AVPROBE_SCORE_MAX;
@@ -741,163 +640,139 @@ static int swf_probe(AVProbeData *p)
 
 static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
-    SWFContext *swf = 0;
-    ByteIOContext *pb = &s->pb;
-    int nbits, len, frame_rate, tag, v;
-    offset_t firstTagOff;
-    AVStream *ast = 0;
-    AVStream *vst = 0;
-
-    swf = av_malloc(sizeof(SWFContext));
-    if (!swf)
-        return -1;
-    s->priv_data = swf;
+    SWFContext *swf = s->priv_data;
+    ByteIOContext *pb = s->pb;
+    int nbits, len, tag;
 
     tag = get_be32(pb) & 0xffffff00;
 
-    if (tag == MKBETAG('C', 'W', 'S', 0))
-    {
+    if (tag == MKBETAG('C', 'W', 'S', 0)) {
         av_log(s, AV_LOG_ERROR, "Compressed SWF format not supported\n");
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
     if (tag != MKBETAG('F', 'W', 'S', 0))
-        return AVERROR_IO;
+        return AVERROR(EIO);
     get_le32(pb);
     /* skip rectangle size */
     nbits = get_byte(pb) >> 3;
     len = (4 * nbits - 3 + 7) / 8;
     url_fskip(pb, len);
-    frame_rate = get_le16(pb);
+    swf->frame_rate = get_le16(pb); /* 8.8 fixed */
     get_le16(pb); /* frame count */
 
-    /* The Flash Player converts 8.8 frame rates
-       to milliseconds internally. Do the same to get
-       a correct framerate */
-    swf->ms_per_frame = ( 1000 * 256 ) / frame_rate;
     swf->samples_per_frame = 0;
-    swf->ch_id = -1;
+    s->ctx_flags |= AVFMTCTX_NOHEADER;
+    return 0;
+}
+
+static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    SWFContext *swf = s->priv_data;
+    ByteIOContext *pb = s->pb;
+    AVStream *vst = NULL, *ast = NULL, *st = 0;
+    int tag, len, i, frame, v;
 
-    firstTagOff = url_ftell(pb);
     for(;;) {
         tag = get_swf_tag(pb, &len);
-        if (tag < 0) {
-            if ( ast || vst ) {
-                if ( vst && ast ) {
-                    vst->codec->time_base.den = ast->codec->sample_rate / swf->samples_per_frame;
-                    vst->codec->time_base.num = 1;
-                }
-                break;
-            }
-            av_log(s, AV_LOG_ERROR, "No media found in SWF\n");
-            return AVERROR_IO;
-        }
-        if ( tag == TAG_VIDEOSTREAM && !vst) {
-            swf->ch_id = get_le16(pb);
+        if (tag < 0)
+            return AVERROR(EIO);
+        if (tag == TAG_VIDEOSTREAM && !vst) {
+            int ch_id = get_le16(pb);
             get_le16(pb);
             get_le16(pb);
             get_le16(pb);
             get_byte(pb);
             /* Check for FLV1 */
-            vst = av_new_stream(s, 0);
-            av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */
+            vst = av_new_stream(s, ch_id);
+            if (!vst)
+                return -1;
             vst->codec->codec_type = CODEC_TYPE_VIDEO;
             vst->codec->codec_id = codec_get_id(swf_codec_tags, get_byte(pb));
-            if (swf->samples_per_frame) {
-                vst->codec->time_base.den = 1000. / swf->ms_per_frame;
-                vst->codec->time_base.num = 1;
-            }
-        } else if ( ( tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2 ) && !ast) {
+            av_set_pts_info(vst, 64, 256, swf->frame_rate);
+            vst->codec->time_base = (AVRational){ 256, swf->frame_rate };
+            len -= 10;
+        } else if ((tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2) && !ast) {
             /* streaming found */
+            int sample_rate_code;
             get_byte(pb);
             v = get_byte(pb);
             swf->samples_per_frame = get_le16(pb);
-            if (len > 4)
-                url_fskip(pb,len-4);
-            /* if mp3 streaming found, OK */
-            if ((v & 0x20) != 0) {
-                ast = av_new_stream(s, 1);
-                if (!ast)
-                    return -ENOMEM;
-                av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */
-
-                ast->codec->channels = 1 + (v&1);
-
-                switch((v>> 2) & 0x03) {
-                case 1:
-                    ast->codec->sample_rate = 11025;
-                    break;
-                case 2:
-                    ast->codec->sample_rate = 22050;
-                    break;
-                case 3:
-                    ast->codec->sample_rate = 44100;
-                    break;
-                default:
-                    av_free(ast);
-                    return AVERROR_IO;
-                }
-                ast->codec->codec_type = CODEC_TYPE_AUDIO;
-                ast->codec->codec_id = CODEC_ID_MP3;
-                ast->need_parsing = 1;
-            }
-        } else {
-            url_fskip(pb, len);
-        }
-    }
-    url_fseek(pb, firstTagOff, SEEK_SET);
-
-    return 0;
-}
-
-static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    SWFContext *swf = s->priv_data;
-    ByteIOContext *pb = &s->pb;
-    AVStream *st = 0;
-    int tag, len, i, frame;
-
-    for(;;) {
-        tag = get_swf_tag(pb, &len);
-        if (tag < 0)
-            return AVERROR_IO;
-        if (tag == TAG_VIDEOFRAME) {
-            for( i=0; i<s->nb_streams; i++ ) {
+            ast = av_new_stream(s, -1); /* -1 to avoid clash with video stream ch_id */
+            if (!ast)
+                return -1;
+            swf->audio_stream_index = ast->index;
+            ast->codec->channels = 1 + (v&1);
+            ast->codec->codec_type = CODEC_TYPE_AUDIO;
+            ast->codec->codec_id = codec_get_id(swf_audio_codec_tags, (v>>4) & 15);
+            ast->need_parsing = AVSTREAM_PARSE_FULL;
+            sample_rate_code= (v>>2) & 3;
+            if (!sample_rate_code)
+                return AVERROR(EIO);
+            ast->codec->sample_rate = 11025 << (sample_rate_code-1);
+            av_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
+            len -= 4;
+        } else if (tag == TAG_VIDEOFRAME) {
+            int ch_id = get_le16(pb);
+            len -= 2;
+            for(i=0; i<s->nb_streams; i++) {
                 st = s->streams[i];
-                if (st->id == 0) {
-                    if ( get_le16(pb) == swf->ch_id ) {
-                        frame = get_le16(pb);
-                        av_get_packet(pb, pkt, len-4);
-                        pkt->pts = frame * swf->ms_per_frame;
-                        pkt->stream_index = st->index;
-                        return pkt->size;
-                    } else {
-                        url_fskip(pb, len-2);
-                        continue;
-                    }
+                if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) {
+                    frame = get_le16(pb);
+                    av_get_packet(pb, pkt, len-2);
+                    pkt->pts = frame;
+                    pkt->stream_index = st->index;
+                    return pkt->size;
                 }
             }
-            url_fskip(pb, len);
         } else if (tag == TAG_STREAMBLOCK) {
-            for( i=0; i<s->nb_streams; i++ ) {
+            st = s->streams[swf->audio_stream_index];
+            if (st->codec->codec_id == CODEC_ID_MP3) {
+                url_fskip(pb, 4);
+                av_get_packet(pb, pkt, len-4);
+            } else { // ADPCM, PCM
+                av_get_packet(pb, pkt, len);
+            }
+            pkt->stream_index = st->index;
+            return pkt->size;
+        } else if (tag == TAG_JPEG2) {
+            for (i=0; i<s->nb_streams; i++) {
                 st = s->streams[i];
-                if (st->id == 1) {
-                    url_fskip(pb, 4);
-                    av_get_packet(pb, pkt, len-4);
-                    pkt->stream_index = st->index;
-                    return pkt->size;
-                }
+                if (st->id == -2)
+                    break;
             }
-            url_fskip(pb, len);
-        } else {
-            url_fskip(pb, len);
+            if (i == s->nb_streams) {
+                vst = av_new_stream(s, -2); /* -2 to avoid clash with video stream and audio stream */
+                if (!vst)
+                    return -1;
+                vst->codec->codec_type = CODEC_TYPE_VIDEO;
+                vst->codec->codec_id = CODEC_ID_MJPEG;
+                av_set_pts_info(vst, 64, 256, swf->frame_rate);
+                vst->codec->time_base = (AVRational){ 256, swf->frame_rate };
+                st = vst;
+            }
+            get_le16(pb); /* BITMAP_ID */
+            av_new_packet(pkt, len-2);
+            get_buffer(pb, pkt->data, 4);
+            if (AV_RB32(pkt->data) == 0xffd8ffd9 ||
+                AV_RB32(pkt->data) == 0xffd9ffd8) {
+                /* old SWF files containing SOI/EOI as data start */
+                /* files created by swink have reversed tag */
+                pkt->size -= 4;
+                get_buffer(pb, pkt->data, pkt->size);
+            } else {
+                get_buffer(pb, pkt->data + 4, pkt->size - 4);
+            }
+            pkt->stream_index = st->index;
+            return pkt->size;
         }
+        url_fskip(pb, len);
     }
     return 0;
 }
 
 static int swf_read_close(AVFormatContext *s)
 {
-     return 0;
+    return 0;
 }
 
 #ifdef CONFIG_SWF_DEMUXER
@@ -925,3 +800,17 @@ AVOutputFormat swf_muxer = {
     swf_write_trailer,
 };
 #endif
+#ifdef CONFIG_AVM2_MUXER
+AVOutputFormat avm2_muxer = {
+    "avm2",
+    "Flash 9 (AVM2) format",
+    "application/x-shockwave-flash",
+    "swf",
+    sizeof(SWFContext),
+    CODEC_ID_MP3,
+    CODEC_ID_FLV1,
+    swf_write_header,
+    swf_write_packet,
+    swf_write_trailer,
+};
+#endif