* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
#include "voc.h"
+#include "internal.h"
static int voc_probe(AVProbeData *p)
static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
- voc_dec_context_t *voc = s->priv_data;
+ VocDecContext *voc = s->priv_data;
ByteIOContext *pb = s->pb;
int header_size;
AVStream *st;
st = av_new_stream(s, 0);
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
voc->remaining_size = 0;
return 0;
int
voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
{
- voc_dec_context_t *voc = s->priv_data;
+ VocDecContext *voc = s->priv_data;
AVCodecContext *dec = st->codec;
ByteIOContext *pb = s->pb;
- voc_type_t type;
+ VocType type;
int size;
int sample_rate = 0;
int channels = 1;
if (type == VOC_TYPE_EOF)
return AVERROR(EIO);
voc->remaining_size = get_le24(pb);
+ if (!voc->remaining_size) {
+ if (url_is_streamed(s->pb))
+ return AVERROR(EIO);
+ voc->remaining_size = url_fsize(pb) - url_ftell(pb);
+ }
max_size -= 4;
switch (type) {
if (sample_rate)
dec->sample_rate = sample_rate;
dec->channels = channels;
- dec->codec_id = codec_get_id(ff_voc_codec_tags, get_byte(pb));
+ dec->codec_id = ff_codec_get_id(ff_voc_codec_tags, get_byte(pb));
dec->bits_per_coded_sample = av_get_bits_per_sample(dec->codec_id);
voc->remaining_size -= 2;
max_size -= 2;
dec->sample_rate = get_le32(pb);
dec->bits_per_coded_sample = get_byte(pb);
dec->channels = get_byte(pb);
- dec->codec_id = codec_get_id(ff_voc_codec_tags, get_le16(pb));
+ dec->codec_id = ff_codec_get_id(ff_voc_codec_tags, get_le16(pb));
url_fskip(pb, 4);
voc->remaining_size -= 12;
max_size -= 12;
AVInputFormat voc_demuxer = {
"voc",
NULL_IF_CONFIG_SMALL("Creative Voice file format"),
- sizeof(voc_dec_context_t),
+ sizeof(VocDecContext),
voc_probe,
voc_read_header,
voc_read_packet,