X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fwestwood.c;h=d2736accc554b8b84e8983f95610a1c89343b77d;hb=9f2fc1268cb307da84910ac236e10b24bdda5d0a;hp=5c42e3b550853576271c471e9917e713e776af36;hpb=61710f7bb5f836b388c9e68ba327c1ffc98450fc;p=ffmpeg diff --git a/libavformat/westwood.c b/libavformat/westwood.c index 5c42e3b5508..d2736accc55 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -20,7 +20,7 @@ */ /** - * @file westwood.c + * @file libavformat/westwood.c * Westwood Studios VQA & AUD file demuxers * by Mike Melanson (melanson@pcisys.net) * for more information on the Westwood file formats, visit: @@ -33,6 +33,7 @@ * qualify a file. Refer to wsaud_probe() for the precise parameters. */ +#include "libavutil/intreadwrite.h" #include "avformat.h" #define AUD_HEADER_SIZE 12 @@ -66,7 +67,7 @@ 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; @@ -90,26 +91,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; } @@ -117,14 +127,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; + ByteIOContext *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]); + return AVERROR(EIO); + wsaud->audio_samplerate = AV_RL16(&header[0]); if (header[11] == 99) wsaud->audio_type = CODEC_ID_ADPCM_IMA_WS; else @@ -138,17 +148,17 @@ static int wsaud_read_header(AVFormatContext *s, /* initialize the audio decoder stream */ st = av_new_stream(s, 0); if (!st) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); av_set_pts_info(st, 33, 1, wsaud->audio_samplerate); st->codec->codec_type = CODEC_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; @@ -159,24 +169,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; + ByteIOContext *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) != 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; @@ -187,14 +197,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 */ @@ -202,8 +204,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; @@ -212,8 +214,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; + ByteIOContext *pb = s->pb; AVStream *st; unsigned char *header; unsigned char scratch[VQA_PREAMBLE_SIZE]; @@ -223,8 +225,8 @@ static int wsvqa_read_header(AVFormatContext *s, /* initialize the video decoder stream */ st = av_new_stream(s, 0); if (!st) - return AVERROR_NOMEM; - av_set_pts_info(st, 33, 1, 90000); + return AVERROR(ENOMEM); + av_set_pts_info(st, 33, 1, VQA_FRAMERATE); wsvqa->video_stream_index = st->index; st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_WS_VQA; @@ -240,36 +242,33 @@ static int wsvqa_read_header(AVFormatContext *s, if (get_buffer(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->time_base.num = 1; - st->codec->time_base.den = VQA_FRAMERATE; + st->codec->width = AV_RL16(&header[6]); + st->codec->height = AV_RL16(&header[8]); /* initialize the audio decoder stream for VQA v1 or nonzero samplerate */ - if (LE_16(&header[24]) || (LE_16(&header[0]) == 1)) { + if (AV_RL16(&header[24]) || (AV_RL16(&header[0]) == 1 && AV_RL16(&header[2]) == 1)) { st = av_new_stream(s, 0); if (!st) - return AVERROR_NOMEM; - av_set_pts_info(st, 33, 1, 90000); + return AVERROR(ENOMEM); + av_set_pts_info(st, 33, 1, VQA_FRAMERATE); st->codec->codec_type = CODEC_TYPE_AUDIO; - if (LE_16(&header[0]) == 1) + 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]; if (!st->codec->channels) st->codec->channels = 1; - st->codec->bits_per_sample = 16; + 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; @@ -282,10 +281,10 @@ static int wsvqa_read_header(AVFormatContext *s, do { if (get_buffer(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) { @@ -317,8 +316,8 @@ static int wsvqa_read_header(AVFormatContext *s, static int wsvqa_read_packet(AVFormatContext *s, AVPacket *pkt) { - WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; - ByteIOContext *pb = &s->pb; + WsVqaDemuxContext *wsvqa = s->priv_data; + ByteIOContext *pb = s->pb; int ret = -1; unsigned char preamble[VQA_PREAMBLE_SIZE]; unsigned int chunk_type; @@ -326,41 +325,30 @@ static int wsvqa_read_packet(AVFormatContext *s, int skip_byte; while (get_buffer(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) { - chunk_type = BE_32(&preamble[0]); - chunk_size = BE_32(&preamble[4]); + chunk_type = AV_RB32(&preamble[0]); + chunk_size = AV_RB32(&preamble[4]); skip_byte = chunk_size & 0x01; if ((chunk_type == SND1_TAG) || (chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) { if (av_new_packet(pkt, chunk_size)) - return AVERROR_IO; + return AVERROR(EIO); ret = get_buffer(pb, pkt->data, chunk_size); if (ret != chunk_size) { av_free_packet(pkt); - return AVERROR_IO; + return AVERROR(EIO); } 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; } else if(chunk_type == SND1_TAG) { pkt->stream_index = wsvqa->audio_stream_index; - - pkt->pts = 90000; - pkt->pts *= wsvqa->audio_frame_counter; - pkt->pts /= wsvqa->audio_samplerate; - /* unpacked size is stored in header */ - wsvqa->audio_frame_counter += LE_16(pkt->data) / wsvqa->audio_channels; + wsvqa->audio_frame_counter += AV_RL16(pkt->data) / wsvqa->audio_channels; } else { pkt->stream_index = wsvqa->video_stream_index; - pkt->pts = wsvqa->video_pts; wsvqa->video_pts += VQA_VIDEO_PTS_INC; } /* stay on 16-bit alignment */ @@ -383,32 +371,23 @@ static int wsvqa_read_packet(AVFormatContext *s, return ret; } -static int wsvqa_read_close(AVFormatContext *s) -{ -// WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; - - return 0; -} - -#ifdef CONFIG_WSAUD_DEMUXER +#if CONFIG_WSAUD_DEMUXER AVInputFormat wsaud_demuxer = { "wsaud", - "Westwood Studios audio format", + NULL_IF_CONFIG_SMALL("Westwood Studios audio format"), sizeof(WsAudDemuxContext), wsaud_probe, wsaud_read_header, wsaud_read_packet, - wsaud_read_close, }; #endif -#ifdef CONFIG_WSVQA_DEMUXER +#if CONFIG_WSVQA_DEMUXER AVInputFormat wsvqa_demuxer = { "wsvqa", - "Westwood Studios VQA format", + NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"), sizeof(WsVqaDemuxContext), wsvqa_probe, wsvqa_read_header, wsvqa_read_packet, - wsvqa_read_close, }; #endif