summaryrefslogtreecommitdiff
path: root/libavformat/westwood_aud.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-01-24 11:40:23 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-01-24 14:13:47 -0500
commit10fef6bd6b3913c94d81276a271ac0c77c2c3525 (patch)
treebeea5ff202b7b09bbb0467c11cd52799324829e2 /libavformat/westwood_aud.c
parent0e6a8b5cf76f830923c85730e6369ca46cfe834c (diff)
downloadffmpeg-10fef6bd6b3913c94d81276a271ac0c77c2c3525.tar.gz
aud: simplify header parsing
also allows for removing some unused context fields
Diffstat (limited to 'libavformat/westwood_aud.c')
-rw-r--r--libavformat/westwood_aud.c49
1 files changed, 27 insertions, 22 deletions
diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c
index 27dc3fae63..79f2198745 100644
--- a/libavformat/westwood_aud.c
+++ b/libavformat/westwood_aud.c
@@ -42,10 +42,8 @@
#define AUD_CHUNK_SIGNATURE 0x0000DEAF
typedef struct WsAudDemuxContext {
- int audio_samplerate;
int audio_channels;
- int audio_bits;
- enum CodecID audio_type;
+ int audio_samplerate;
int audio_stream_index;
int64_t audio_frame_counter;
} WsAudDemuxContext;
@@ -97,37 +95,44 @@ static int wsaud_read_header(AVFormatContext *s,
AVIOContext *pb = s->pb;
AVStream *st;
unsigned char header[AUD_HEADER_SIZE];
+ int sample_rate, channels, codec;
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 if (header[11] == 1)
- wsaud->audio_type = CODEC_ID_WESTWOOD_SND1;
- else
- return AVERROR_INVALIDDATA;
- /* flag 0 indicates stereo */
- wsaud->audio_channels = (header[10] & 0x1) + 1;
- /* flag 1 indicates 16 bit audio */
- wsaud->audio_bits = (((header[10] & 0x2) >> 1) + 1) * 8;
+ sample_rate = AV_RL16(&header[0]);
+ channels = (header[10] & 0x1) + 1;
+ codec = header[11];
/* initialize the audio decoder stream */
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
- avpriv_set_pts_info(st, 64, 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;
- if (st->codec->codec_id == CODEC_ID_ADPCM_IMA_WS) {
+
+ switch (codec) {
+ case 1:
+ if (channels != 1) {
+ av_log_ask_for_sample(s, "Stereo WS-SND1 is not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ }
+ st->codec->codec_id = CODEC_ID_WESTWOOD_SND1;
+ break;
+ case 99:
+ st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS;
st->codec->bits_per_coded_sample = 4;
- st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * 4;
+ st->codec->bit_rate = channels * sample_rate * 4;
+ break;
+ default:
+ av_log_ask_for_sample(s, "Unknown codec: %d\n", codec);
+ return AVERROR_PATCHWELCOME;
}
+ avpriv_set_pts_info(st, 64, 1, sample_rate);
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->channels = channels;
+ st->codec->sample_rate = sample_rate;
+ wsaud->audio_channels = channels;
+ wsaud->audio_samplerate = sample_rate;
wsaud->audio_stream_index = st->index;
wsaud->audio_frame_counter = 0;