/*
- * NSV decoder.
- * Copyright (c) 2004 The FFmpeg Project.
+ * NSV demuxer
+ * Copyright (c) 2004 The FFmpeg Project
*
* This file is part of FFmpeg.
*
* seems someone came to the same conclusions as me, and updated it:
* (2) http://www.stud.ktu.lt/~vitslav/nsv/nsv-format.txt
* http://www.stud.ktu.lt/~vitslav/nsv/
+ * official docs
+ * (3) http://ultravox.aol.com/NSVFormat.rtf
* Sample files:
* (S1) http://www.nullsoft.com/nsv/samples/
* http://www.nullsoft.com/nsv/samples/faster.nsv
struct NSVf_header {
uint32_t chunk_tag; /* 'NSVf' */
uint32_t chunk_size;
- uint32_t file_size; /* max 4GB ??? noone learns anything it seems :^) */
+ uint32_t file_size; /* max 4GB ??? no one learns anything it seems :^) */
uint32_t file_length; //unknown1; /* what about MSB of file_size ? */
uint32_t info_strings_size; /* size of the info strings */ //unknown2;
uint32_t table_entries;
#define TB_NSVF MKBETAG('N', 'S', 'V', 'f')
#define TB_NSVS MKBETAG('N', 'S', 'V', 's')
-/* hardcoded stream indices */
+/* hardcoded stream indexes */
#define NSV_ST_VIDEO 0
#define NSV_ST_AUDIO 1
#define NSV_ST_SUBT 2
typedef struct {
int base_offset;
int NSVf_end;
- uint32_t *nsvf_index_data;
+ uint32_t *nsvs_file_offset;
int index_entries;
enum NSVStatus state;
AVPacket ahead[2]; /* [v, a] if .data is !NULL there is something */
int64_t duration;
uint32_t vtag, atag;
uint16_t vwidth, vheight;
+ int16_t avsync;
+ AVRational framerate;
+ uint32_t *nsvs_timestamps;
//DVDemuxContext* dv_demux;
} NSVContext;
-static const CodecTag nsv_codec_video_tags[] = {
+static const AVCodecTag nsv_codec_video_tags[] = {
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', ' ') },
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') },
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') },
{ CODEC_ID_VP5, MKTAG('V', 'P', '5', ' ') },
{ CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') },
+ { CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') },
+ { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') },
+ { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') },
{ CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') },
/*
{ CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') },
{ CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') },
- { CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') },
- { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') },
- { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') },
*/
- { CODEC_ID_XVID, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */
+ { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') },
{ 0, 0 },
};
-static const CodecTag nsv_codec_audio_tags[] = {
- { CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
- { CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') },
- { CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, /* _CUTTED__MUXED_2 Heads - Out Of The City.nsv */
+static const AVCodecTag nsv_codec_audio_tags[] = {
+ { CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
+ { CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') },
+ { CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') },
+ { CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') },
{ CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') },
{ 0, 0 },
};
-static const AVRational nsv_framerate_table[] = {
- {30,1},
- {30000,1001},
- {25,1},
- {24000,1001},
- {30,1},
- {15000,1001},
-};
-
//static int nsv_load_index(AVFormatContext *s);
static int nsv_read_chunk(AVFormatContext *s, int fill_header);
static int nsv_resync(AVFormatContext *s)
{
NSVContext *nsv = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
uint32_t v = 0;
int i;
static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap)
{
NSVContext *nsv = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
unsigned int file_size, size;
int64_t duration;
int strings_size;
break;
*p++ = '\0';
PRINT(("NSV NSVf INFO: %s='%s'\n", token, value));
- if (!strcmp(token, "ASPECT")) {
- /* don't care */
- } else if (!strcmp(token, "CREATOR") || !strcmp(token, "Author")) {
- strncpy(s->author, value, 512-1);
- } else if (!strcmp(token, "Copyright")) {
- strncpy(s->copyright, value, 512-1);
- } else if (!strcmp(token, "TITLE") || !strcmp(token, "Title")) {
- strncpy(s->title, value, 512-1);
- }
+ av_metadata_set(&s->metadata, token, value);
}
av_free(strings);
}
PRINT(("NSV got infos; filepos %"PRId64"\n", url_ftell(pb)));
if (table_entries_used > 0) {
+ int i;
nsv->index_entries = table_entries_used;
- if((unsigned)table_entries >= UINT_MAX / sizeof(uint32_t))
+ if((unsigned)table_entries_used >= UINT_MAX / sizeof(uint32_t))
return -1;
- nsv->nsvf_index_data = av_malloc(table_entries * sizeof(uint32_t));
-#warning "FIXME: Byteswap buffer as needed"
- get_buffer(pb, (unsigned char *)nsv->nsvf_index_data, table_entries * sizeof(uint32_t));
+ nsv->nsvs_file_offset = av_malloc((unsigned)table_entries_used * sizeof(uint32_t));
+
+ for(i=0;i<table_entries_used;i++)
+ nsv->nsvs_file_offset[i] = get_le32(pb) + size;
+
+ if(table_entries > table_entries_used &&
+ get_le32(pb) == MKTAG('T','O','C','2')) {
+ nsv->nsvs_timestamps = av_malloc((unsigned)table_entries_used*sizeof(uint32_t));
+ for(i=0;i<table_entries_used;i++) {
+ nsv->nsvs_timestamps[i] = get_le32(pb);
+ }
+ }
}
PRINT(("NSV got index; filepos %"PRId64"\n", url_ftell(pb)));
PRINT(("NSV [dataoffset][fileoffset]\n", table_entries));
for (i = 0; i < table_entries; i++) {
unsigned char b[8];
- url_fseek(pb, size + nsv->nsvf_index_data[i], SEEK_SET);
+ url_fseek(pb, size + nsv->nsvs_file_offset[i], SEEK_SET);
get_buffer(pb, b, 8);
PRINT(("NSV [0x%08lx][0x%08lx]: %02x %02x %02x %02x %02x %02x %02x %02x"
"%c%c%c%c%c%c%c%c\n",
- nsv->nsvf_index_data[i], size + nsv->nsvf_index_data[i],
+ nsv->nsvs_file_offset[i], size + nsv->nsvs_file_offset[i],
b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
V(b[0]), V(b[1]), V(b[2]), V(b[3]), V(b[4]), V(b[5]), V(b[6]), V(b[7]) ));
}
static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap)
{
NSVContext *nsv = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
uint32_t vtag, atag;
uint16_t vwidth, vheight;
AVRational framerate;
int i;
- uint16_t unknown;
AVStream *st;
NSVStream *nst;
PRINT(("%s()\n", __FUNCTION__));
vwidth = get_le16(pb);
vheight = get_le16(pb);
i = get_byte(pb);
- /* XXX how big must the table be ? */
- /* seems there is more to that... */
+
PRINT(("NSV NSVs framerate code %2x\n", i));
- if(i&0x80) framerate= nsv_framerate_table[i & 0x7F];
- else framerate= (AVRational){i, 1};
- unknown = get_le16(pb);
+ if(i&0x80) { /* odd way of giving native framerates from docs */
+ int t=(i & 0x7F)>>2;
+ if(t<16) framerate = (AVRational){1, t+1};
+ else framerate = (AVRational){t-15, 1};
+
+ if(i&1){
+ framerate.num *= 1000;
+ framerate.den *= 1001;
+ }
+
+ if((i&3)==3) framerate.num *= 24;
+ else if((i&3)==2) framerate.num *= 25;
+ else framerate.num *= 30;
+ }
+ else
+ framerate= (AVRational){i, 1};
+
+ nsv->avsync = get_le16(pb);
+ nsv->framerate = framerate;
#ifdef DEBUG
print_tag("NSV NSVs vtag", vtag, 0);
print_tag("NSV NSVs atag", atag, 0);
nsv->vwidth = vwidth;
nsv->vheight = vwidth;
if (vtag != T_NONE) {
+ int i;
st = av_new_stream(s, NSV_ST_VIDEO);
if (!st)
goto fail;
st->codec->codec_id = codec_get_id(nsv_codec_video_tags, vtag);
st->codec->width = vwidth;
st->codec->height = vheight;
- st->codec->bits_per_sample = 24; /* depth XXX */
+ st->codec->bits_per_coded_sample = 24; /* depth XXX */
av_set_pts_info(st, 64, framerate.den, framerate.num);
st->start_time = 0;
st->duration = av_rescale(nsv->duration, framerate.num, 1000*framerate.den);
+
+ for(i=0;i<nsv->index_entries;i++) {
+ if(nsv->nsvs_timestamps) {
+ av_add_index_entry(st, nsv->nsvs_file_offset[i], nsv->nsvs_timestamps[i],
+ 0, 0, AVINDEX_KEYFRAME);
+ } else {
+ int64_t ts = av_rescale(i*nsv->duration/nsv->index_entries, framerate.num, 1000*framerate.den);
+ av_add_index_entry(st, nsv->nsvs_file_offset[i], ts, 0, 0, AVINDEX_KEYFRAME);
+ }
+ }
}
if (atag != T_NONE) {
#ifndef DISABLE_AUDIO
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_tag = atag;
st->codec->codec_id = codec_get_id(nsv_codec_audio_tags, atag);
- st->start_time = 0;
-// st->duration = nsv->duration; //FIXME
- st->need_parsing = 1; /* for PCM we will read a chunk later and put correct info */
- /* XXX:FIXME */
- //st->codec->channels = 2; //XXX:channels;
- //st->codec->sample_rate = 1000;
- //av_set_pts_info(st, 64, 1, st->codec->sample_rate);
+ st->need_parsing = AVSTREAM_PARSE_FULL; /* for PCM we will read a chunk later and put correct info */
+ /* set timebase to common denominator of ms and framerate */
+ av_set_pts_info(st, 64, 1, framerate.num*1000);
+ st->start_time = 0;
+ st->duration = (int64_t)nsv->duration * framerate.num;
#endif
}
#ifdef CHECK_SUBSEQUENT_NSVS
static int nsv_read_chunk(AVFormatContext *s, int fill_header)
{
NSVContext *nsv = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st[2] = {NULL, NULL};
NSVStream *nst;
AVPacket *pkt;
pkt = &nsv->ahead[NSV_ST_VIDEO];
av_get_packet(pb, pkt, vsize);
pkt->stream_index = st[NSV_ST_VIDEO]->index;//NSV_ST_VIDEO;
- pkt->dts = nst->frame_offset++;
- pkt->flags |= PKT_FLAG_KEY; /* stupid format has no way to tell XXX: try the index */
+ pkt->dts = nst->frame_offset;
+ pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
/*
for (i = 0; i < MIN(8, vsize); i++)
PRINT(("NSV video: [%d] = %02x\n", i, pkt->data[i]));
*/
}
+ if(st[NSV_ST_VIDEO])
+ ((NSVStream*)st[NSV_ST_VIDEO]->priv_data)->frame_offset++;
+
if (asize/*st[NSV_ST_AUDIO]*/) {
nst = st[NSV_ST_AUDIO]->priv_data;
pkt = &nsv->ahead[NSV_ST_AUDIO];
asize-=4;
PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate));
if (fill_header) {
- st[NSV_ST_AUDIO]->need_parsing = 0; /* we know everything */
+ st[NSV_ST_AUDIO]->need_parsing = AVSTREAM_PARSE_NONE; /* we know everything */
if (bps != 16) {
PRINT(("NSV AUDIO bit/sample != 16 (%d)!!!\n", bps));
}
channels = 1;
st[NSV_ST_AUDIO]->codec->channels = channels;
st[NSV_ST_AUDIO]->codec->sample_rate = samplerate;
- av_set_pts_info(st[NSV_ST_AUDIO], 64, 1,
- st[NSV_ST_AUDIO]->codec->sample_rate);
PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate));
}
}
av_get_packet(pb, pkt, asize);
pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO;
- //pkt->dts = nst->frame_offset;
- //if (nst->sample_size)
- // pkt->dts /= nst->sample_size;
- nst->frame_offset += asize; // XXX: that's valid only for PCM !?
+ pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
+ if( nsv->state == NSV_HAS_READ_NSVS && st[NSV_ST_VIDEO] ) {
+ /* on a nsvs frame we have new information on a/v sync */
+ pkt->dts = (((NSVStream*)st[NSV_ST_VIDEO]->priv_data)->frame_offset-1);
+ pkt->dts *= (int64_t)1000 * nsv->framerate.den;
+ pkt->dts += (int64_t)nsv->avsync * nsv->framerate.num;
+ PRINT(("NSV AUDIO: sync:%d, dts:%"PRId64, nsv->avsync, pkt->dts));
+ }
+ nst->frame_offset++;
}
- //pkt->flags |= PKT_FLAG_KEY;
nsv->state = NSV_UNSYNC;
return 0;
}
static int nsv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
{
-#if 0
- NSVContext *avi = s->priv_data;
- AVStream *st;
- NSVStream *ast;
- int frame_number, i;
- int64_t pos;
-#endif
+ NSVContext *nsv = s->priv_data;
+ AVStream *st = s->streams[stream_index];
+ NSVStream *nst = st->priv_data;
+ int index;
- return -1;
+ index = av_index_search_timestamp(st, timestamp, flags);
+ if(index < 0)
+ return -1;
+
+ url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
+ nst->frame_offset = st->index_entries[index].timestamp;
+ nsv->state = NSV_UNSYNC;
+ return 0;
}
static int nsv_read_close(AVFormatContext *s)
/* int i; */
NSVContext *nsv = s->priv_data;
- if (nsv->index_entries)
- av_free(nsv->nsvf_index_data);
+ av_freep(&nsv->nsvs_file_offset);
+ av_freep(&nsv->nsvs_timestamps);
#if 0
int i;
// PRINT(("nsv_probe(), buf_size %d\n", p->buf_size));
/* check file header */
- if (p->buf_size <= 32)
- return 0;
- if (p->buf[0] == 'N' && p->buf[1] == 'S' &&
- p->buf[2] == 'V' && p->buf[3] == 'f')
- return AVPROBE_SCORE_MAX;
/* streamed files might not have any header */
if (p->buf[0] == 'N' && p->buf[1] == 'S' &&
- p->buf[2] == 'V' && p->buf[3] == 's')
+ p->buf[2] == 'V' && (p->buf[3] == 'f' || p->buf[3] == 's'))
return AVPROBE_SCORE_MAX;
/* XXX: do streamed files always start at chunk boundary ?? */
/* or do we need to search NSVs in the byte stream ? */
}
/* so we'll have more luck on extension... */
if (match_ext(p->filename, "nsv"))
- return AVPROBE_SCORE_MAX-20;
+ return AVPROBE_SCORE_MAX/2;
/* FIXME: add mime-type check */
return 0;
}
AVInputFormat nsv_demuxer = {
"nsv",
- "NullSoft Video format",
+ NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"),
sizeof(NSVContext),
nsv_probe,
nsv_read_header,
projects / frescor / ffmpeg.git / blobdiff