#define TAG_STREAMHEAD2 45
#define TAG_VIDEOSTREAM 60
#define TAG_VIDEOFRAME 61
+#define TAG_FILEATTRIBUTES 69
#define TAG_LONG 0x100
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;
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;
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);
}
}
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->audio_in_pos = 0;
swf->sound_samples = 0;
return -1;
}
} else {
- if ( enc->codec_id == CODEC_ID_VP6F ||
- enc->codec_id == CODEC_ID_FLV1 ||
- enc->codec_id == CODEC_ID_MJPEG ) {
+ 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(s, AV_LOG_ERROR, "SWF muxer only supports VP6, FLV1 and MJPEG\n");
}
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;
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) */
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 */
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 */
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 */
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 */
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;
}
AVCodecContext *enc, const uint8_t *buf, int size)
{
SWFContext *swf = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ 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->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) {
put_swf_tag(s, TAG_SHOWFRAME);
put_swf_end_tag(s);
- put_flush_packet(&s->pb);
+ put_flush_packet(s->pb);
return 0;
}
SWFContext *swf = s->priv_data;
/* 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");
}
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);
}
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;
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);
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;
static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
SWFContext *swf = s->priv_data;
- ByteIOContext *pb = &s->pb;
- int nbits, len, tag, v;
- offset_t frame_offset = -1;
- AVStream *ast = 0;
- AVStream *vst = 0;
+ 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;
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 == TAG_VIDEOSTREAM && !vst) {
+ if (tag < 0)
+ return AVERROR(EIO);
+ if (tag == TAG_VIDEOSTREAM && !vst) {
int ch_id = get_le16(pb);
get_le16(pb);
get_le16(pb);
get_byte(pb);
/* Check for FLV1 */
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));
- } 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);
ast = av_new_stream(s, -1); /* -1 to avoid clash with video stream ch_id */
- av_set_pts_info(ast, 64, 256, swf->frame_rate); /* XXX same as video stream */
+ 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 = 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);
- 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) {
+ 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++ ) {
+ for(i=0; i<s->nb_streams; i++) {
st = s->streams[i];
if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) {
frame = get_le16(pb);
} 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 */
+ 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);
}
static int swf_read_close(AVFormatContext *s)
{
- return 0;
+ return 0;
}
#ifdef CONFIG_SWF_DEMUXER
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
projects / ffmpeg / blobdiff