* Westwood Studios Multimedia Formats Demuxer (VQA, AUD)
* Copyright (c) 2003 The ffmpeg Project
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
#include "avformat.h"
-#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \
- (((uint8_t*)(x))[2] << 16) | \
- (((uint8_t*)(x))[1] << 8) | \
- ((uint8_t*)(x))[0])
-#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \
- (((uint8_t*)(x))[1] << 16) | \
- (((uint8_t*)(x))[2] << 8) | \
- ((uint8_t*)(x))[3])
-
#define AUD_HEADER_SIZE 12
#define AUD_CHUNK_PREAMBLE_SIZE 8
#define AUD_CHUNK_SIGNATURE 0x0000DEAF
-#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
- ( (long)(unsigned char)(ch3) | \
- ( (long)(unsigned char)(ch2) << 8 ) | \
- ( (long)(unsigned char)(ch1) << 16 ) | \
- ( (long)(unsigned char)(ch0) << 24 ) )
-
-#define FORM_TAG FOURCC_TAG('F', 'O', 'R', 'M')
-#define WVQA_TAG FOURCC_TAG('W', 'V', 'Q', 'A')
-#define VQHD_TAG FOURCC_TAG('V', 'Q', 'H', 'D')
-#define FINF_TAG FOURCC_TAG('F', 'I', 'N', 'F')
-#define SND0_TAG FOURCC_TAG('S', 'N', 'D', '0')
-#define SND2_TAG FOURCC_TAG('S', 'N', 'D', '2')
-#define VQFR_TAG FOURCC_TAG('V', 'Q', 'F', 'R')
+#define FORM_TAG MKBETAG('F', 'O', 'R', 'M')
+#define WVQA_TAG MKBETAG('W', 'V', 'Q', 'A')
+#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 SND2_TAG MKBETAG('S', 'N', 'D', '2')
+#define VQFR_TAG MKBETAG('V', 'Q', 'F', 'R')
/* don't know what these tags are for, but acknowledge their existence */
-#define CINF_TAG FOURCC_TAG('C', 'I', 'N', 'F')
-#define CINH_TAG FOURCC_TAG('C', 'I', 'N', 'H')
-#define CIND_TAG FOURCC_TAG('C', 'I', 'N', 'D')
-#define PINF_TAG FOURCC_TAG('P', 'I', 'N', 'F')
-#define PINH_TAG FOURCC_TAG('P', 'I', 'N', 'H')
-#define PIND_TAG FOURCC_TAG('P', 'I', 'N', 'D')
+#define CINF_TAG MKBETAG('C', 'I', 'N', 'F')
+#define CINH_TAG MKBETAG('C', 'I', 'N', 'H')
+#define CIND_TAG MKBETAG('C', 'I', 'N', 'D')
+#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 VQA_HEADER_SIZE 0x2A
#define VQA_FRAMERATE 15
if ((field < 8000) || (field > 48000))
return 0;
- /* note: only check for WS IMA (type 99) right now since there is no
+ /* 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;
unsigned char header[AUD_HEADER_SIZE];
if (get_buffer(pb, header, AUD_HEADER_SIZE) != AUD_HEADER_SIZE)
- return -EIO;
+ return AVERROR_IO;
wsaud->audio_samplerate = LE_16(&header[0]);
if (header[11] == 99)
wsaud->audio_type = CODEC_ID_ADPCM_IMA_WS;
/* flag 1 indicates 16 bit audio */
wsaud->audio_bits = (((header[10] & 0x2) >> 1) + 1) * 8;
- /* set the pts reference the same as the sample rate */
- s->pts_num = 1;
- s->pts_den = wsaud->audio_samplerate;
-
/* initialize the audio decoder stream */
st = av_new_stream(s, 0);
if (!st)
return AVERROR_NOMEM;
- 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.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;
+ 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->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;
wsaud->audio_stream_index = st->index;
wsaud->audio_frame_counter = 0;
if (get_buffer(pb, preamble, AUD_CHUNK_PREAMBLE_SIZE) !=
AUD_CHUNK_PREAMBLE_SIZE)
- return -EIO;
+ return AVERROR_IO;
/* validate the chunk */
if (LE_32(&preamble[4]) != AUD_CHUNK_SIGNATURE)
return AVERROR_INVALIDDATA;
chunk_size = LE_16(&preamble[0]);
- if (av_new_packet(pkt, chunk_size))
- return -EIO;
+ ret= av_get_packet(pb, pkt, chunk_size);
+ if (ret != chunk_size)
+ return AVERROR_IO;
pkt->stream_index = wsaud->audio_stream_index;
pkt->pts = wsaud->audio_frame_counter;
pkt->pts /= wsaud->audio_samplerate;
- if ((ret = get_buffer(pb, pkt->data, chunk_size)) != chunk_size) {
- av_free_packet(pkt);
- ret = -EIO;
- }
/* 2 samples/byte, 1 or 2 samples per frame depending on stereo */
wsaud->audio_frame_counter += (chunk_size * 2) / wsaud->audio_channels;
unsigned int chunk_tag;
unsigned int chunk_size;
- /* set the pts reference (1 pts = 1/90000) */
- s->pts_num = 1;
- s->pts_den = 90000;
-
/* initialize the video decoder stream */
st = av_new_stream(s, 0);
if (!st)
return AVERROR_NOMEM;
+ av_set_pts_info(st, 33, 1, 90000);
wsvqa->video_stream_index = st->index;
- st->codec.codec_type = CODEC_TYPE_VIDEO;
- st->codec.codec_id = CODEC_ID_WS_VQA;
- st->codec.codec_tag = 0; /* no fourcc */
+ st->codec->codec_type = CODEC_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);
/* the VQA header needs to go to the decoder */
- st->codec.extradata_size = VQA_HEADER_SIZE;
- st->codec.extradata = av_malloc(VQA_HEADER_SIZE);
- header = (unsigned char *)st->codec.extradata;
- if (get_buffer(pb, st->codec.extradata, VQA_HEADER_SIZE) !=
+ 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) !=
VQA_HEADER_SIZE) {
- av_free(st->codec.extradata);
- return -EIO;
+ av_free(st->codec->extradata);
+ return AVERROR_IO;
}
- st->codec.width = LE_16(&header[6]);
- st->codec.height = LE_16(&header[8]);
+ st->codec->width = LE_16(&header[6]);
+ st->codec->height = LE_16(&header[8]);
/* initialize the audio decoder stream is sample rate is non-zero */
if (LE_16(&header[24])) {
st = av_new_stream(s, 0);
if (!st)
return AVERROR_NOMEM;
- st->codec.codec_type = CODEC_TYPE_AUDIO;
- 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.channels = header[26];
- st->codec.bits_per_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;
+ av_set_pts_info(st, 33, 1, 90000);
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
+ 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->channels = header[26];
+ st->codec->bits_per_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;
wsvqa->audio_stream_index = st->index;
- wsvqa->audio_samplerate = st->codec.sample_rate;
- wsvqa->audio_channels = st->codec.channels;
+ wsvqa->audio_samplerate = st->codec->sample_rate;
+ wsvqa->audio_channels = st->codec->channels;
wsvqa->audio_frame_counter = 0;
}
* 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) {
- av_free(st->codec.extradata);
- return -EIO;
+ av_free(st->codec->extradata);
+ return AVERROR_IO;
}
chunk_tag = BE_32(&scratch[0]);
chunk_size = BE_32(&scratch[4]);
break;
default:
- printf (" note: unknown chunk seen (%c%c%c%c)\n",
+ av_log (s, AV_LOG_ERROR, " note: unknown chunk seen (%c%c%c%c)\n",
scratch[0], scratch[1],
scratch[2], scratch[3]);
break;
int skip_byte;
if (get_buffer(pb, preamble, VQA_PREAMBLE_SIZE) != VQA_PREAMBLE_SIZE)
- return -EIO;
+ return AVERROR_IO;
chunk_type = BE_32(&preamble[0]);
chunk_size = BE_32(&preamble[4]);
if ((chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) {
- if (av_new_packet(pkt, chunk_size))
- return -EIO;
- ret = get_buffer(pb, pkt->data, chunk_size);
+ av_get_packet(pb, pkt, chunk_size);
if (ret != chunk_size) {
- av_free_packet(pkt);
- ret = -EIO;
+ ret = AVERROR_IO;
}
if (chunk_type == SND2_TAG) {
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_frame_counter += (chunk_size * 2) /
wsvqa->audio_channels;
} else {
pkt->stream_index = wsvqa->video_stream_index;
return 0;
}
-static AVInputFormat wsaud_iformat = {
+#ifdef CONFIG_WSAUD_DEMUXER
+AVInputFormat wsaud_demuxer = {
"wsaud",
"Westwood Studios audio format",
sizeof(WsAudDemuxContext),
wsaud_read_packet,
wsaud_read_close,
};
-
-static AVInputFormat wsvqa_iformat = {
+#endif
+#ifdef CONFIG_WSVQA_DEMUXER
+AVInputFormat wsvqa_demuxer = {
"wsvqa",
"Westwood Studios VQA format",
sizeof(WsVqaDemuxContext),
wsvqa_read_packet,
wsvqa_read_close,
};
-
-int westwood_init(void)
-{
- av_register_input_format(&wsaud_iformat);
- av_register_input_format(&wsvqa_iformat);
- return 0;
-}
+#endif
projects / ffmpeg / blobdiff