X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fiff.c;h=e6213738628e3ef506c778567d77f4581b08b737;hb=6149485f6c6c2e600987a2759d97c546d4cf5da0;hp=0778bf492180c39f7d13622b1e0cafba62e522f4;hpb=02c4f626a8f3d6ffb9e306e8f4193efe6592402c;p=ffmpeg diff --git a/libavformat/iff.c b/libavformat/iff.c index 0778bf49218..e6213738628 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -2,26 +2,27 @@ * IFF (.iff) file demuxer * Copyright (c) 2008 Jaikrishnan Menon * Copyright (c) 2010 Peter Ross + * Copyright (c) 2010 Sebastian Vater * - * 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 */ /** - * @file libavformat/iff.c + * @file * IFF file demuxer * by Jaikrishnan Menon * for more information on the .iff file format, visit: @@ -29,6 +30,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/dict.h" #include "avformat.h" #define ID_8SVX MKTAG('8','S','V','X') @@ -51,33 +53,47 @@ #define ID_NAME MKTAG('N','A','M','E') #define ID_TEXT MKTAG('T','E','X','T') #define ID_BODY MKTAG('B','O','D','Y') +#define ID_ANNO MKTAG('A','N','N','O') #define LEFT 2 #define RIGHT 4 #define STEREO 6 -#define PACKET_SIZE 1024 +typedef enum { + COMP_NONE, + COMP_FIB, + COMP_EXP +} svx8_compression_type; -typedef enum {COMP_NONE, COMP_FIB, COMP_EXP} svx8_compression_type; -typedef enum {BITMAP_RAW, BITMAP_BYTERUN1} bitmap_compression_type; +typedef enum { + BITMAP_RAW, + BITMAP_BYTERUN1 +} bitmap_compression_type; typedef struct { + uint64_t body_pos; uint32_t body_size; uint32_t sent_bytes; - uint32_t audio_frame_count; } IffDemuxContext; -static void interleave_stereo(const uint8_t *src, uint8_t *dest, int size) +/* Metadata string read */ +static int get_metadata(AVFormatContext *s, + const char *const tag, + const unsigned data_size) { - uint8_t *end = dest + size; - size = size>>1; + uint8_t *buf = ((data_size + 1) == 0) ? NULL : av_malloc(data_size + 1); + + if (!buf) + return AVERROR(ENOMEM); - while(dest < end) { - *dest++ = *src; - *dest++ = *(src+size); - src++; + if (avio_read(s->pb, buf, data_size) < 0) { + av_free(buf); + return AVERROR(EIO); } + buf[data_size] = 0; + av_dict_set(&s->metadata, tag, buf, AV_DICT_DONT_STRDUP_VAL); + return 0; } static int iff_probe(AVProbeData *p) @@ -94,43 +110,51 @@ static int iff_read_header(AVFormatContext *s, AVFormatParameters *ap) { IffDemuxContext *iff = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; AVStream *st; uint32_t chunk_id, data_size; - int padding, done = 0; int compression = -1; - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) - return AVERROR(ENOMEM); + return AVERROR(ENOMEM); st->codec->channels = 1; - url_fskip(pb, 8); + avio_skip(pb, 8); // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content - st->codec->codec_tag = get_le32(pb); + st->codec->codec_tag = avio_rl32(pb); - while(!done && !url_feof(pb)) { - chunk_id = get_le32(pb); - data_size = get_be32(pb); - padding = data_size & 1; + while(!pb->eof_reached) { + uint64_t orig_pos; + int res; + const char *metadata_tag = NULL; + chunk_id = avio_rl32(pb); + data_size = avio_rb32(pb); + orig_pos = avio_tell(pb); switch(chunk_id) { case ID_VHDR: - st->codec->codec_type = CODEC_TYPE_AUDIO; - url_fskip(pb, 12); - st->codec->sample_rate = get_be16(pb); - url_fskip(pb, 1); - compression = get_byte(pb); - url_fskip(pb, 4); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + + if (data_size < 14) + return AVERROR_INVALIDDATA; + avio_skip(pb, 12); + st->codec->sample_rate = avio_rb16(pb); + if (data_size >= 16) { + avio_skip(pb, 1); + compression = avio_r8(pb); + } break; case ID_BODY: + iff->body_pos = avio_tell(pb); iff->body_size = data_size; - done = 1; break; case ID_CHAN: - st->codec->channels = (get_be32(pb) < 6) ? 1 : 2; + if (data_size < 4) + return AVERROR_INVALIDDATA; + st->codec->channels = (avio_rb32(pb) < 6) ? 1 : 2; break; case ID_CMAP: @@ -138,64 +162,86 @@ static int iff_read_header(AVFormatContext *s, st->codec->extradata = av_malloc(data_size); if (!st->codec->extradata) return AVERROR(ENOMEM); - if (get_buffer(pb, st->codec->extradata, data_size) < 0) + if (avio_read(pb, st->codec->extradata, data_size) < 0) return AVERROR(EIO); break; case ID_BMHD: - st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->width = get_be16(pb); - st->codec->height = get_be16(pb); - url_fskip(pb, 4); // x, y offset - st->codec->bits_per_coded_sample = get_byte(pb); - url_fskip(pb, 1); // masking - compression = get_byte(pb); - url_fskip(pb, 3); // paddding, transparent - st->sample_aspect_ratio.num = get_byte(pb); - st->sample_aspect_ratio.den = get_byte(pb); - url_fskip(pb, 4); // source page width, height + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + if (data_size <= 8) + return AVERROR_INVALIDDATA; + st->codec->width = avio_rb16(pb); + st->codec->height = avio_rb16(pb); + avio_skip(pb, 4); // x, y offset + st->codec->bits_per_coded_sample = avio_r8(pb); + if (data_size >= 11) { + avio_skip(pb, 1); // masking + compression = avio_r8(pb); + } + if (data_size >= 16) { + avio_skip(pb, 3); // paddding, transparent + st->sample_aspect_ratio.num = avio_r8(pb); + st->sample_aspect_ratio.den = avio_r8(pb); + } break; - default: - url_fseek(pb, data_size + padding, SEEK_CUR); + case ID_ANNO: + case ID_TEXT: + metadata_tag = "comment"; break; + + case ID_AUTH: + metadata_tag = "artist"; + break; + + case ID_COPYRIGHT: + metadata_tag = "copyright"; + break; + + case ID_NAME: + metadata_tag = "title"; + break; + } + + if (metadata_tag) { + if ((res = get_metadata(s, metadata_tag, data_size)) < 0) { + av_log(s, AV_LOG_ERROR, "cannot allocate metadata tag %s!", metadata_tag); + return res; + } } + avio_skip(pb, data_size - (avio_tell(pb) - orig_pos) + (data_size & 1)); } + avio_seek(pb, iff->body_pos, SEEK_SET); + switch(st->codec->codec_type) { - case CODEC_TYPE_AUDIO: - av_set_pts_info(st, 32, 1, st->codec->sample_rate); + case AVMEDIA_TYPE_AUDIO: + av_set_pts_info(st, 32, 1, st->codec->sample_rate); - switch(compression) { - case COMP_NONE: - st->codec->codec_id = CODEC_ID_PCM_S8; - break; - case COMP_FIB: - st->codec->codec_id = CODEC_ID_8SVX_FIB; - break; - case COMP_EXP: - st->codec->codec_id = CODEC_ID_8SVX_EXP; - break; - default: - av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n"); - return -1; - } + switch(compression) { + case COMP_NONE: + st->codec->codec_id = CODEC_ID_PCM_S8_PLANAR; + break; + case COMP_FIB: + st->codec->codec_id = CODEC_ID_8SVX_FIB; + break; + case COMP_EXP: + st->codec->codec_id = CODEC_ID_8SVX_EXP; + break; + default: + av_log(s, AV_LOG_ERROR, "unknown compression method\n"); + return -1; + } - st->codec->bits_per_coded_sample = 8; - st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; - st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; - break; + st->codec->bits_per_coded_sample = 8; + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; + st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; + break; - case CODEC_TYPE_VIDEO: + case AVMEDIA_TYPE_VIDEO: switch (compression) { case BITMAP_RAW: - if (st->codec->codec_tag == ID_ILBM) { - st->codec->codec_id = CODEC_ID_IFF_ILBM; - } else { - st->codec->codec_id = CODEC_ID_RAWVIDEO; - st->codec->pix_fmt = PIX_FMT_PAL8; - st->codec->codec_tag = 0; - } + st->codec->codec_id = CODEC_ID_IFF_ILBM; break; case BITMAP_BYTERUN1: st->codec->codec_id = CODEC_ID_IFF_BYTERUN1; @@ -212,67 +258,33 @@ static int iff_read_header(AVFormatContext *s, return 0; } -int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal); - static int iff_read_packet(AVFormatContext *s, AVPacket *pkt) { IffDemuxContext *iff = s->priv_data; - ByteIOContext *pb = s->pb; - AVStream *st = s->streams[0]; + AVIOContext *pb = s->pb; int ret; if(iff->sent_bytes >= iff->body_size) - return AVERROR(EIO); - - if(s->streams[0]->codec->channels == 2) { - uint8_t sample_buffer[PACKET_SIZE]; - - ret = get_buffer(pb, sample_buffer, PACKET_SIZE); - if(av_new_packet(pkt, PACKET_SIZE) < 0) { - av_log(s, AV_LOG_ERROR, "iff: cannot allocate packet \n"); - return AVERROR(ENOMEM); - } - interleave_stereo(sample_buffer, pkt->data, PACKET_SIZE); - } else if (s->streams[0]->codec->codec_id == CODEC_ID_RAWVIDEO) { - if(av_new_packet(pkt, iff->body_size + AVPALETTE_SIZE) < 0) { - return AVERROR(ENOMEM); - } + return AVERROR_EOF; - ret = ff_cmap_read_palette(st->codec, (uint32_t*)(pkt->data + iff->body_size)); - if (ret < 0) - return ret; - av_freep(&st->codec->extradata); - st->codec->extradata_size = 0; - - ret = get_buffer(pb, pkt->data, iff->body_size); - } else if (s->streams[0]->codec->codec_type == CODEC_TYPE_VIDEO) { - ret = av_get_packet(pb, pkt, iff->body_size); - } else { - ret = av_get_packet(pb, pkt, PACKET_SIZE); - } + ret = av_get_packet(pb, pkt, iff->body_size); + if (ret < 0) + return ret; if(iff->sent_bytes == 0) - pkt->flags |= PKT_FLAG_KEY; + pkt->flags |= AV_PKT_FLAG_KEY; + iff->sent_bytes = iff->body_size; - if(s->streams[0]->codec->codec_type == CODEC_TYPE_AUDIO) { - iff->sent_bytes += PACKET_SIZE; - } else { - iff->sent_bytes = iff->body_size; - } pkt->stream_index = 0; - if(s->streams[0]->codec->codec_type == CODEC_TYPE_AUDIO) { - pkt->pts = iff->audio_frame_count; - iff->audio_frame_count += ret / s->streams[0]->codec->channels; - } return ret; } -AVInputFormat iff_demuxer = { - "IFF", - NULL_IF_CONFIG_SMALL("IFF format"), - sizeof(IffDemuxContext), - iff_probe, - iff_read_header, - iff_read_packet, +AVInputFormat ff_iff_demuxer = { + .name = "IFF", + .long_name = NULL_IF_CONFIG_SMALL("IFF format"), + .priv_data_size = sizeof(IffDemuxContext), + .read_probe = iff_probe, + .read_header = iff_read_header, + .read_packet = iff_read_packet, };