X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fswfenc.c;h=31f405d5cd5a9f0acbb27eefdf6a06348ef00044;hb=14f031d7ecfabba0ef02776d4516aa3dcb7c40d8;hp=0fc244e1263d98547c94aa02c575f8b87ad96d05;hpb=f2ecb775a7f64fd2aee65f7f43fb24f18f3ab837;p=ffmpeg diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 0fc244e1263..31f405d5cd5 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -1,65 +1,65 @@ /* * Flash Compatible Streaming Format muxer - * Copyright (c) 2000 Fabrice Bellard. - * Copyright (c) 2003 Tinic Uro. + * Copyright (c) 2000 Fabrice Bellard + * Copyright (c) 2003 Tinic Uro * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/bitstream.h" +#include "libavcodec/put_bits.h" #include "avformat.h" #include "swf.h" static void put_swf_tag(AVFormatContext *s, int tag) { SWFContext *swf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; - swf->tag_pos = url_ftell(pb); + swf->tag_pos = avio_tell(pb); swf->tag = tag; /* reserve some room for the tag */ if (tag & TAG_LONG) { - put_le16(pb, 0); - put_le32(pb, 0); + avio_wl16(pb, 0); + avio_wl32(pb, 0); } else { - put_le16(pb, 0); + avio_wl16(pb, 0); } } static void put_swf_end_tag(AVFormatContext *s) { SWFContext *swf = s->priv_data; - ByteIOContext *pb = s->pb; - offset_t pos; + AVIOContext *pb = s->pb; + int64_t pos; int tag_len, tag; - pos = url_ftell(pb); + pos = avio_tell(pb); tag_len = pos - swf->tag_pos - 2; tag = swf->tag; - url_fseek(pb, swf->tag_pos, SEEK_SET); + avio_seek(pb, swf->tag_pos, SEEK_SET); if (tag & TAG_LONG) { tag &= ~TAG_LONG; - put_le16(pb, (tag << 6) | 0x3f); - put_le32(pb, tag_len - 4); + avio_wl16(pb, (tag << 6) | 0x3f); + avio_wl32(pb, tag_len - 4); } else { assert(tag_len < 0x3f); - put_le16(pb, (tag << 6) | tag_len); + avio_wl16(pb, (tag << 6) | tag_len); } - url_fseek(pb, pos, SEEK_SET); + avio_seek(pb, pos, SEEK_SET); } static inline void max_nbits(int *nbits_ptr, int val) @@ -78,7 +78,7 @@ static inline void max_nbits(int *nbits_ptr, int val) *nbits_ptr = n; } -static void put_swf_rect(ByteIOContext *pb, +static void put_swf_rect(AVIOContext *pb, int xmin, int xmax, int ymin, int ymax) { PutBitContext p; @@ -102,7 +102,7 @@ static void put_swf_rect(ByteIOContext *pb, put_bits(&p, nbits, ymax & mask); flush_put_bits(&p); - put_buffer(pb, buf, pbBufPtr(&p) - p.buf); + avio_write(pb, buf, put_bits_ptr(&p) - p.buf); } static void put_swf_line_edge(PutBitContext *pb, int dx, int dy) @@ -134,7 +134,7 @@ static void put_swf_line_edge(PutBitContext *pb, int dx, int dy) #define FRAC_BITS 16 -static void put_swf_matrix(ByteIOContext *pb, +static void put_swf_matrix(AVIOContext *pb, int a, int b, int c, int d, int tx, int ty) { PutBitContext p; @@ -167,13 +167,13 @@ static void put_swf_matrix(ByteIOContext *pb, put_bits(&p, nbits, ty); flush_put_bits(&p); - put_buffer(pb, buf, pbBufPtr(&p) - p.buf); + avio_write(pb, buf, put_bits_ptr(&p) - p.buf); } static int swf_write_header(AVFormatContext *s) { SWFContext *swf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; PutBitContext p; uint8_t buf1[256]; int i, width, height, rate, rate_base; @@ -185,22 +185,28 @@ static int swf_write_header(AVFormatContext *s) for(i=0;inb_streams;i++) { AVCodecContext *enc = s->streams[i]->codec; - 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; - } + if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { + if (swf->audio_enc) { + av_log(s, AV_LOG_ERROR, "SWF muxer only supports 1 audio stream\n"); + return AVERROR_INVALIDDATA; + } + if (enc->codec_id == AV_CODEC_ID_MP3) { swf->audio_enc = enc; - av_fifo_init(&swf->audio_fifo, AUDIO_FIFO_SIZE); + swf->audio_fifo= av_fifo_alloc(AUDIO_FIFO_SIZE); + if (!swf->audio_fifo) + return AVERROR(ENOMEM); } 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) { + if (swf->video_enc) { + av_log(s, AV_LOG_ERROR, "SWF muxer only supports 1 video stream\n"); + return AVERROR_INVALIDDATA; + } + if (enc->codec_id == AV_CODEC_ID_VP6F || + enc->codec_id == AV_CODEC_ID_FLV1 || + enc->codec_id == AV_CODEC_ID_MJPEG) { swf->video_enc = enc; } else { av_log(s, AV_LOG_ERROR, "SWF muxer only supports VP6, FLV1 and MJPEG\n"); @@ -227,48 +233,48 @@ static int swf_write_header(AVFormatContext *s) else swf->samples_per_frame = (swf->audio_enc->sample_rate * rate_base) / rate; - put_tag(pb, "FWS"); + avio_write(pb, "FWS", 3); if (!strcmp("avm2", s->oformat->name)) version = 9; - else if (swf->video_enc && swf->video_enc->codec_id == CODEC_ID_VP6F) + else if (swf->video_enc && swf->video_enc->codec_id == AV_CODEC_ID_VP6F) version = 8; /* version 8 and above support VP6 codec */ - else if (swf->video_enc && swf->video_enc->codec_id == CODEC_ID_FLV1) + else if (swf->video_enc && swf->video_enc->codec_id == AV_CODEC_ID_FLV1) version = 6; /* version 6 and above support FLV1 codec */ else version = 4; /* version 4 for mpeg audio support */ - put_byte(pb, version); + avio_w8(pb, version); - put_le32(pb, DUMMY_FILE_SIZE); /* dummy size + avio_wl32(pb, DUMMY_FILE_SIZE); /* dummy size (will be patched if not streamed) */ put_swf_rect(pb, 0, width * 20, 0, height * 20); - put_le16(pb, (rate * 256) / rate_base); /* frame rate */ - swf->duration_pos = url_ftell(pb); - put_le16(pb, (uint16_t)(DUMMY_DURATION * (int64_t)rate / rate_base)); /* frame count */ + avio_wl16(pb, (rate * 256) / rate_base); /* frame rate */ + swf->duration_pos = avio_tell(pb); + avio_wl16(pb, (uint16_t)(DUMMY_DURATION * (int64_t)rate / rate_base)); /* frame count */ /* avm2/swf v9 (also v8?) files require a file attribute tag */ if (version == 9) { put_swf_tag(s, TAG_FILEATTRIBUTES); - put_le32(pb, 1<<3); /* set ActionScript v3/AVM2 flag */ + avio_wl32(pb, 1<<3); /* set ActionScript v3/AVM2 flag */ put_swf_end_tag(s); } /* define a shape with the jpeg inside */ - if (swf->video_enc && swf->video_enc->codec_id == CODEC_ID_MJPEG) { + if (swf->video_enc && swf->video_enc->codec_id == AV_CODEC_ID_MJPEG) { put_swf_tag(s, TAG_DEFINESHAPE); - put_le16(pb, SHAPE_ID); /* ID of shape */ + avio_wl16(pb, SHAPE_ID); /* ID of shape */ /* bounding rectangle */ put_swf_rect(pb, 0, width, 0, height); /* style info */ - put_byte(pb, 1); /* one fill style */ - put_byte(pb, 0x41); /* clipped bitmap fill */ - put_le16(pb, BITMAP_ID); /* bitmap ID */ + avio_w8(pb, 1); /* one fill style */ + avio_w8(pb, 0x41); /* clipped bitmap fill */ + avio_wl16(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); - put_byte(pb, 0); /* no line style */ + avio_w8(pb, 0); /* no line style */ /* shape drawing */ init_put_bits(&p, buf1, sizeof(buf1)); @@ -293,12 +299,12 @@ static int swf_write_header(AVFormatContext *s) put_bits(&p, 5, 0); flush_put_bits(&p); - put_buffer(pb, buf1, pbBufPtr(&p) - p.buf); + avio_write(pb, buf1, put_bits_ptr(&p) - p.buf); put_swf_end_tag(s); } - if (swf->audio_enc && swf->audio_enc->codec_id == CODEC_ID_MP3) { + if (swf->audio_enc && swf->audio_enc->codec_id == AV_CODEC_ID_MP3) { int v = 0; /* start sound */ @@ -315,16 +321,16 @@ static int swf_write_header(AVFormatContext *s) v |= 0x02; /* 16 bit playback */ if (swf->audio_enc->channels == 2) v |= 0x01; /* stereo playback */ - put_byte(s->pb, v); + avio_w8(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); + avio_w8(s->pb, v); + avio_wl16(s->pb, swf->samples_per_frame); /* avg samples per frame */ + avio_wl16(s->pb, 0); put_swf_end_tag(s); } - put_flush_packet(s->pb); + avio_flush(s->pb); return 0; } @@ -332,80 +338,81 @@ static int swf_write_video(AVFormatContext *s, AVCodecContext *enc, const uint8_t *buf, int size) { SWFContext *swf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; /* Flash Player limit */ 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_VP6F || - enc->codec_id == CODEC_ID_FLV1) { + if (enc->codec_id == AV_CODEC_ID_VP6F || + enc->codec_id == AV_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,enc->codec_id)); + avio_wl16(pb, VIDEO_ID); + swf->vframes_pos = avio_tell(pb); + avio_wl16(pb, 15000); /* hard flash player limit */ + avio_wl16(pb, enc->width); + avio_wl16(pb, enc->height); + avio_w8(pb, 0); + avio_w8(pb,ff_codec_get_tag(ff_swf_codec_tags, enc->codec_id)); 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); + avio_w8(pb, 0x36); + avio_wl16(pb, 1); + avio_wl16(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_tag(pb, "video"); - put_byte(pb, 0x00); + avio_wl16(pb, swf->video_frame_number); + avio_write(pb, "video", 5); + avio_w8(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); + avio_w8(pb, 0x11); + avio_wl16(pb, 1); + avio_wl16(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); + avio_wl16(pb, VIDEO_ID); + avio_wl16(pb, swf->video_frame_number++); + avio_write(pb, buf, size); put_swf_end_tag(s); - } else if (enc->codec_id == CODEC_ID_MJPEG) { + } else if (enc->codec_id == AV_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 */ + avio_wl16(pb, SHAPE_ID); /* shape ID */ + avio_wl16(pb, 1); /* depth */ put_swf_end_tag(s); /* free the bitmap */ put_swf_tag(s, TAG_FREECHARACTER); - put_le16(pb, BITMAP_ID); + avio_wl16(pb, BITMAP_ID); put_swf_end_tag(s); } put_swf_tag(s, TAG_JPEG2 | TAG_LONG); - put_le16(pb, BITMAP_ID); /* ID of the image */ + avio_wl16(pb, BITMAP_ID); /* ID of the image */ /* a dummy jpeg header seems to be required */ - put_be32(pb, 0xffd8ffd9); + avio_wb32(pb, 0xffd8ffd9); /* write the jpeg image */ - put_buffer(pb, buf, size); + avio_write(pb, buf, size); put_swf_end_tag(s); /* draw the shape */ put_swf_tag(s, TAG_PLACEOBJECT); - put_le16(pb, SHAPE_ID); /* shape ID */ - put_le16(pb, 1); /* depth */ + avio_wl16(pb, SHAPE_ID); /* shape ID */ + avio_wl16(pb, 1); /* depth */ put_swf_matrix(pb, 20 << FRAC_BITS, 0, 0, 20 << FRAC_BITS, 0, 0); put_swf_end_tag(s); } @@ -413,12 +420,12 @@ static int swf_write_video(AVFormatContext *s, swf->swf_frame_number++; /* streaming sound always should be placed just before showframe tags */ - if (swf->audio_enc && av_fifo_size(&swf->audio_fifo)) { - int frame_size = av_fifo_size(&swf->audio_fifo); + if (swf->audio_enc && av_fifo_size(swf->audio_fifo)) { + int frame_size = av_fifo_size(swf->audio_fifo); put_swf_tag(s, TAG_STREAMBLOCK | TAG_LONG); - put_le16(pb, swf->sound_samples); - put_le16(pb, 0); // seek samples - av_fifo_generic_read(&swf->audio_fifo, frame_size, &put_buffer, pb); + avio_wl16(pb, swf->sound_samples); + avio_wl16(pb, 0); // seek samples + av_fifo_generic_read(swf->audio_fifo, pb, frame_size, &avio_write); put_swf_end_tag(s); /* update FIFO */ @@ -429,13 +436,13 @@ static int swf_write_video(AVFormatContext *s, put_swf_tag(s, TAG_SHOWFRAME); put_swf_end_tag(s); - put_flush_packet(s->pb); + avio_flush(s->pb); return 0; } static int swf_write_audio(AVFormatContext *s, - AVCodecContext *enc, const uint8_t *buf, int size) + AVCodecContext *enc, uint8_t *buf, int size) { SWFContext *swf = s->priv_data; @@ -443,13 +450,13 @@ static int swf_write_audio(AVFormatContext *s, if (swf->swf_frame_number == 16000) av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n"); - if (av_fifo_size(&swf->audio_fifo) + size > AUDIO_FIFO_SIZE) { + if (av_fifo_size(swf->audio_fifo) + size > AUDIO_FIFO_SIZE) { av_log(s, AV_LOG_ERROR, "audio fifo too small to mux audio essence\n"); return -1; } - av_fifo_generic_write(&swf->audio_fifo, buf, size, NULL); - swf->sound_samples += enc->frame_size; + av_fifo_generic_write(swf->audio_fifo, buf, size, NULL); + swf->sound_samples += av_get_audio_frame_duration(enc, size); /* if audio only stream make sure we add swf frames */ if (!swf->video_enc) @@ -461,7 +468,7 @@ static int swf_write_audio(AVFormatContext *s, static int swf_write_packet(AVFormatContext *s, AVPacket *pkt) { AVCodecContext *codec = s->streams[pkt->stream_index]->codec; - if (codec->codec_type == CODEC_TYPE_AUDIO) + if (codec->codec_type == AVMEDIA_TYPE_AUDIO) return swf_write_audio(s, codec, pkt->data, pkt->size); else return swf_write_video(s, codec, pkt->data, pkt->size); @@ -470,61 +477,62 @@ 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; + AVIOContext *pb = s->pb; AVCodecContext *enc, *video_enc; int file_size, i; video_enc = NULL; for(i=0;inb_streams;i++) { enc = s->streams[i]->codec; - if (enc->codec_type == CODEC_TYPE_VIDEO) + if (enc->codec_type == AVMEDIA_TYPE_VIDEO) video_enc = enc; else - av_fifo_free(&swf->audio_fifo); + av_fifo_free(swf->audio_fifo); } put_swf_tag(s, TAG_END); put_swf_end_tag(s); - put_flush_packet(s->pb); - /* patch file size and number of frames if not streamed */ - 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); + if (s->pb->seekable && video_enc) { + file_size = avio_tell(pb); + avio_seek(pb, 4, SEEK_SET); + avio_wl32(pb, file_size); + avio_seek(pb, swf->duration_pos, SEEK_SET); + avio_wl16(pb, swf->video_frame_number); + avio_seek(pb, swf->vframes_pos, SEEK_SET); + avio_wl16(pb, swf->video_frame_number); + avio_seek(pb, file_size, SEEK_SET); } return 0; } -#ifdef CONFIG_SWF_MUXER -AVOutputFormat swf_muxer = { - "swf", - "Flash format", - "application/x-shockwave-flash", - "swf", - sizeof(SWFContext), - CODEC_ID_MP3, - CODEC_ID_FLV1, - swf_write_header, - swf_write_packet, - swf_write_trailer, +#if CONFIG_SWF_MUXER +AVOutputFormat ff_swf_muxer = { + .name = "swf", + .long_name = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash)"), + .mime_type = "application/x-shockwave-flash", + .extensions = "swf", + .priv_data_size = sizeof(SWFContext), + .audio_codec = AV_CODEC_ID_MP3, + .video_codec = AV_CODEC_ID_FLV1, + .write_header = swf_write_header, + .write_packet = swf_write_packet, + .write_trailer = swf_write_trailer, + .flags = AVFMT_TS_NONSTRICT, }; #endif -#ifdef CONFIG_AVM2_MUXER -AVOutputFormat avm2_muxer = { - "avm2", - "Flash 9 (AVM2) format", - "application/x-shockwave-flash", - NULL, - sizeof(SWFContext), - CODEC_ID_MP3, - CODEC_ID_FLV1, - swf_write_header, - swf_write_packet, - swf_write_trailer, +#if CONFIG_AVM2_MUXER +AVOutputFormat ff_avm2_muxer = { + .name = "avm2", + .long_name = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash) (AVM2)"), + .mime_type = "application/x-shockwave-flash", + .priv_data_size = sizeof(SWFContext), + .audio_codec = AV_CODEC_ID_MP3, + .video_codec = AV_CODEC_ID_FLV1, + .write_header = swf_write_header, + .write_packet = swf_write_packet, + .write_trailer = swf_write_trailer, + .flags = AVFMT_TS_NONSTRICT, }; #endif