X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fswf.c;h=47fdf7e131d59089eff9dfbd8329e8c552519931;hb=c78ed542661f56603f77400fffda81dab6de2ab9;hp=7d889af7d0b7a51397024f35e48ec29c257d2246;hpb=dc13d0b5ae2ea60861ad0716ce2b7c92be1a38b2;p=ffmpeg

diff --git a/libavformat/swf.c b/libavformat/swf.c
index 7d889af7d0b..47fdf7e131d 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -187,17 +187,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);
     }
 }
 
@@ -283,7 +283,7 @@ static int swf_write_header(AVFormatContext *s)
     }
 
     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;
@@ -336,7 +336,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 */
@@ -386,7 +386,7 @@ 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_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 */
@@ -416,88 +416,88 @@ static int swf_write_video(AVFormatContext *s,
         av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n");
     }
 
-            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);
-                }
+    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);
-                }
+        /* 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);
+        put_swf_end_tag(s);
 
-                /* draw the shape */
+        /* draw the shape */
 
-                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 */
-            }
+        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->swf_frame_number ++;
+    swf->swf_frame_number ++;
 
     /* streaming sound always should be placed just before showframe tags */
     if (swf->audio_type && swf->audio_in_pos) {
@@ -618,8 +618,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;
@@ -641,10 +639,10 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
     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;
@@ -654,14 +652,21 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
     get_le16(pb); /* frame count */
 
     swf->samples_per_frame = 0;
+    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;
 
     for(;;) {
-        offset_t tag_offset = url_ftell(pb);
         tag = get_swf_tag(pb, &len);
-        if (tag < 0 || tag == TAG_VIDEOFRAME || tag == TAG_STREAMBLOCK) {
-            url_fseek(pb, frame_offset == -1 ? tag_offset : frame_offset, SEEK_SET);
-            break;
-        }
+        if (tag < 0)
+            return AVERROR(EIO);
         if ( tag == TAG_VIDEOSTREAM && !vst) {
             int ch_id = get_le16(pb);
             get_le16(pb);
@@ -672,6 +677,9 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             vst = av_new_stream(s, ch_id);
             vst->codec->codec_type = CODEC_TYPE_VIDEO;
             vst->codec->codec_id = codec_get_id(swf_codec_tags, get_byte(pb));
+            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;
@@ -683,42 +691,14 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             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 = 1;
+            ast->need_parsing = AVSTREAM_PARSE_FULL;
             sample_rate_code= (v>>2) & 3;
             if (!sample_rate_code)
-                return AVERROR_IO;
+                return AVERROR(EIO);
             ast->codec->sample_rate = 11025 << (sample_rate_code-1);
             av_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
-            if (len > 4)
-                url_fskip(pb,len-4);
-
-        } else if (tag == TAG_JPEG2 && !vst) {
-            vst = av_new_stream(s, -2); /* -2 to avoid clash with video stream and audio stream */
-            vst->codec->codec_type = CODEC_TYPE_VIDEO;
-            vst->codec->codec_id = CODEC_ID_MJPEG;
-            url_fskip(pb, len);
-            frame_offset = tag_offset;
-        } else {
-            url_fskip(pb, len);
-        }
-    }
-    if (vst)
-        av_set_pts_info(vst, 64, 256, swf->frame_rate);
-    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) {
+            len -= 4;
+        } else if (tag == TAG_VIDEOFRAME) {
             int ch_id = get_le16(pb);
             len -= 2;
             for( i=0; i<s->nb_streams; i++ ) {
@@ -744,21 +724,29 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
         } else if (tag == TAG_JPEG2) {
             for (i=0; i<s->nb_streams; i++) {
                 st = s->streams[i];
-                if (st->id == -2) {
-                    get_le16(pb); /* BITMAP_ID */
-                    av_new_packet(pkt, len-2);
-                    get_buffer(pb, pkt->data, 4);
-                    if (AV_RB32(pkt->data) == 0xffd8ffd9) {
-                        /* old SWF files containing SOI/EOI as data start */
-                        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;
-                }
+                if (st->id == -2)
+                    break;
             }
+            if (i == s->nb_streams) {
+                vst = av_new_stream(s, -2); /* -2 to avoid clash with video stream and audio stream */
+                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) {
+                /* old SWF files containing SOI/EOI as data start */
+                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);
     }
@@ -767,7 +755,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 static int swf_read_close(AVFormatContext *s)
 {
-     return 0;
+    return 0;
 }
 
 #ifdef CONFIG_SWF_DEMUXER