/*
* WavPack demuxer
- * Copyright (c) 2006 Konstantin Shishkov.
+ * Copyright (c) 2006 Konstantin Shishkov
*
* This file is part of FFmpeg.
*
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
-#include "allformats.h"
-#include "bswap.h"
// specs say that maximum block size is 1Mb
#define WV_BLOCK_LIMIT 1047576
typedef struct{
uint32_t blksize, flags;
int rate, chan, bpp;
+ uint32_t samples, soff;
int block_parsed;
uint8_t extra[WV_EXTRA_SIZE];
+ int64_t pos;
}WVContext;
static int wv_probe(AVProbeData *p)
int size;
int rate, bpp, chan;
+ wc->pos = url_ftell(pb);
tag = get_le32(pb);
if (tag != MKTAG('w', 'v', 'p', 'k'))
return -1;
}
wc->blksize = size;
ver = get_le16(pb);
- if(ver < 0x402 || ver > 0x40F){
+ if(ver < 0x402 || ver > 0x410){
av_log(ctx, AV_LOG_ERROR, "Unsupported version %03X\n", ver);
return -1;
}
get_byte(pb); // track no
get_byte(pb); // track sub index
- get_le32(pb); // total samples in file
- get_le32(pb); // offset in samples of current block
+ wc->samples = get_le32(pb); // total samples in file
+ wc->soff = get_le32(pb); // offset in samples of current block
get_buffer(pb, wc->extra, WV_EXTRA_SIZE);
- wc->flags = LE_32(wc->extra + 4);
+ wc->flags = AV_RL32(wc->extra + 4);
//parse flags
- if(wc->flags & WV_FLOAT){
- av_log(ctx, AV_LOG_ERROR, "Floating point data is not supported\n");
- return -1;
- }
- if(wc->flags & WV_HYBRID){
- av_log(ctx, AV_LOG_ERROR, "Hybrid coding mode is not supported\n");
- return -1;
- }
- if(wc->flags & WV_INT32){
- av_log(ctx, AV_LOG_ERROR, "Integer point data is not supported\n");
- return -1;
- }
-
bpp = ((wc->flags & 3) + 1) << 3;
chan = 1 + !(wc->flags & WV_MONO);
rate = wv_rates[(wc->flags >> 23) & 0xF];
if(!wc->chan) wc->chan = chan;
if(!wc->rate) wc->rate = rate;
- if(bpp != wc->bpp){
+ if(wc->flags && bpp != wc->bpp){
av_log(ctx, AV_LOG_ERROR, "Bits per sample differ, this block: %i, header block: %i\n", bpp, wc->bpp);
return -1;
}
- if(chan != wc->chan){
+ if(wc->flags && chan != wc->chan){
av_log(ctx, AV_LOG_ERROR, "Channels differ, this block: %i, header block: %i\n", chan, wc->chan);
return -1;
}
- if(rate != wc->rate){
+ if(wc->flags && rate != wc->rate){
av_log(ctx, AV_LOG_ERROR, "Sampling rate differ, this block: %i, header block: %i\n", rate, wc->rate);
return -1;
}
static int wv_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
WVContext *wc = s->priv_data;
AVStream *st;
st->codec->codec_id = CODEC_ID_WAVPACK;
st->codec->channels = wc->chan;
st->codec->sample_rate = wc->rate;
- st->codec->bits_per_sample = wc->bpp;
+ st->codec->bits_per_coded_sample = wc->bpp;
av_set_pts_info(st, 64, 1, wc->rate);
+ s->start_time = 0;
+ s->duration = (int64_t)wc->samples * AV_TIME_BASE / st->codec->sample_rate;
return 0;
}
AVPacket *pkt)
{
WVContext *wc = s->priv_data;
- int ret, samples;
+ int ret;
- if (url_feof(&s->pb))
- return -EIO;
+ if (url_feof(s->pb))
+ return AVERROR(EIO);
if(wc->block_parsed){
- if(wv_read_block_header(s, &s->pb) < 0)
+ if(wv_read_block_header(s, s->pb) < 0)
return -1;
}
- samples = LE_32(wc->extra);
- /* should not happen but who knows */
- if(samples * 2 * wc->chan > AVCODEC_MAX_AUDIO_FRAME_SIZE){
- av_log(s, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
- return -EIO;
- }
if(av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE) < 0)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
memcpy(pkt->data, wc->extra, WV_EXTRA_SIZE);
- ret = get_buffer(&s->pb, pkt->data + WV_EXTRA_SIZE, wc->blksize);
+ ret = get_buffer(s->pb, pkt->data + WV_EXTRA_SIZE, wc->blksize);
if(ret != wc->blksize){
av_free_packet(pkt);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
pkt->stream_index = 0;
wc->block_parsed = 1;
pkt->size = ret + WV_EXTRA_SIZE;
-
+ pkt->pts = wc->soff;
+ av_add_index_entry(s->streams[0], wc->pos, pkt->pts, 0, 0, AVINDEX_KEYFRAME);
return 0;
}
-static int wv_read_close(AVFormatContext *s)
+static int wv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
{
+ AVStream *st = s->streams[stream_index];
+ WVContext *wc = s->priv_data;
+ AVPacket pkt1, *pkt = &pkt1;
+ int ret;
+ int index = av_index_search_timestamp(st, timestamp, flags);
+ int64_t pos, pts;
+
+ /* if found, seek there */
+ if (index >= 0){
+ wc->block_parsed = 1;
+ url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
+ return 0;
+ }
+ /* if timestamp is out of bounds, return error */
+ if(timestamp < 0 || timestamp >= s->duration)
+ return -1;
+
+ pos = url_ftell(s->pb);
+ do{
+ ret = av_read_frame(s, pkt);
+ if (ret < 0){
+ url_fseek(s->pb, pos, SEEK_SET);
+ return -1;
+ }
+ pts = pkt->pts;
+ av_free_packet(pkt);
+ }while(pts < timestamp);
return 0;
}
AVInputFormat wv_demuxer = {
"wv",
- "WavPack",
+ NULL_IF_CONFIG_SMALL("WavPack"),
sizeof(WVContext),
wv_probe,
wv_read_header,
wv_read_packet,
- wv_read_close,
- pcm_read_seek,
+ NULL,
+ wv_read_seek,
};
projects / frescor / ffmpeg.git / blobdiff