X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnsvdec.c;h=18ebbe35f4c2030b1340a3325de39a2e9a9a2eb4;hb=db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf;hp=9c215cd58fa10ff231583bc07a55e8d18057168e;hpb=bc2d2a07d5bf1b6d13b16e106413c7e62979dcc1;p=ffmpeg diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 9c215cd58fa..18ebbe35f4c 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -1,31 +1,31 @@ /* * NSV demuxer - * Copyright (c) 2004 The FFmpeg Project + * Copyright (c) 2004 The Libav Project * - * This file is part of FFmpeg. + * first version by Francois Revol * - * FFmpeg is free software; you can redistribute it and/or + * This file is part of Libav. + * + * Libav 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.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avformat.h" -#include "riff.h" -//#define DEBUG -//#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!! -//#define DEBUG_SEEK -#define CHECK_SUBSEQUENT_NSVS -//#define DISABLE_AUDIO +#include "libavutil/attributes.h" +#include "libavutil/mathematics.h" +#include "avformat.h" +#include "internal.h" +#include "libavutil/dict.h" /* max bytes to crawl for trying to resync * stupid streaming servers don't start at chunk boundaries... @@ -34,7 +34,6 @@ #define NSV_MAX_RESYNC_TRIES 300 /* - * First version by Francois Revol - revol@free.fr * References: * (1) http://www.multimedia.cx/nsv-format.txt * seems someone came to the same conclusions as me, and updated it: @@ -70,7 +69,11 @@ * so the header seems to not be mandatory. (for streaming). * * index slice duration check (excepts nsvtrailer.nsv): - * for f in [^n]*.nsv; do DUR="$(ffmpeg -i "$f" 2>/dev/null | grep 'NSVf duration' | cut -d ' ' -f 4)"; IC="$(ffmpeg -i "$f" 2>/dev/null | grep 'INDEX ENTRIES' | cut -d ' ' -f 2)"; echo "duration $DUR, slite time $(($DUR/$IC))"; done + * for f in [^n]*.nsv; do + * DUR="$(avconv -i "$f" 2> /dev/null | grep 'NSVf duration' | cut -d ' ' -f 4)" + * IC="$(avconv -i "$f" 2> /dev/null | grep 'INDEX ENTRIES' | cut -d ' ' -f 2)" + * echo "duration $DUR, slite time $(($DUR/$IC))" + * done */ /* @@ -81,12 +84,6 @@ * - seek */ -#ifdef DEBUG -#define PRINT(_v) printf _v -#else -#define PRINT(_v) -#endif - #if 0 struct NSVf_header { uint32_t chunk_tag; /* 'NSVf' */ @@ -186,132 +183,127 @@ typedef struct { } NSVContext; 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') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', ' ') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, + { AV_CODEC_ID_VP5, MKTAG('V', 'P', '5', ' ') }, + { AV_CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, /* - { CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') }, - { CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, + { AV_CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') }, + { AV_CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, */ - { 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') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, + { AV_CODEC_ID_NONE, 0 }, }; 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', ' ') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, + { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, + { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, + { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') }, + { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, + { AV_CODEC_ID_NONE, 0 }, }; //static int nsv_load_index(AVFormatContext *s); static int nsv_read_chunk(AVFormatContext *s, int fill_header); -#ifdef DEBUG -static void print_tag(const char *str, unsigned int tag, int size) -{ - printf("%s: tag=%c%c%c%c\n", - str, tag & 0xff, - (tag >> 8) & 0xff, - (tag >> 16) & 0xff, - (tag >> 24) & 0xff); -} -#endif +#define print_tag(str, tag, size) \ + av_dlog(NULL, "%s: tag=%c%c%c%c\n", \ + str, tag & 0xff, \ + (tag >> 8) & 0xff, \ + (tag >> 16) & 0xff, \ + (tag >> 24) & 0xff); /* try to find something we recognize, and set the state accordingly */ static int nsv_resync(AVFormatContext *s) { NSVContext *nsv = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; uint32_t v = 0; int i; - PRINT(("%s(), offset = %"PRId64", state = %d\n", __FUNCTION__, url_ftell(pb), nsv->state)); + av_dlog(s, "%s(), offset = %"PRId64", state = %d\n", __FUNCTION__, avio_tell(pb), nsv->state); //nsv->state = NSV_UNSYNC; for (i = 0; i < NSV_MAX_RESYNC; i++) { - if (url_feof(pb)) { - PRINT(("NSV EOF\n")); + if (pb->eof_reached) { + av_dlog(s, "NSV EOF\n"); nsv->state = NSV_UNSYNC; return -1; } v <<= 8; - v |= get_byte(pb); -/* + v |= avio_r8(pb); if (i < 8) { - PRINT(("NSV resync: [%d] = %02x\n", i, v & 0x0FF)); + av_dlog(s, "NSV resync: [%d] = %02x\n", i, v & 0x0FF); } -*/ if ((v & 0x0000ffff) == 0xefbe) { /* BEEF */ - PRINT(("NSV resynced on BEEF after %d bytes\n", i+1)); + av_dlog(s, "NSV resynced on BEEF after %d bytes\n", i+1); nsv->state = NSV_FOUND_BEEF; return 0; } - /* we read as big endian, thus the MK*BE* */ + /* we read as big-endian, thus the MK*BE* */ if (v == TB_NSVF) { /* NSVf */ - PRINT(("NSV resynced on NSVf after %d bytes\n", i+1)); + av_dlog(s, "NSV resynced on NSVf after %d bytes\n", i+1); nsv->state = NSV_FOUND_NSVF; return 0; } if (v == MKBETAG('N', 'S', 'V', 's')) { /* NSVs */ - PRINT(("NSV resynced on NSVs after %d bytes\n", i+1)); + av_dlog(s, "NSV resynced on NSVs after %d bytes\n", i+1); nsv->state = NSV_FOUND_NSVS; return 0; } } - PRINT(("NSV sync lost\n")); + av_dlog(s, "NSV sync lost\n"); return -1; } -static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) +static int nsv_parse_NSVf_header(AVFormatContext *s) { NSVContext *nsv = s->priv_data; - ByteIOContext *pb = s->pb; - unsigned int file_size, size; + AVIOContext *pb = s->pb; + unsigned int av_unused file_size; + unsigned int size; int64_t duration; int strings_size; int table_entries; int table_entries_used; - PRINT(("%s()\n", __FUNCTION__)); + av_dlog(s, "%s()\n", __FUNCTION__); nsv->state = NSV_UNSYNC; /* in case we fail */ - size = get_le32(pb); + size = avio_rl32(pb); if (size < 28) return -1; nsv->NSVf_end = size; - //s->file_size = (uint32_t)get_le32(pb); - file_size = (uint32_t)get_le32(pb); - PRINT(("NSV NSVf chunk_size %u\n", size)); - PRINT(("NSV NSVf file_size %u\n", file_size)); + //s->file_size = (uint32_t)avio_rl32(pb); + file_size = (uint32_t)avio_rl32(pb); + av_dlog(s, "NSV NSVf chunk_size %u\n", size); + av_dlog(s, "NSV NSVf file_size %u\n", file_size); - nsv->duration = duration = get_le32(pb); /* in ms */ - PRINT(("NSV NSVf duration %"PRId64" ms\n", duration)); + nsv->duration = duration = avio_rl32(pb); /* in ms */ + av_dlog(s, "NSV NSVf duration %"PRId64" ms\n", duration); // XXX: store it in AVStreams - strings_size = get_le32(pb); - table_entries = get_le32(pb); - table_entries_used = get_le32(pb); - PRINT(("NSV NSVf info-strings size: %d, table entries: %d, bis %d\n", - strings_size, table_entries, table_entries_used)); - if (url_feof(pb)) + strings_size = avio_rl32(pb); + table_entries = avio_rl32(pb); + table_entries_used = avio_rl32(pb); + av_dlog(s, "NSV NSVf info-strings size: %d, table entries: %d, bis %d\n", + strings_size, table_entries, table_entries_used); + if (pb->eof_reached) return -1; - PRINT(("NSV got header; filepos %"PRId64"\n", url_ftell(pb))); + av_dlog(s, "NSV got header; filepos %"PRId64"\n", avio_tell(pb)); if (strings_size > 0) { char *strings; /* last byte will be '\0' to play safe with str*() */ @@ -319,9 +311,11 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) char *token, *value; char quote; - p = strings = av_mallocz(strings_size + 1); + p = strings = av_mallocz((size_t)strings_size + 1); + if (!p) + return AVERROR(ENOMEM); endp = strings + strings_size; - get_buffer(pb, strings, strings_size); + avio_read(pb, strings, strings_size); while (p < endp) { while (*p == ' ') p++; /* strip out spaces */ @@ -338,15 +332,15 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) if (!p || p >= endp) break; *p++ = '\0'; - PRINT(("NSV NSVf INFO: %s='%s'\n", token, value)); - av_metadata_set(&s->metadata, token, value); + av_dlog(s, "NSV NSVf INFO: %s='%s'\n", token, value); + av_dict_set(&s->metadata, token, value, 0); } av_free(strings); } - if (url_feof(pb)) + if (pb->eof_reached) return -1; - PRINT(("NSV got infos; filepos %"PRId64"\n", url_ftell(pb))); + av_dlog(s, "NSV got infos; filepos %"PRId64"\n", avio_tell(pb)); if (table_entries_used > 0) { int i; @@ -354,67 +348,52 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) if((unsigned)table_entries_used >= UINT_MAX / sizeof(uint32_t)) return -1; nsv->nsvs_file_offset = av_malloc((unsigned)table_entries_used * sizeof(uint32_t)); + if (!nsv->nsvs_file_offset) + return AVERROR(ENOMEM); for(i=0;insvs_file_offset[i] = get_le32(pb) + size; + nsv->nsvs_file_offset[i] = avio_rl32(pb) + size; if(table_entries > table_entries_used && - get_le32(pb) == MKTAG('T','O','C','2')) { + avio_rl32(pb) == MKTAG('T','O','C','2')) { nsv->nsvs_timestamps = av_malloc((unsigned)table_entries_used*sizeof(uint32_t)); + if (!nsv->nsvs_timestamps) + return AVERROR(ENOMEM); for(i=0;insvs_timestamps[i] = get_le32(pb); + nsv->nsvs_timestamps[i] = avio_rl32(pb); } } } - PRINT(("NSV got index; filepos %"PRId64"\n", url_ftell(pb))); - -#ifdef DEBUG_DUMP_INDEX -#define V(v) ((v<0x20 || v > 127)?'.':v) - /* dump index */ - PRINT(("NSV %d INDEX ENTRIES:\n", table_entries)); - PRINT(("NSV [dataoffset][fileoffset]\n", table_entries)); - for (i = 0; i < table_entries; i++) { - unsigned char b[8]; - 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->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]) )); - } - //url_fseek(pb, size, SEEK_SET); /* go back to end of header */ -#undef V -#endif + av_dlog(s, "NSV got index; filepos %"PRId64"\n", avio_tell(pb)); - url_fseek(pb, nsv->base_offset + size, SEEK_SET); /* required for dumbdriving-271.nsv (2 extra bytes) */ + avio_seek(pb, nsv->base_offset + size, SEEK_SET); /* required for dumbdriving-271.nsv (2 extra bytes) */ - if (url_feof(pb)) + if (pb->eof_reached) return -1; nsv->state = NSV_HAS_READ_NSVF; return 0; } -static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap) +static int nsv_parse_NSVs_header(AVFormatContext *s) { NSVContext *nsv = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; uint32_t vtag, atag; uint16_t vwidth, vheight; AVRational framerate; int i; AVStream *st; NSVStream *nst; - PRINT(("%s()\n", __FUNCTION__)); + av_dlog(s, "%s()\n", __FUNCTION__); - vtag = get_le32(pb); - atag = get_le32(pb); - vwidth = get_le16(pb); - vheight = get_le16(pb); - i = get_byte(pb); + vtag = avio_rl32(pb); + atag = avio_rl32(pb); + vwidth = avio_rl16(pb); + vheight = avio_rl16(pb); + i = avio_r8(pb); - PRINT(("NSV NSVs framerate code %2x\n", i)); + av_dlog(s, "NSV NSVs framerate code %2x\n", i); if(i&0x80) { /* odd way of giving native framerates from docs */ int t=(i & 0x7F)>>2; if(t<16) framerate = (AVRational){1, t+1}; @@ -432,13 +411,12 @@ static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap) else framerate= (AVRational){i, 1}; - nsv->avsync = get_le16(pb); + nsv->avsync = avio_rl16(pb); nsv->framerate = framerate; -#ifdef DEBUG + print_tag("NSV NSVs vtag", vtag, 0); print_tag("NSV NSVs atag", atag, 0); - PRINT(("NSV NSVs vsize %dx%d\n", vwidth, vheight)); -#endif + av_dlog(s, "NSV NSVs vsize %dx%d\n", vwidth, vheight); /* XXX change to ap != NULL ? */ if (s->nb_streams == 0) { /* streams not yet published, let's do that */ @@ -448,22 +426,23 @@ static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap) nsv->vheight = vwidth; if (vtag != T_NONE) { int i; - st = av_new_stream(s, NSV_ST_VIDEO); + st = avformat_new_stream(s, NULL); if (!st) goto fail; + st->id = NSV_ST_VIDEO; nst = av_mallocz(sizeof(NSVStream)); if (!nst) goto fail; st->priv_data = nst; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_tag = vtag; st->codec->codec_id = ff_codec_get_id(nsv_codec_video_tags, vtag); st->codec->width = vwidth; st->codec->height = vheight; st->codec->bits_per_coded_sample = 24; /* depth XXX */ - av_set_pts_info(st, 64, framerate.den, framerate.num); + avpriv_set_pts_info(st, 64, framerate.den, framerate.num); st->start_time = 0; st->duration = av_rescale(nsv->duration, framerate.num, 1000*framerate.den); @@ -478,34 +457,31 @@ static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap) } } if (atag != T_NONE) { -#ifndef DISABLE_AUDIO - st = av_new_stream(s, NSV_ST_AUDIO); + st = avformat_new_stream(s, NULL); if (!st) goto fail; + st->id = NSV_ST_AUDIO; nst = av_mallocz(sizeof(NSVStream)); if (!nst) goto fail; st->priv_data = nst; - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_tag = atag; st->codec->codec_id = ff_codec_get_id(nsv_codec_audio_tags, atag); 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); + avpriv_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 } else { if (nsv->vtag != vtag || nsv->atag != atag || nsv->vwidth != vwidth || nsv->vheight != vwidth) { - PRINT(("NSV NSVs header values differ from the first one!!!\n")); + av_dlog(s, "NSV NSVs header values differ from the first one!!!\n"); //return -1; } -#endif /* CHECK_SUBSEQUENT_NSVS */ } nsv->state = NSV_HAS_READ_NSVS; @@ -516,13 +492,13 @@ fail: return -1; } -static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int nsv_read_header(AVFormatContext *s) { NSVContext *nsv = s->priv_data; int i, err; - PRINT(("%s()\n", __FUNCTION__)); - PRINT(("filename '%s'\n", s->filename)); + av_dlog(s, "%s()\n", __FUNCTION__); + av_dlog(s, "filename '%s'\n", s->filename); nsv->state = NSV_UNSYNC; nsv->ahead[0].data = nsv->ahead[1].data = NULL; @@ -530,11 +506,16 @@ static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap) for (i = 0; i < NSV_MAX_RESYNC_TRIES; i++) { if (nsv_resync(s) < 0) return -1; - if (nsv->state == NSV_FOUND_NSVF) - err = nsv_parse_NSVf_header(s, ap); + if (nsv->state == NSV_FOUND_NSVF) { + err = nsv_parse_NSVf_header(s); + if (err < 0) + return err; + } /* we need the first NSVs also... */ if (nsv->state == NSV_FOUND_NSVS) { - err = nsv_parse_NSVs_header(s, ap); + err = nsv_parse_NSVs_header(s); + if (err < 0) + return err; break; /* we just want the first one */ } } @@ -543,14 +524,14 @@ static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap) /* now read the first chunk, so we can attempt to decode more info */ err = nsv_read_chunk(s, 1); - PRINT(("parsed header\n")); - return 0; + av_dlog(s, "parsed header\n"); + return err; } static int nsv_read_chunk(AVFormatContext *s, int fill_header) { NSVContext *nsv = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; AVStream *st[2] = {NULL, NULL}; NSVStream *nst; AVPacket *pkt; @@ -559,15 +540,14 @@ static int nsv_read_chunk(AVFormatContext *s, int fill_header) uint32_t vsize; uint16_t asize; uint16_t auxsize; - uint32_t auxtag; - PRINT(("%s(%d)\n", __FUNCTION__, fill_header)); + av_dlog(s, "%s(%d)\n", __FUNCTION__, fill_header); if (nsv->ahead[0].data || nsv->ahead[1].data) return 0; //-1; /* hey! eat what you've in your plate first! */ null_chunk_retry: - if (url_feof(pb)) + if (pb->eof_reached) return -1; for (i = 0; i < NSV_MAX_RESYNC_TRIES && nsv->state < NSV_FOUND_NSVS && !err; i++) @@ -575,33 +555,34 @@ null_chunk_retry: if (err < 0) return err; if (nsv->state == NSV_FOUND_NSVS) - err = nsv_parse_NSVs_header(s, NULL); + err = nsv_parse_NSVs_header(s); if (err < 0) return err; if (nsv->state != NSV_HAS_READ_NSVS && nsv->state != NSV_FOUND_BEEF) return -1; - auxcount = get_byte(pb); - vsize = get_le16(pb); - asize = get_le16(pb); + auxcount = avio_r8(pb); + vsize = avio_rl16(pb); + asize = avio_rl16(pb); vsize = (vsize << 4) | (auxcount >> 4); auxcount &= 0x0f; - PRINT(("NSV CHUNK %d aux, %u bytes video, %d bytes audio\n", auxcount, vsize, asize)); + av_dlog(s, "NSV CHUNK %d aux, %u bytes video, %d bytes audio\n", auxcount, vsize, asize); /* skip aux stuff */ for (i = 0; i < auxcount; i++) { - auxsize = get_le16(pb); - auxtag = get_le32(pb); - PRINT(("NSV aux data: '%c%c%c%c', %d bytes\n", + uint32_t av_unused auxtag; + auxsize = avio_rl16(pb); + auxtag = avio_rl32(pb); + av_dlog(s, "NSV aux data: '%c%c%c%c', %d bytes\n", (auxtag & 0x0ff), ((auxtag >> 8) & 0x0ff), ((auxtag >> 16) & 0x0ff), ((auxtag >> 24) & 0x0ff), - auxsize)); - url_fskip(pb, auxsize); + auxsize); + avio_skip(pb, auxsize); vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming braindead */ } - if (url_feof(pb)) + if (pb->eof_reached) return -1; if (!vsize && !asize) { nsv->state = NSV_UNSYNC; @@ -609,27 +590,25 @@ null_chunk_retry: } /* map back streams to v,a */ - if (s->streams[0]) + if (s->nb_streams > 0) st[s->streams[0]->id] = s->streams[0]; - if (s->streams[1]) + if (s->nb_streams > 1) st[s->streams[1]->id] = s->streams[1]; - if (vsize/* && st[NSV_ST_VIDEO]*/) { + if (vsize && st[NSV_ST_VIDEO]) { nst = st[NSV_ST_VIDEO]->priv_data; 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 |= 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])); -*/ + pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */ + for (i = 0; i < FFMIN(8, vsize); i++) + av_dlog(s, "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]*/) { + if (asize && st[NSV_ST_AUDIO]) { nst = st[NSV_ST_AUDIO]->priv_data; pkt = &nsv->ahead[NSV_ST_AUDIO]; /* read raw audio specific header on the first audio chunk... */ @@ -638,35 +617,35 @@ null_chunk_retry: uint8_t bps; uint8_t channels; uint16_t samplerate; - bps = get_byte(pb); - channels = get_byte(pb); - samplerate = get_le16(pb); + bps = avio_r8(pb); + channels = avio_r8(pb); + samplerate = avio_rl16(pb); asize-=4; - PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate)); + av_dlog(s, "NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate); if (fill_header) { st[NSV_ST_AUDIO]->need_parsing = AVSTREAM_PARSE_NONE; /* we know everything */ if (bps != 16) { - PRINT(("NSV AUDIO bit/sample != 16 (%d)!!!\n", bps)); + av_dlog(s, "NSV AUDIO bit/sample != 16 (%d)!!!\n", bps); } bps /= channels; // ??? if (bps == 8) - st[NSV_ST_AUDIO]->codec->codec_id = CODEC_ID_PCM_U8; + st[NSV_ST_AUDIO]->codec->codec_id = AV_CODEC_ID_PCM_U8; samplerate /= 4;/* UGH ??? XXX */ channels = 1; st[NSV_ST_AUDIO]->codec->channels = channels; st[NSV_ST_AUDIO]->codec->sample_rate = samplerate; - PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate)); + av_dlog(s, "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->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */ + pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_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)); + av_dlog(s, "NSV AUDIO: sync:%d, dts:%"PRId64, nsv->avsync, pkt->dts); } nst->frame_offset++; } @@ -681,7 +660,7 @@ static int nsv_read_packet(AVFormatContext *s, AVPacket *pkt) NSVContext *nsv = s->priv_data; int i, err = 0; - PRINT(("%s()\n", __FUNCTION__)); + av_dlog(s, "%s()\n", __FUNCTION__); /* in case we don't already have something to eat ... */ if (nsv->ahead[0].data == NULL && nsv->ahead[1].data == NULL) @@ -692,7 +671,7 @@ static int nsv_read_packet(AVFormatContext *s, AVPacket *pkt) /* now pick one of the plates */ for (i = 0; i < 2; i++) { if (nsv->ahead[i].data) { - PRINT(("%s: using cached packet[%d]\n", __FUNCTION__, i)); + av_dlog(s, "%s: using cached packet[%d]\n", __FUNCTION__, i); /* avoid the cost of new_packet + memcpy(->data) */ memcpy(pkt, &nsv->ahead[i], sizeof(AVPacket)); nsv->ahead[i].data = NULL; /* we ate that one */ @@ -715,7 +694,9 @@ static int nsv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp if(index < 0) return -1; - url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET); + if (avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET) < 0) + return -1; + nst->frame_offset = st->index_entries[index].timestamp; nsv->state = NSV_UNSYNC; return 0; @@ -728,6 +709,10 @@ static int nsv_read_close(AVFormatContext *s) av_freep(&nsv->nsvs_file_offset); av_freep(&nsv->nsvs_timestamps); + if (nsv->ahead[0].data) + av_free_packet(&nsv->ahead[0]); + if (nsv->ahead[1].data) + av_free_packet(&nsv->ahead[1]); #if 0 @@ -748,7 +733,10 @@ static int nsv_read_close(AVFormatContext *s) static int nsv_probe(AVProbeData *p) { int i; -// PRINT(("nsv_probe(), buf_size %d\n", p->buf_size)); + int score; + int vsize, asize, auxcount; + score = 0; + av_dlog(NULL, "nsv_probe(), buf_size %d\n", p->buf_size); /* check file header */ /* streamed files might not have any header */ if (p->buf[0] == 'N' && p->buf[1] == 'S' && @@ -760,23 +748,34 @@ static int nsv_probe(AVProbeData *p) /* sometimes even the first header is at 9KB or something :^) */ for (i = 1; i < p->buf_size - 3; i++) { if (p->buf[i+0] == 'N' && p->buf[i+1] == 'S' && - p->buf[i+2] == 'V' && p->buf[i+3] == 's') - return AVPROBE_SCORE_MAX-20; + p->buf[i+2] == 'V' && p->buf[i+3] == 's') { + score = AVPROBE_SCORE_MAX/5; + /* Get the chunk size and check if at the end we are getting 0xBEEF */ + auxcount = p->buf[i+19]; + vsize = p->buf[i+20] | p->buf[i+21] << 8; + asize = p->buf[i+22] | p->buf[i+23] << 8; + vsize = (vsize << 4) | (auxcount >> 4); + if ((asize + vsize + i + 23) < p->buf_size - 2) { + if (p->buf[i+23+asize+vsize+1] == 0xEF && + p->buf[i+23+asize+vsize+2] == 0xBE) + return AVPROBE_SCORE_MAX-20; + } + } } /* so we'll have more luck on extension... */ - if (match_ext(p->filename, "nsv")) - return AVPROBE_SCORE_MAX/2; + if (av_match_ext(p->filename, "nsv")) + return AVPROBE_SCORE_EXTENSION; /* FIXME: add mime-type check */ - return 0; + return score; } -AVInputFormat nsv_demuxer = { - "nsv", - NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"), - sizeof(NSVContext), - nsv_probe, - nsv_read_header, - nsv_read_packet, - nsv_read_close, - nsv_read_seek, +AVInputFormat ff_nsv_demuxer = { + .name = "nsv", + .long_name = NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"), + .priv_data_size = sizeof(NSVContext), + .read_probe = nsv_probe, + .read_header = nsv_read_header, + .read_packet = nsv_read_packet, + .read_close = nsv_read_close, + .read_seek = nsv_read_seek, };