X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fswfdec.c;h=d7a53145c61d9d8dd64412631646313739e31941;hb=26e4f0c70f781a16f4234c101ceceb640ec5ff31;hp=1f010c58be38f574bca3da71e40918b3f9a3d207;hpb=7e04cfba27a6d7ab6d142242fb76d1d243707a66;p=ffmpeg diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 1f010c58be3..d7a53145c61 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -3,40 +3,49 @@ * 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 "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "swf.h" -static int get_swf_tag(ByteIOContext *pb, int *len_ptr) +static const AVCodecTag swf_audio_codec_tags[] = { + { AV_CODEC_ID_PCM_S16LE, 0x00 }, + { AV_CODEC_ID_ADPCM_SWF, 0x01 }, + { AV_CODEC_ID_MP3, 0x02 }, + { AV_CODEC_ID_PCM_S16LE, 0x03 }, +// { AV_CODEC_ID_NELLYMOSER, 0x06 }, + { AV_CODEC_ID_NONE, 0 }, +}; + +static int get_swf_tag(AVIOContext *pb, int *len_ptr) { int tag, len; - if (url_feof(pb)) + if (pb->eof_reached) return -1; - tag = get_le16(pb); + tag = avio_rl16(pb); len = tag & 0x3f; tag = tag >> 6; if (len == 0x3f) { - len = get_le32(pb); + len = avio_rl32(pb); } -// av_log(NULL, AV_LOG_DEBUG, "Tag: %d - Len: %d\n", tag, len); *len_ptr = len; return tag; } @@ -52,13 +61,13 @@ static int swf_probe(AVProbeData *p) return 0; } -static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int swf_read_header(AVFormatContext *s) { SWFContext *swf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int nbits, len, tag; - tag = get_be32(pb) & 0xffffff00; + tag = avio_rb32(pb) & 0xffffff00; if (tag == MKBETAG('C', 'W', 'S', 0)) { av_log(s, AV_LOG_ERROR, "Compressed SWF format not supported\n"); @@ -66,13 +75,13 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) } if (tag != MKBETAG('F', 'W', 'S', 0)) return AVERROR(EIO); - get_le32(pb); + avio_rl32(pb); /* skip rectangle size */ - nbits = get_byte(pb) >> 3; + nbits = avio_r8(pb) >> 3; len = (4 * nbits - 3 + 7) / 8; - url_fskip(pb, len); - swf->frame_rate = get_le16(pb); /* 8.8 fixed */ - get_le16(pb); /* frame count */ + avio_skip(pb, len); + swf->frame_rate = avio_rl16(pb); /* 8.8 fixed */ + avio_rl16(pb); /* frame count */ swf->samples_per_frame = 0; s->ctx_flags |= AVFMTCTX_NOHEADER; @@ -82,37 +91,41 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) { SWFContext *swf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; AVStream *vst = NULL, *ast = NULL, *st = 0; - int tag, len, i, frame, v; + int tag, len, i, frame, v, res; for(;;) { - uint64_t pos = url_ftell(pb); + uint64_t pos = avio_tell(pb); tag = get_swf_tag(pb, &len); if (tag < 0) return AVERROR(EIO); + if (len < 0) { + av_log(s, AV_LOG_ERROR, "invalid tag length: %d\n", len); + return AVERROR_INVALIDDATA; + } if (tag == TAG_VIDEOSTREAM) { - int ch_id = get_le16(pb); + int ch_id = avio_rl16(pb); len -= 2; for (i=0; inb_streams; i++) { st = s->streams[i]; - if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->id == ch_id) goto skip; } - get_le16(pb); - get_le16(pb); - get_le16(pb); - get_byte(pb); + avio_rl16(pb); + avio_rl16(pb); + avio_rl16(pb); + avio_r8(pb); /* Check for FLV1 */ - vst = av_new_stream(s, ch_id); + vst = avformat_new_stream(s, NULL); if (!vst) return -1; - 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 }; + vst->id = ch_id; + vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; + vst->codec->codec_id = ff_codec_get_id(ff_swf_codec_tags, avio_r8(pb)); + avpriv_set_pts_info(vst, 16, 256, swf->frame_rate); len -= 8; } else if (tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2) { /* streaming found */ @@ -120,35 +133,43 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) for (i=0; inb_streams; i++) { st = s->streams[i]; - if (st->codec->codec_type == CODEC_TYPE_AUDIO && st->id == -1) + if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->id == -1) goto skip; } - 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 */ + avio_r8(pb); + v = avio_r8(pb); + swf->samples_per_frame = avio_rl16(pb); + ast = avformat_new_stream(s, NULL); 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->id = -1; /* -1 to avoid clash with video stream ch_id */ + if (v & 1) { + ast->codec->channels = 2; + ast->codec->channel_layout = AV_CH_LAYOUT_STEREO; + } else { + ast->codec->channels = 1; + ast->codec->channel_layout = AV_CH_LAYOUT_MONO; + } + ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; + ast->codec->codec_id = ff_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); + ast->codec->sample_rate = 44100 >> (3 - sample_rate_code); + avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate); len -= 4; } else if (tag == TAG_VIDEOFRAME) { - int ch_id = get_le16(pb); + int ch_id = avio_rl16(pb); len -= 2; for(i=0; inb_streams; i++) { st = s->streams[i]; - if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) { - frame = get_le16(pb); - av_get_packet(pb, pkt, len-2); + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->id == ch_id) { + frame = avio_rl16(pb); + len -= 2; + if (len <= 0) + goto skip; + if ((res = av_get_packet(pb, pkt, len)) < 0) + return res; pkt->pos = pos; pkt->pts = frame; pkt->stream_index = st->index; @@ -158,61 +179,72 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) } else if (tag == TAG_STREAMBLOCK) { for (i = 0; i < s->nb_streams; i++) { st = s->streams[i]; - if (st->codec->codec_type == CODEC_TYPE_AUDIO && st->id == -1) { - 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->pos = pos; - pkt->stream_index = st->index; - return pkt->size; + if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->id == -1) { + if (st->codec->codec_id == AV_CODEC_ID_MP3) { + avio_skip(pb, 4); + len -= 4; + if (len <= 0) + goto skip; + if ((res = av_get_packet(pb, pkt, len)) < 0) + return res; + } else { // ADPCM, PCM + if (len <= 0) + goto skip; + if ((res = av_get_packet(pb, pkt, len)) < 0) + return res; + } + pkt->pos = pos; + pkt->stream_index = st->index; + return pkt->size; } } } else if (tag == TAG_JPEG2) { for (i=0; inb_streams; i++) { st = s->streams[i]; - if (st->codec->codec_id == CODEC_ID_MJPEG && st->id == -2) + if (st->codec->codec_id == AV_CODEC_ID_MJPEG && 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 = avformat_new_stream(s, NULL); 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 }; + vst->id = -2; /* -2 to avoid clash with video stream and audio stream */ + vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; + vst->codec->codec_id = AV_CODEC_ID_MJPEG; + avpriv_set_pts_info(vst, 64, 256, swf->frame_rate); st = vst; } - get_le16(pb); /* BITMAP_ID */ - av_new_packet(pkt, len-2); - get_buffer(pb, pkt->data, 4); + avio_rl16(pb); /* BITMAP_ID */ + len -= 2; + if (len < 4) + goto skip; + if ((res = av_new_packet(pkt, len)) < 0) + return res; + avio_read(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); + avio_read(pb, pkt->data, pkt->size); } else { - get_buffer(pb, pkt->data + 4, pkt->size - 4); + avio_read(pb, pkt->data + 4, pkt->size - 4); } pkt->pos = pos; pkt->stream_index = st->index; return pkt->size; } skip: - url_fskip(pb, len); + len = FFMAX(0, len); + avio_skip(pb, len); } - return 0; } -AVInputFormat swf_demuxer = { - "swf", - NULL_IF_CONFIG_SMALL("Flash format"), - sizeof(SWFContext), - swf_probe, - swf_read_header, - swf_read_packet, +AVInputFormat ff_swf_demuxer = { + .name = "swf", + .long_name = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash)"), + .priv_data_size = sizeof(SWFContext), + .read_probe = swf_probe, + .read_header = swf_read_header, + .read_packet = swf_read_packet, };