X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fwestwood.c;h=82b7e94840fc3a945f5267eeae11731c33cae9b8;hb=2215c39e94e01f57b3191a29e0e51d7e230daf49;hp=0ff4fcf63fd3fb5b35a2c837640dda23b4472db2;hpb=b78e7197a81e193827cf2408fe25bc1f14843a72;p=ffmpeg diff --git a/libavformat/westwood.c b/libavformat/westwood.c index 0ff4fcf63fd..82b7e94840f 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -2,25 +2,25 @@ * Westwood Studios Multimedia Formats Demuxer (VQA, AUD) * Copyright (c) 2003 The ffmpeg Project * - * 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 westwood.c + * @file * Westwood Studios VQA & AUD file demuxers * by Mike Melanson (melanson@pcisys.net) * for more information on the Westwood file formats, visit: @@ -33,7 +33,9 @@ * qualify a file. Refer to wsaud_probe() for the precise parameters. */ +#include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" #define AUD_HEADER_SIZE 12 #define AUD_CHUNK_PREAMBLE_SIZE 8 @@ -44,6 +46,7 @@ #define VQHD_TAG MKBETAG('V', 'Q', 'H', 'D') #define FINF_TAG MKBETAG('F', 'I', 'N', 'F') #define SND0_TAG MKBETAG('S', 'N', 'D', '0') +#define SND1_TAG MKBETAG('S', 'N', 'D', '1') #define SND2_TAG MKBETAG('S', 'N', 'D', '2') #define VQFR_TAG MKBETAG('V', 'Q', 'F', 'R') @@ -54,17 +57,17 @@ #define PINF_TAG MKBETAG('P', 'I', 'N', 'F') #define PINH_TAG MKBETAG('P', 'I', 'N', 'H') #define PIND_TAG MKBETAG('P', 'I', 'N', 'D') +#define CMDS_TAG MKBETAG('C', 'M', 'D', 'S') #define VQA_HEADER_SIZE 0x2A #define VQA_FRAMERATE 15 -#define VQA_VIDEO_PTS_INC (90000 / VQA_FRAMERATE) #define VQA_PREAMBLE_SIZE 8 typedef struct WsAudDemuxContext { int audio_samplerate; int audio_channels; int audio_bits; - int audio_type; + enum CodecID audio_type; int audio_stream_index; int64_t audio_frame_counter; } WsAudDemuxContext; @@ -78,7 +81,6 @@ typedef struct WsVqaDemuxContext { int video_stream_index; int64_t audio_frame_counter; - int64_t video_pts; } WsVqaDemuxContext; static int wsaud_probe(AVProbeData *p) @@ -88,26 +90,35 @@ static int wsaud_probe(AVProbeData *p) /* Probabilistic content detection strategy: There is no file signature * so perform sanity checks on various header parameters: * 8000 <= sample rate (16 bits) <= 48000 ==> 40001 acceptable numbers + * flags <= 0x03 (2 LSBs are used) ==> 4 acceptable numbers * compression type (8 bits) = 1 or 99 ==> 2 acceptable numbers - * There is a total of 24 bits. The number space contains 2^24 = - * 16777216 numbers. There are 40001 * 2 = 80002 acceptable combinations - * of numbers. There is a 80002/16777216 = 0.48% chance of a false - * positive. + * first audio chunk signature (32 bits) ==> 1 acceptable number + * The number space contains 2^64 numbers. There are 40001 * 4 * 2 * 1 = + * 320008 acceptable number combinations. */ - if (p->buf_size < AUD_HEADER_SIZE) + if (p->buf_size < AUD_HEADER_SIZE + AUD_CHUNK_PREAMBLE_SIZE) return 0; /* check sample rate */ - field = LE_16(&p->buf[0]); + field = AV_RL16(&p->buf[0]); if ((field < 8000) || (field > 48000)) return 0; + /* enforce the rule that the top 6 bits of this flags field are reserved (0); + * this might not be true, but enforce it until deemed unnecessary */ + if (p->buf[10] & 0xFC) + return 0; + /* note: only check for WS IMA (type 99) right now since there is no * support for type 1 */ if (p->buf[11] != 99) return 0; + /* read ahead to the first audio chunk and validate the first header signature */ + if (AV_RL32(&p->buf[16]) != AUD_CHUNK_SIGNATURE) + return 0; + /* return 1/2 certainty since this file check is a little sketchy */ return AVPROBE_SCORE_MAX / 2; } @@ -115,14 +126,14 @@ static int wsaud_probe(AVProbeData *p) static int wsaud_read_header(AVFormatContext *s, AVFormatParameters *ap) { - WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data; - ByteIOContext *pb = &s->pb; + WsAudDemuxContext *wsaud = s->priv_data; + AVIOContext *pb = s->pb; AVStream *st; unsigned char header[AUD_HEADER_SIZE]; - if (get_buffer(pb, header, AUD_HEADER_SIZE) != AUD_HEADER_SIZE) - return AVERROR_IO; - wsaud->audio_samplerate = LE_16(&header[0]); + if (avio_read(pb, header, AUD_HEADER_SIZE) != AUD_HEADER_SIZE) + return AVERROR(EIO); + wsaud->audio_samplerate = AV_RL16(&header[0]); if (header[11] == 99) wsaud->audio_type = CODEC_ID_ADPCM_IMA_WS; else @@ -134,19 +145,19 @@ static int wsaud_read_header(AVFormatContext *s, wsaud->audio_bits = (((header[10] & 0x2) >> 1) + 1) * 8; /* initialize the audio decoder stream */ - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) - return AVERROR_NOMEM; - av_set_pts_info(st, 33, 1, wsaud->audio_samplerate); - st->codec->codec_type = CODEC_TYPE_AUDIO; + return AVERROR(ENOMEM); + avpriv_set_pts_info(st, 33, 1, wsaud->audio_samplerate); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = wsaud->audio_type; st->codec->codec_tag = 0; /* no tag */ st->codec->channels = wsaud->audio_channels; st->codec->sample_rate = wsaud->audio_samplerate; - st->codec->bits_per_sample = wsaud->audio_bits; + st->codec->bits_per_coded_sample = wsaud->audio_bits; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample / 4; - st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; + st->codec->bits_per_coded_sample / 4; + st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; wsaud->audio_stream_index = st->index; wsaud->audio_frame_counter = 0; @@ -157,24 +168,24 @@ static int wsaud_read_header(AVFormatContext *s, static int wsaud_read_packet(AVFormatContext *s, AVPacket *pkt) { - WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data; - ByteIOContext *pb = &s->pb; + WsAudDemuxContext *wsaud = s->priv_data; + AVIOContext *pb = s->pb; unsigned char preamble[AUD_CHUNK_PREAMBLE_SIZE]; unsigned int chunk_size; int ret = 0; - if (get_buffer(pb, preamble, AUD_CHUNK_PREAMBLE_SIZE) != + if (avio_read(pb, preamble, AUD_CHUNK_PREAMBLE_SIZE) != AUD_CHUNK_PREAMBLE_SIZE) - return AVERROR_IO; + return AVERROR(EIO); /* validate the chunk */ - if (LE_32(&preamble[4]) != AUD_CHUNK_SIGNATURE) + if (AV_RL32(&preamble[4]) != AUD_CHUNK_SIGNATURE) return AVERROR_INVALIDDATA; - chunk_size = LE_16(&preamble[0]); + chunk_size = AV_RL16(&preamble[0]); ret= av_get_packet(pb, pkt, chunk_size); if (ret != chunk_size) - return AVERROR_IO; + return AVERROR(EIO); pkt->stream_index = wsaud->audio_stream_index; pkt->pts = wsaud->audio_frame_counter; pkt->pts /= wsaud->audio_samplerate; @@ -185,14 +196,6 @@ static int wsaud_read_packet(AVFormatContext *s, return ret; } -static int wsaud_read_close(AVFormatContext *s) -{ -// WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data; - - return 0; -} - - static int wsvqa_probe(AVProbeData *p) { /* need 12 bytes to qualify */ @@ -200,8 +203,8 @@ static int wsvqa_probe(AVProbeData *p) return 0; /* check for the VQA signatures */ - if ((BE_32(&p->buf[0]) != FORM_TAG) || - (BE_32(&p->buf[8]) != WVQA_TAG)) + if ((AV_RB32(&p->buf[0]) != FORM_TAG) || + (AV_RB32(&p->buf[8]) != WVQA_TAG)) return 0; return AVPROBE_SCORE_MAX; @@ -210,8 +213,8 @@ static int wsvqa_probe(AVProbeData *p) static int wsvqa_read_header(AVFormatContext *s, AVFormatParameters *ap) { - WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; - ByteIOContext *pb = &s->pb; + WsVqaDemuxContext *wsvqa = s->priv_data; + AVIOContext *pb = s->pb; AVStream *st; unsigned char *header; unsigned char scratch[VQA_PREAMBLE_SIZE]; @@ -219,45 +222,52 @@ static int wsvqa_read_header(AVFormatContext *s, unsigned int chunk_size; /* initialize the video decoder stream */ - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) - return AVERROR_NOMEM; - av_set_pts_info(st, 33, 1, 90000); + return AVERROR(ENOMEM); + avpriv_set_pts_info(st, 33, 1, VQA_FRAMERATE); wsvqa->video_stream_index = st->index; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_WS_VQA; st->codec->codec_tag = 0; /* no fourcc */ /* skip to the start of the VQA header */ - url_fseek(pb, 20, SEEK_SET); + avio_seek(pb, 20, SEEK_SET); /* the VQA header needs to go to the decoder */ st->codec->extradata_size = VQA_HEADER_SIZE; st->codec->extradata = av_mallocz(VQA_HEADER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); header = (unsigned char *)st->codec->extradata; - if (get_buffer(pb, st->codec->extradata, VQA_HEADER_SIZE) != + if (avio_read(pb, st->codec->extradata, VQA_HEADER_SIZE) != VQA_HEADER_SIZE) { av_free(st->codec->extradata); - return AVERROR_IO; + return AVERROR(EIO); } - st->codec->width = LE_16(&header[6]); - st->codec->height = LE_16(&header[8]); + st->codec->width = AV_RL16(&header[6]); + st->codec->height = AV_RL16(&header[8]); - /* initialize the audio decoder stream is sample rate is non-zero */ - if (LE_16(&header[24])) { - st = av_new_stream(s, 0); + /* initialize the audio decoder stream for VQA v1 or nonzero samplerate */ + if (AV_RL16(&header[24]) || (AV_RL16(&header[0]) == 1 && AV_RL16(&header[2]) == 1)) { + st = avformat_new_stream(s, NULL); if (!st) - return AVERROR_NOMEM; - av_set_pts_info(st, 33, 1, 90000); - st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS; + return AVERROR(ENOMEM); + avpriv_set_pts_info(st, 33, 1, VQA_FRAMERATE); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + if (AV_RL16(&header[0]) == 1) + st->codec->codec_id = CODEC_ID_WESTWOOD_SND1; + else + st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS; st->codec->codec_tag = 0; /* no tag */ - st->codec->sample_rate = LE_16(&header[24]); + st->codec->sample_rate = AV_RL16(&header[24]); + if (!st->codec->sample_rate) + st->codec->sample_rate = 22050; st->codec->channels = header[26]; - st->codec->bits_per_sample = 16; + if (!st->codec->channels) + st->codec->channels = 1; + st->codec->bits_per_coded_sample = 16; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample / 4; - st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; + st->codec->bits_per_coded_sample / 4; + st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; wsvqa->audio_stream_index = st->index; wsvqa->audio_samplerate = st->codec->sample_rate; @@ -268,12 +278,12 @@ static int wsvqa_read_header(AVFormatContext *s, /* there are 0 or more chunks before the FINF chunk; iterate until * FINF has been skipped and the file will be ready to be demuxed */ do { - if (get_buffer(pb, scratch, VQA_PREAMBLE_SIZE) != VQA_PREAMBLE_SIZE) { + if (avio_read(pb, scratch, VQA_PREAMBLE_SIZE) != VQA_PREAMBLE_SIZE) { av_free(st->codec->extradata); - return AVERROR_IO; + return AVERROR(EIO); } - chunk_tag = BE_32(&scratch[0]); - chunk_size = BE_32(&scratch[4]); + chunk_tag = AV_RB32(&scratch[0]); + chunk_size = AV_RB32(&scratch[4]); /* catch any unknown header tags, for curiousity */ switch (chunk_tag) { @@ -284,6 +294,7 @@ static int wsvqa_read_header(AVFormatContext *s, case PINH_TAG: case PIND_TAG: case FINF_TAG: + case CMDS_TAG: break; default: @@ -293,91 +304,91 @@ static int wsvqa_read_header(AVFormatContext *s, break; } - url_fseek(pb, chunk_size, SEEK_CUR); + avio_skip(pb, chunk_size); } while (chunk_tag != FINF_TAG); - wsvqa->video_pts = wsvqa->audio_frame_counter = 0; - return 0; } static int wsvqa_read_packet(AVFormatContext *s, AVPacket *pkt) { - WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; - ByteIOContext *pb = &s->pb; - int ret = 0; + WsVqaDemuxContext *wsvqa = s->priv_data; + AVIOContext *pb = s->pb; + int ret = -1; unsigned char preamble[VQA_PREAMBLE_SIZE]; unsigned int chunk_type; unsigned int chunk_size; int skip_byte; - if (get_buffer(pb, preamble, VQA_PREAMBLE_SIZE) != VQA_PREAMBLE_SIZE) - return AVERROR_IO; - - chunk_type = BE_32(&preamble[0]); - chunk_size = BE_32(&preamble[4]); - skip_byte = chunk_size & 0x01; + while (avio_read(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) { + chunk_type = AV_RB32(&preamble[0]); + chunk_size = AV_RB32(&preamble[4]); + skip_byte = chunk_size & 0x01; - if ((chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) { - - av_get_packet(pb, pkt, chunk_size); - if (ret != chunk_size) { - ret = AVERROR_IO; + if ((chunk_type == SND2_TAG || chunk_type == SND1_TAG) && wsvqa->audio_channels == 0) { + av_log(s, AV_LOG_ERROR, "audio chunk without any audio header information found\n"); + return AVERROR_INVALIDDATA; } - if (chunk_type == SND2_TAG) { - pkt->stream_index = wsvqa->audio_stream_index; - - pkt->pts = 90000; - pkt->pts *= wsvqa->audio_frame_counter; - pkt->pts /= wsvqa->audio_samplerate; - - /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ - wsvqa->audio_frame_counter += (chunk_size * 2) / - wsvqa->audio_channels; + if ((chunk_type == SND1_TAG) || (chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) { + + if (av_new_packet(pkt, chunk_size)) + return AVERROR(EIO); + ret = avio_read(pb, pkt->data, chunk_size); + if (ret != chunk_size) { + av_free_packet(pkt); + return AVERROR(EIO); + } + + if (chunk_type == SND2_TAG) { + pkt->stream_index = wsvqa->audio_stream_index; + /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ + wsvqa->audio_frame_counter += (chunk_size * 2) / wsvqa->audio_channels; + } else if(chunk_type == SND1_TAG) { + pkt->stream_index = wsvqa->audio_stream_index; + /* unpacked size is stored in header */ + wsvqa->audio_frame_counter += AV_RL16(pkt->data) / wsvqa->audio_channels; + } else { + pkt->stream_index = wsvqa->video_stream_index; + } + /* stay on 16-bit alignment */ + if (skip_byte) + avio_skip(pb, 1); + + return ret; } else { - pkt->stream_index = wsvqa->video_stream_index; - pkt->pts = wsvqa->video_pts; - wsvqa->video_pts += VQA_VIDEO_PTS_INC; + switch(chunk_type){ + case CMDS_TAG: + case SND0_TAG: + break; + default: + av_log(s, AV_LOG_INFO, "Skipping unknown chunk 0x%08X\n", chunk_type); + } + avio_skip(pb, chunk_size + skip_byte); } - - } else - return AVERROR_INVALIDDATA; - - /* stay on 16-bit alignment */ - if (skip_byte) - url_fseek(pb, 1, SEEK_CUR); + } return ret; } -static int wsvqa_read_close(AVFormatContext *s) -{ -// WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; - - return 0; -} - -#ifdef CONFIG_WSAUD_DEMUXER -AVInputFormat wsaud_demuxer = { - "wsaud", - "Westwood Studios audio format", - sizeof(WsAudDemuxContext), - wsaud_probe, - wsaud_read_header, - wsaud_read_packet, - wsaud_read_close, +#if CONFIG_WSAUD_DEMUXER +AVInputFormat ff_wsaud_demuxer = { + .name = "wsaud", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio format"), + .priv_data_size = sizeof(WsAudDemuxContext), + .read_probe = wsaud_probe, + .read_header = wsaud_read_header, + .read_packet = wsaud_read_packet, }; #endif -#ifdef CONFIG_WSVQA_DEMUXER -AVInputFormat wsvqa_demuxer = { - "wsvqa", - "Westwood Studios VQA format", - sizeof(WsVqaDemuxContext), - wsvqa_probe, - wsvqa_read_header, - wsvqa_read_packet, - wsvqa_read_close, +#if CONFIG_WSVQA_DEMUXER +AVInputFormat ff_wsvqa_demuxer = { + .name = "wsvqa", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"), + .priv_data_size = sizeof(WsVqaDemuxContext), + .read_probe = wsvqa_probe, + .read_header = wsvqa_read_header, + .read_packet = wsvqa_read_packet, }; #endif