Check context before accessing its field.

[ffmpeg] / libavformat / wv.c

diff --git a/libavformat/wv.c b/libavformat/wv.c
index 2de07fe3fcf81508fdc32009a328843ff4e8be5c..c8e4a40f24251ebc40fdc62a4484bc4f410570b1 100644 (file)
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -20,7 +20,6 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
 #include "bswap.h"
 
 // specs say that maximum block size is 1Mb
@@ -50,8 +49,10 @@ static const int wv_rates[16] = {
 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)
@@ -73,6 +74,7 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb)
     int size;
     int rate, bpp, chan;
 
+    wc->pos = url_ftell(pb);
     tag = get_le32(pb);
     if (tag != MKTAG('w', 'v', 'p', 'k'))
         return -1;
@@ -83,16 +85,16 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb)
     }
     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");
@@ -102,10 +104,6 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb)
         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);
@@ -155,6 +153,8 @@ static int wv_read_header(AVFormatContext *s,
     st->codec->sample_rate = wc->rate;
     st->codec->bits_per_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;
 }
 
@@ -165,24 +165,25 @@ static int wv_read_packet(AVFormatContext *s,
     int ret;
 
     if (url_feof(&s->pb))
-        return -EIO;
+        return AVERROR(EIO);
     if(wc->block_parsed){
         if(wv_read_block_header(s, &s->pb) < 0)
             return -1;
     }
 
     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);
     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;
 }
 
@@ -191,6 +192,38 @@ static int wv_read_close(AVFormatContext *s)
     return 0;
 }
 
+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",
@@ -199,4 +232,5 @@ AVInputFormat wv_demuxer = {
     wv_read_header,
     wv_read_packet,
     wv_read_close,
+    wv_read_seek,
 };