Mercurial > libavformat.hg
annotate nsvdec.c @ 1429:b0797563dfa6 libavformat
Fix A/V (de)sync with discontinuous NSV streams,
Patch by Joakim elupus A ecce P se
Original thread:
Subject: [Ffmpeg-devel] [PATCH]: A/V sync on nsv streams.
Date: October 27, 2006 3:18:54 AM CEDT
Actual committed patch:
Date: October 28, 2006 3:23:28 AM CEDT
author | gpoirier |
---|---|
date | Sat, 28 Oct 2006 17:28:04 +0000 |
parents | 3b00fb8ef8e4 |
children | f72de3879e6c |
rev | line source |
---|---|
594 | 1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1408
diff
changeset
|
2 * NSV demuxer |
594 | 3 * Copyright (c) 2004 The FFmpeg Project. |
4 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1305
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1305
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1305
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
594 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1305
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
594 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1305
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
594 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1305
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
594 | 20 */ |
21 #include "avformat.h" | |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
22 #include "riff.h" |
594 | 23 |
1408 | 24 //#define DEBUG |
594 | 25 //#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!! |
26 //#define DEBUG_SEEK | |
27 #define CHECK_SUBSEQUENT_NSVS | |
28 //#define DISABLE_AUDIO | |
29 | |
30 /* max bytes to crawl for trying to resync | |
31 * stupid streaming servers don't start at chunk boundaries... | |
32 */ | |
33 #define NSV_MAX_RESYNC (500*1024) | |
34 #define NSV_MAX_RESYNC_TRIES 300 | |
35 | |
36 /* | |
37 * First version by Francois Revol - revol@free.fr | |
38 * References: | |
39 * (1) http://www.multimedia.cx/nsv-format.txt | |
40 * seems someone came to the same conclusions as me, and updated it: | |
41 * (2) http://www.stud.ktu.lt/~vitslav/nsv/nsv-format.txt | |
42 * http://www.stud.ktu.lt/~vitslav/nsv/ | |
43 * Sample files: | |
44 * (S1) http://www.nullsoft.com/nsv/samples/ | |
45 * http://www.nullsoft.com/nsv/samples/faster.nsv | |
46 * http://streamripper.sourceforge.net/openbb/read.php?TID=492&page=4 | |
47 */ | |
48 | |
49 /* | |
50 * notes on the header (Francois Revol): | |
885 | 51 * |
52 * It is followed by strings, then a table, but nothing tells | |
594 | 53 * where the table begins according to (1). After checking faster.nsv, |
54 * I believe NVSf[16-19] gives the size of the strings data | |
55 * (that is the offset of the data table after the header). | |
56 * After checking all samples from (S1) all confirms this. | |
57 * | |
58 * Then, about NSVf[12-15], faster.nsf has 179700. When veiwing it in VLC, | |
59 * I noticed there was about 1 NVSs chunk/s, so I ran | |
60 * strings faster.nsv | grep NSVs | wc -l | |
885 | 61 * which gave me 180. That leads me to think that NSVf[12-15] might be the |
594 | 62 * file length in milliseconds. |
63 * Let's try that: | |
64 * for f in *.nsv; do HTIME="$(od -t x4 "$f" | head -1 | sed 's/.* //')"; echo "'$f' $((0x$HTIME))s = $((0x$HTIME/1000/60)):$((0x$HTIME/1000%60))"; done | |
65 * except for nstrailer (which doesn't have an NSVf header), it repports correct time. | |
66 * | |
885 | 67 * nsvtrailer.nsv (S1) does not have any NSVf header, only NSVs chunks, |
594 | 68 * so the header seems to not be mandatory. (for streaming). |
885 | 69 * |
594 | 70 * index slice duration check (excepts nsvtrailer.nsv): |
71 * 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 | |
72 */ | |
73 | |
74 /* | |
75 * TODO: | |
76 * - handle timestamps !!! | |
77 * - use index | |
78 * - mime-type in probe() | |
79 * - seek | |
80 */ | |
81 | |
82 #ifdef DEBUG | |
83 #define PRINT(_v) printf _v | |
84 #else | |
885 | 85 #define PRINT(_v) |
594 | 86 #endif |
87 | |
88 #if 0 | |
89 struct NSVf_header { | |
90 uint32_t chunk_tag; /* 'NSVf' */ | |
91 uint32_t chunk_size; | |
92 uint32_t file_size; /* max 4GB ??? noone learns anything it seems :^) */ | |
93 uint32_t file_length; //unknown1; /* what about MSB of file_size ? */ | |
94 uint32_t info_strings_size; /* size of the info strings */ //unknown2; | |
95 uint32_t table_entries; | |
96 uint32_t table_entries_used; /* the left ones should be -1 */ | |
97 }; | |
98 | |
99 struct NSVs_header { | |
100 uint32_t chunk_tag; /* 'NSVs' */ | |
101 uint32_t v4cc; /* or 'NONE' */ | |
102 uint32_t a4cc; /* or 'NONE' */ | |
103 uint16_t vwidth; /* assert(vwidth%16==0) */ | |
104 uint16_t vheight; /* assert(vheight%16==0) */ | |
105 uint8_t framerate; /* value = (framerate&0x80)?frtable[frameratex0x7f]:framerate */ | |
106 uint16_t unknown; | |
107 }; | |
108 | |
109 struct nsv_avchunk_header { | |
110 uint8_t vchunk_size_lsb; | |
111 uint16_t vchunk_size_msb; /* value = (vchunk_size_msb << 4) | (vchunk_size_lsb >> 4) */ | |
112 uint16_t achunk_size; | |
113 }; | |
114 | |
115 struct nsv_pcm_header { | |
116 uint8_t bits_per_sample; | |
117 uint8_t channel_count; | |
118 uint16_t sample_rate; | |
119 }; | |
120 #endif | |
121 | |
122 /* variation from avi.h */ | |
123 /*typedef struct CodecTag { | |
124 int id; | |
125 unsigned int tag; | |
126 } CodecTag;*/ | |
127 | |
128 /* tags */ | |
129 | |
130 #define T_NSVF MKTAG('N', 'S', 'V', 'f') /* file header */ | |
131 #define T_NSVS MKTAG('N', 'S', 'V', 's') /* chunk header */ | |
132 #define T_TOC2 MKTAG('T', 'O', 'C', '2') /* extra index marker */ | |
133 #define T_NONE MKTAG('N', 'O', 'N', 'E') /* null a/v 4CC */ | |
134 #define T_SUBT MKTAG('S', 'U', 'B', 'T') /* subtitle aux data */ | |
135 #define T_ASYN MKTAG('A', 'S', 'Y', 'N') /* async a/v aux marker */ | |
136 #define T_KEYF MKTAG('K', 'E', 'Y', 'F') /* video keyframe aux marker (addition) */ | |
137 | |
138 #define TB_NSVF MKBETAG('N', 'S', 'V', 'f') | |
139 #define TB_NSVS MKBETAG('N', 'S', 'V', 's') | |
140 | |
141 /* hardcoded stream indices */ | |
142 #define NSV_ST_VIDEO 0 | |
143 #define NSV_ST_AUDIO 1 | |
144 #define NSV_ST_SUBT 2 | |
145 | |
146 enum NSVStatus { | |
147 NSV_UNSYNC, | |
148 NSV_FOUND_NSVF, | |
149 NSV_HAS_READ_NSVF, | |
150 NSV_FOUND_NSVS, | |
151 NSV_HAS_READ_NSVS, | |
152 NSV_FOUND_BEEF, | |
153 NSV_GOT_VIDEO, | |
154 NSV_GOT_AUDIO, | |
155 }; | |
156 | |
157 typedef struct NSVStream { | |
158 int frame_offset; /* current frame (video) or byte (audio) counter | |
159 (used to compute the pts) */ | |
160 int scale; | |
885 | 161 int rate; |
594 | 162 int sample_size; /* audio only data */ |
163 int start; | |
885 | 164 |
594 | 165 int new_frame_offset; /* temporary storage (used during seek) */ |
166 int cum_len; /* temporary storage (used during seek) */ | |
167 } NSVStream; | |
168 | |
169 typedef struct { | |
170 int base_offset; | |
171 int NSVf_end; | |
172 uint32_t *nsvf_index_data; | |
173 int index_entries; | |
174 enum NSVStatus state; | |
175 AVPacket ahead[2]; /* [v, a] if .data is !NULL there is something */ | |
176 /* cached */ | |
177 int64_t duration; | |
178 uint32_t vtag, atag; | |
179 uint16_t vwidth, vheight; | |
1429 | 180 int16_t avsync; |
594 | 181 //DVDemuxContext* dv_demux; |
182 } NSVContext; | |
183 | |
184 static const CodecTag nsv_codec_video_tags[] = { | |
185 { CODEC_ID_VP3, MKTAG('V', 'P', '3', ' ') }, | |
186 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, | |
187 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, | |
1305 | 188 { CODEC_ID_VP5, MKTAG('V', 'P', '5', ' ') }, |
189 { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, | |
190 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, | |
594 | 191 /* |
192 { CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') }, | |
193 { CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, | |
194 { CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') }, | |
195 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, | |
196 { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, | |
197 */ | |
198 { CODEC_ID_XVID, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ | |
199 { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, | |
200 { 0, 0 }, | |
201 }; | |
202 | |
203 static const CodecTag nsv_codec_audio_tags[] = { | |
204 { CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, | |
205 { CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, | |
206 { CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, /* _CUTTED__MUXED_2 Heads - Out Of The City.nsv */ | |
207 { CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, | |
208 { 0, 0 }, | |
209 }; | |
210 | |
742 | 211 static const AVRational nsv_framerate_table[] = { |
212 {30,1}, | |
213 {30000,1001}, | |
214 {25,1}, | |
215 {24000,1001}, | |
216 {30,1}, | |
217 {15000,1001}, | |
594 | 218 }; |
219 | |
220 //static int nsv_load_index(AVFormatContext *s); | |
221 static int nsv_read_chunk(AVFormatContext *s, int fill_header); | |
222 | |
223 #ifdef DEBUG | |
224 static void print_tag(const char *str, unsigned int tag, int size) | |
225 { | |
226 printf("%s: tag=%c%c%c%c\n", | |
227 str, tag & 0xff, | |
228 (tag >> 8) & 0xff, | |
229 (tag >> 16) & 0xff, | |
230 (tag >> 24) & 0xff); | |
231 } | |
232 #endif | |
233 | |
234 /* try to find something we recognize, and set the state accordingly */ | |
235 static int nsv_resync(AVFormatContext *s) | |
236 { | |
237 NSVContext *nsv = s->priv_data; | |
238 ByteIOContext *pb = &s->pb; | |
595 | 239 uint32_t v = 0; |
594 | 240 int i; |
885 | 241 |
881 | 242 PRINT(("%s(), offset = %"PRId64", state = %d\n", __FUNCTION__, url_ftell(pb), nsv->state)); |
885 | 243 |
594 | 244 //nsv->state = NSV_UNSYNC; |
885 | 245 |
594 | 246 for (i = 0; i < NSV_MAX_RESYNC; i++) { |
247 if (url_feof(pb)) { | |
248 PRINT(("NSV EOF\n")); | |
249 nsv->state = NSV_UNSYNC; | |
250 return -1; | |
251 } | |
252 v <<= 8; | |
253 v |= get_byte(pb); | |
254 /* | |
255 if (i < 8) { | |
256 PRINT(("NSV resync: [%d] = %02x\n", i, v & 0x0FF)); | |
257 } | |
258 */ | |
885 | 259 |
594 | 260 if ((v & 0x0000ffff) == 0xefbe) { /* BEEF */ |
261 PRINT(("NSV resynced on BEEF after %d bytes\n", i+1)); | |
262 nsv->state = NSV_FOUND_BEEF; | |
263 return 0; | |
264 } | |
265 /* we read as big endian, thus the MK*BE* */ | |
266 if (v == TB_NSVF) { /* NSVf */ | |
267 PRINT(("NSV resynced on NSVf after %d bytes\n", i+1)); | |
268 nsv->state = NSV_FOUND_NSVF; | |
269 return 0; | |
270 } | |
271 if (v == MKBETAG('N', 'S', 'V', 's')) { /* NSVs */ | |
272 PRINT(("NSV resynced on NSVs after %d bytes\n", i+1)); | |
273 nsv->state = NSV_FOUND_NSVS; | |
274 return 0; | |
275 } | |
885 | 276 |
594 | 277 } |
278 PRINT(("NSV sync lost\n")); | |
279 return -1; | |
280 } | |
281 | |
282 static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) | |
283 { | |
284 NSVContext *nsv = s->priv_data; | |
285 ByteIOContext *pb = &s->pb; | |
683
095009fc2f35
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
639
diff
changeset
|
286 unsigned int file_size, size; |
594 | 287 int64_t duration; |
288 int strings_size; | |
289 int table_entries; | |
290 int table_entries_used; | |
291 | |
292 PRINT(("%s()\n", __FUNCTION__)); | |
293 | |
294 nsv->state = NSV_UNSYNC; /* in case we fail */ | |
885 | 295 |
594 | 296 size = get_le32(pb); |
297 if (size < 28) | |
298 return -1; | |
299 nsv->NSVf_end = size; | |
300 | |
301 //s->file_size = (uint32_t)get_le32(pb); | |
302 file_size = (uint32_t)get_le32(pb); | |
838 | 303 PRINT(("NSV NSVf chunk_size %u\n", size)); |
304 PRINT(("NSV NSVf file_size %u\n", file_size)); | |
594 | 305 |
743 | 306 nsv->duration = duration = get_le32(pb); /* in ms */ |
881 | 307 PRINT(("NSV NSVf duration %"PRId64" ms\n", duration)); |
594 | 308 // XXX: store it in AVStreams |
309 | |
310 strings_size = get_le32(pb); | |
311 table_entries = get_le32(pb); | |
312 table_entries_used = get_le32(pb); | |
885 | 313 PRINT(("NSV NSVf info-strings size: %d, table entries: %d, bis %d\n", |
594 | 314 strings_size, table_entries, table_entries_used)); |
315 if (url_feof(pb)) | |
316 return -1; | |
885 | 317 |
881 | 318 PRINT(("NSV got header; filepos %"PRId64"\n", url_ftell(pb))); |
594 | 319 |
320 if (strings_size > 0) { | |
321 char *strings; /* last byte will be '\0' to play safe with str*() */ | |
322 char *p, *endp; | |
323 char *token, *value; | |
324 char quote; | |
325 | |
326 p = strings = av_mallocz(strings_size + 1); | |
327 endp = strings + strings_size; | |
328 get_buffer(pb, strings, strings_size); | |
329 while (p < endp) { | |
330 while (*p == ' ') | |
331 p++; /* strip out spaces */ | |
332 if (p >= endp-2) | |
333 break; | |
334 token = p; | |
335 p = strchr(p, '='); | |
336 if (!p || p >= endp-2) | |
337 break; | |
338 *p++ = '\0'; | |
339 quote = *p++; | |
340 value = p; | |
341 p = strchr(p, quote); | |
342 if (!p || p >= endp) | |
343 break; | |
344 *p++ = '\0'; | |
345 PRINT(("NSV NSVf INFO: %s='%s'\n", token, value)); | |
346 if (!strcmp(token, "ASPECT")) { | |
347 /* don't care */ | |
348 } else if (!strcmp(token, "CREATOR") || !strcmp(token, "Author")) { | |
349 strncpy(s->author, value, 512-1); | |
350 } else if (!strcmp(token, "Copyright")) { | |
351 strncpy(s->copyright, value, 512-1); | |
352 } else if (!strcmp(token, "TITLE") || !strcmp(token, "Title")) { | |
353 strncpy(s->title, value, 512-1); | |
354 } | |
355 } | |
356 av_free(strings); | |
357 } | |
358 if (url_feof(pb)) | |
359 return -1; | |
885 | 360 |
881 | 361 PRINT(("NSV got infos; filepos %"PRId64"\n", url_ftell(pb))); |
594 | 362 |
363 if (table_entries_used > 0) { | |
364 nsv->index_entries = table_entries_used; | |
639 | 365 if((unsigned)table_entries >= UINT_MAX / sizeof(uint32_t)) |
366 return -1; | |
594 | 367 nsv->nsvf_index_data = av_malloc(table_entries * sizeof(uint32_t)); |
881 | 368 #warning "FIXME: Byteswap buffer as needed" |
369 get_buffer(pb, (unsigned char *)nsv->nsvf_index_data, table_entries * sizeof(uint32_t)); | |
594 | 370 } |
371 | |
881 | 372 PRINT(("NSV got index; filepos %"PRId64"\n", url_ftell(pb))); |
885 | 373 |
594 | 374 #ifdef DEBUG_DUMP_INDEX |
375 #define V(v) ((v<0x20 || v > 127)?'.':v) | |
376 /* dump index */ | |
377 PRINT(("NSV %d INDEX ENTRIES:\n", table_entries)); | |
378 PRINT(("NSV [dataoffset][fileoffset]\n", table_entries)); | |
379 for (i = 0; i < table_entries; i++) { | |
380 unsigned char b[8]; | |
381 url_fseek(pb, size + nsv->nsvf_index_data[i], SEEK_SET); | |
382 get_buffer(pb, b, 8); | |
383 PRINT(("NSV [0x%08lx][0x%08lx]: %02x %02x %02x %02x %02x %02x %02x %02x" | |
384 "%c%c%c%c%c%c%c%c\n", | |
385 nsv->nsvf_index_data[i], size + nsv->nsvf_index_data[i], | |
885 | 386 b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], |
594 | 387 V(b[0]), V(b[1]), V(b[2]), V(b[3]), V(b[4]), V(b[5]), V(b[6]), V(b[7]) )); |
388 } | |
389 //url_fseek(pb, size, SEEK_SET); /* go back to end of header */ | |
390 #undef V | |
391 #endif | |
885 | 392 |
594 | 393 url_fseek(pb, nsv->base_offset + size, SEEK_SET); /* required for dumbdriving-271.nsv (2 extra bytes) */ |
885 | 394 |
594 | 395 if (url_feof(pb)) |
396 return -1; | |
397 nsv->state = NSV_HAS_READ_NSVF; | |
398 return 0; | |
399 } | |
400 | |
401 static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap) | |
402 { | |
403 NSVContext *nsv = s->priv_data; | |
404 ByteIOContext *pb = &s->pb; | |
405 uint32_t vtag, atag; | |
406 uint16_t vwidth, vheight; | |
742 | 407 AVRational framerate; |
408 int i; | |
594 | 409 AVStream *st; |
410 NSVStream *nst; | |
411 PRINT(("%s()\n", __FUNCTION__)); | |
412 | |
413 vtag = get_le32(pb); | |
414 atag = get_le32(pb); | |
415 vwidth = get_le16(pb); | |
416 vheight = get_le16(pb); | |
742 | 417 i = get_byte(pb); |
594 | 418 /* XXX how big must the table be ? */ |
419 /* seems there is more to that... */ | |
742 | 420 PRINT(("NSV NSVs framerate code %2x\n", i)); |
421 if(i&0x80) framerate= nsv_framerate_table[i & 0x7F]; | |
422 else framerate= (AVRational){i, 1}; | |
1429 | 423 nsv->avsync = get_le16(pb); |
594 | 424 #ifdef DEBUG |
425 print_tag("NSV NSVs vtag", vtag, 0); | |
426 print_tag("NSV NSVs atag", atag, 0); | |
427 PRINT(("NSV NSVs vsize %dx%d\n", vwidth, vheight)); | |
428 #endif | |
885 | 429 |
594 | 430 /* XXX change to ap != NULL ? */ |
431 if (s->nb_streams == 0) { /* streams not yet published, let's do that */ | |
432 nsv->vtag = vtag; | |
433 nsv->atag = atag; | |
434 nsv->vwidth = vwidth; | |
435 nsv->vheight = vwidth; | |
436 if (vtag != T_NONE) { | |
437 st = av_new_stream(s, NSV_ST_VIDEO); | |
438 if (!st) | |
439 goto fail; | |
440 | |
441 nst = av_mallocz(sizeof(NSVStream)); | |
442 if (!nst) | |
443 goto fail; | |
444 st->priv_data = nst; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
445 st->codec->codec_type = CODEC_TYPE_VIDEO; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
446 st->codec->codec_tag = vtag; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
447 st->codec->codec_id = codec_get_id(nsv_codec_video_tags, vtag); |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
448 st->codec->width = vwidth; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
449 st->codec->height = vheight; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
450 st->codec->bits_per_sample = 24; /* depth XXX */ |
594 | 451 |
742 | 452 av_set_pts_info(st, 64, framerate.den, framerate.num); |
594 | 453 st->start_time = 0; |
743 | 454 st->duration = av_rescale(nsv->duration, framerate.num, 1000*framerate.den); |
594 | 455 } |
456 if (atag != T_NONE) { | |
457 #ifndef DISABLE_AUDIO | |
458 st = av_new_stream(s, NSV_ST_AUDIO); | |
459 if (!st) | |
460 goto fail; | |
461 | |
462 nst = av_mallocz(sizeof(NSVStream)); | |
463 if (!nst) | |
464 goto fail; | |
465 st->priv_data = nst; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
466 st->codec->codec_type = CODEC_TYPE_AUDIO; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
467 st->codec->codec_tag = atag; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
468 st->codec->codec_id = codec_get_id(nsv_codec_audio_tags, atag); |
885 | 469 |
594 | 470 st->need_parsing = 1; /* for PCM we will read a chunk later and put correct info */ |
471 | |
1429 | 472 /* set timebase to common denominator of ms and framerate */ |
473 av_set_pts_info(st, 64, 1, framerate.num*1000); | |
474 st->start_time = 0; | |
475 st->duration = (int64_t)nsv->duration * framerate.num; | |
594 | 476 #endif |
477 } | |
478 #ifdef CHECK_SUBSEQUENT_NSVS | |
479 } else { | |
480 if (nsv->vtag != vtag || nsv->atag != atag || nsv->vwidth != vwidth || nsv->vheight != vwidth) { | |
481 PRINT(("NSV NSVs header values differ from the first one!!!\n")); | |
482 //return -1; | |
483 } | |
484 #endif /* CHECK_SUBSEQUENT_NSVS */ | |
485 } | |
486 | |
487 nsv->state = NSV_HAS_READ_NSVS; | |
488 return 0; | |
489 fail: | |
490 /* XXX */ | |
491 nsv->state = NSV_UNSYNC; | |
492 return -1; | |
493 } | |
494 | |
495 static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap) | |
496 { | |
497 NSVContext *nsv = s->priv_data; | |
683
095009fc2f35
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
639
diff
changeset
|
498 int i, err; |
594 | 499 |
500 PRINT(("%s()\n", __FUNCTION__)); | |
501 PRINT(("filename '%s'\n", s->filename)); | |
502 | |
503 nsv->state = NSV_UNSYNC; | |
504 nsv->ahead[0].data = nsv->ahead[1].data = NULL; | |
885 | 505 |
594 | 506 for (i = 0; i < NSV_MAX_RESYNC_TRIES; i++) { |
507 if (nsv_resync(s) < 0) | |
508 return -1; | |
509 if (nsv->state == NSV_FOUND_NSVF) | |
510 err = nsv_parse_NSVf_header(s, ap); | |
511 /* we need the first NSVs also... */ | |
512 if (nsv->state == NSV_FOUND_NSVS) { | |
513 err = nsv_parse_NSVs_header(s, ap); | |
514 break; /* we just want the first one */ | |
515 } | |
516 } | |
517 if (s->nb_streams < 1) /* no luck so far */ | |
518 return -1; | |
519 /* now read the first chunk, so we can attempt to decode more info */ | |
520 err = nsv_read_chunk(s, 1); | |
885 | 521 |
594 | 522 PRINT(("parsed header\n")); |
523 return 0; | |
524 } | |
525 | |
526 static int nsv_read_chunk(AVFormatContext *s, int fill_header) | |
527 { | |
528 NSVContext *nsv = s->priv_data; | |
529 ByteIOContext *pb = &s->pb; | |
530 AVStream *st[2] = {NULL, NULL}; | |
531 NSVStream *nst; | |
532 AVPacket *pkt; | |
533 int i, err = 0; | |
595 | 534 uint8_t auxcount; /* number of aux metadata, also 4 bits of vsize */ |
535 uint32_t vsize; | |
536 uint16_t asize; | |
537 uint16_t auxsize; | |
538 uint32_t auxtag; | |
885 | 539 |
594 | 540 PRINT(("%s(%d)\n", __FUNCTION__, fill_header)); |
885 | 541 |
594 | 542 if (nsv->ahead[0].data || nsv->ahead[1].data) |
543 return 0; //-1; /* hey! eat what you've in your plate first! */ | |
544 | |
545 null_chunk_retry: | |
546 if (url_feof(pb)) | |
547 return -1; | |
885 | 548 |
594 | 549 for (i = 0; i < NSV_MAX_RESYNC_TRIES && nsv->state < NSV_FOUND_NSVS && !err; i++) |
550 err = nsv_resync(s); | |
551 if (err < 0) | |
552 return err; | |
553 if (nsv->state == NSV_FOUND_NSVS) | |
554 err = nsv_parse_NSVs_header(s, NULL); | |
555 if (err < 0) | |
556 return err; | |
557 if (nsv->state != NSV_HAS_READ_NSVS && nsv->state != NSV_FOUND_BEEF) | |
558 return -1; | |
885 | 559 |
594 | 560 auxcount = get_byte(pb); |
561 vsize = get_le16(pb); | |
562 asize = get_le16(pb); | |
563 vsize = (vsize << 4) | (auxcount >> 4); | |
564 auxcount &= 0x0f; | |
838 | 565 PRINT(("NSV CHUNK %d aux, %u bytes video, %d bytes audio\n", auxcount, vsize, asize)); |
594 | 566 /* skip aux stuff */ |
567 for (i = 0; i < auxcount; i++) { | |
568 auxsize = get_le16(pb); | |
569 auxtag = get_le32(pb); | |
885 | 570 PRINT(("NSV aux data: '%c%c%c%c', %d bytes\n", |
571 (auxtag & 0x0ff), | |
572 ((auxtag >> 8) & 0x0ff), | |
594 | 573 ((auxtag >> 16) & 0x0ff), |
574 ((auxtag >> 24) & 0x0ff), | |
575 auxsize)); | |
576 url_fskip(pb, auxsize); | |
595 | 577 vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming braindead */ |
594 | 578 } |
885 | 579 |
594 | 580 if (url_feof(pb)) |
581 return -1; | |
582 if (!vsize && !asize) { | |
583 nsv->state = NSV_UNSYNC; | |
584 goto null_chunk_retry; | |
585 } | |
885 | 586 |
594 | 587 /* map back streams to v,a */ |
588 if (s->streams[0]) | |
589 st[s->streams[0]->id] = s->streams[0]; | |
590 if (s->streams[1]) | |
591 st[s->streams[1]->id] = s->streams[1]; | |
885 | 592 |
594 | 593 if (vsize/* && st[NSV_ST_VIDEO]*/) { |
594 nst = st[NSV_ST_VIDEO]->priv_data; | |
595 pkt = &nsv->ahead[NSV_ST_VIDEO]; | |
775 | 596 av_get_packet(pb, pkt, vsize); |
594 | 597 pkt->stream_index = st[NSV_ST_VIDEO]->index;//NSV_ST_VIDEO; |
598 pkt->dts = nst->frame_offset++; | |
1429 | 599 pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */ |
594 | 600 /* |
601 for (i = 0; i < MIN(8, vsize); i++) | |
602 PRINT(("NSV video: [%d] = %02x\n", i, pkt->data[i])); | |
603 */ | |
604 } | |
605 if (asize/*st[NSV_ST_AUDIO]*/) { | |
606 nst = st[NSV_ST_AUDIO]->priv_data; | |
607 pkt = &nsv->ahead[NSV_ST_AUDIO]; | |
608 /* read raw audio specific header on the first audio chunk... */ | |
609 /* on ALL audio chunks ?? seems so! */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
610 if (asize && st[NSV_ST_AUDIO]->codec->codec_tag == MKTAG('P', 'C', 'M', ' ')/* && fill_header*/) { |
594 | 611 uint8_t bps; |
612 uint8_t channels; | |
613 uint16_t samplerate; | |
614 bps = get_byte(pb); | |
615 channels = get_byte(pb); | |
616 samplerate = get_le16(pb); | |
617 asize-=4; | |
838 | 618 PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate)); |
594 | 619 if (fill_header) { |
620 st[NSV_ST_AUDIO]->need_parsing = 0; /* we know everything */ | |
621 if (bps != 16) { | |
622 PRINT(("NSV AUDIO bit/sample != 16 (%d)!!!\n", bps)); | |
623 } | |
624 bps /= channels; // ??? | |
625 if (bps == 8) | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
626 st[NSV_ST_AUDIO]->codec->codec_id = CODEC_ID_PCM_U8; |
594 | 627 samplerate /= 4;/* UGH ??? XXX */ |
628 channels = 1; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
629 st[NSV_ST_AUDIO]->codec->channels = channels; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
630 st[NSV_ST_AUDIO]->codec->sample_rate = samplerate; |
838 | 631 PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate)); |
594 | 632 } |
633 } | |
775 | 634 av_get_packet(pb, pkt, asize); |
594 | 635 pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO; |
1429 | 636 pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */ |
637 if( nsv->state == NSV_HAS_READ_NSVS && st[NSV_ST_VIDEO] ) { | |
638 /* on a nsvs frame we have new information on a/v sync */ | |
639 pkt->dts = (((NSVStream*)st[NSV_ST_VIDEO]->priv_data)->frame_offset-1); | |
640 pkt->dts *= (int64_t)1000 * st[NSV_ST_VIDEO]->time_base.num; | |
641 pkt->dts += (int64_t)nsv->avsync * st[NSV_ST_VIDEO]->time_base.den; | |
642 PRINT(("NSV AUDIO: sync:%d, dts:%"PRId64, nsv->avsync, pkt->dts)); | |
643 } | |
644 nst->frame_offset++; | |
594 | 645 } |
885 | 646 |
594 | 647 nsv->state = NSV_UNSYNC; |
648 return 0; | |
649 } | |
650 | |
651 | |
652 static int nsv_read_packet(AVFormatContext *s, AVPacket *pkt) | |
653 { | |
654 NSVContext *nsv = s->priv_data; | |
655 int i, err = 0; | |
656 | |
657 PRINT(("%s()\n", __FUNCTION__)); | |
885 | 658 |
594 | 659 /* in case we don't already have something to eat ... */ |
660 if (nsv->ahead[0].data == NULL && nsv->ahead[1].data == NULL) | |
661 err = nsv_read_chunk(s, 0); | |
662 if (err < 0) | |
663 return err; | |
885 | 664 |
594 | 665 /* now pick one of the plates */ |
666 for (i = 0; i < 2; i++) { | |
667 if (nsv->ahead[i].data) { | |
887 | 668 PRINT(("%s: using cached packet[%d]\n", __FUNCTION__, i)); |
594 | 669 /* avoid the cost of new_packet + memcpy(->data) */ |
670 memcpy(pkt, &nsv->ahead[i], sizeof(AVPacket)); | |
671 nsv->ahead[i].data = NULL; /* we ate that one */ | |
672 return pkt->size; | |
673 } | |
674 } | |
885 | 675 |
594 | 676 /* this restaurant is not approvisionned :^] */ |
677 return -1; | |
678 } | |
679 | |
680 static int nsv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) | |
681 { | |
683
095009fc2f35
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
639
diff
changeset
|
682 #if 0 |
594 | 683 NSVContext *avi = s->priv_data; |
684 AVStream *st; | |
685 NSVStream *ast; | |
686 int frame_number, i; | |
687 int64_t pos; | |
683
095009fc2f35
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
639
diff
changeset
|
688 #endif |
594 | 689 |
690 return -1; | |
691 } | |
692 | |
693 static int nsv_read_close(AVFormatContext *s) | |
694 { | |
683
095009fc2f35
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
639
diff
changeset
|
695 /* int i; */ |
594 | 696 NSVContext *nsv = s->priv_data; |
697 | |
698 if (nsv->index_entries) | |
699 av_free(nsv->nsvf_index_data); | |
700 | |
701 #if 0 | |
702 | |
703 for(i=0;i<s->nb_streams;i++) { | |
704 AVStream *st = s->streams[i]; | |
705 NSVStream *ast = st->priv_data; | |
706 if(ast){ | |
707 av_free(ast->index_entries); | |
708 av_free(ast); | |
709 } | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
710 av_free(st->codec->palctrl); |
594 | 711 } |
712 | |
713 #endif | |
714 return 0; | |
715 } | |
716 | |
717 static int nsv_probe(AVProbeData *p) | |
718 { | |
719 int i; | |
601 | 720 // PRINT(("nsv_probe(), buf_size %d\n", p->buf_size)); |
594 | 721 /* check file header */ |
722 if (p->buf_size <= 32) | |
723 return 0; | |
724 if (p->buf[0] == 'N' && p->buf[1] == 'S' && | |
725 p->buf[2] == 'V' && p->buf[3] == 'f') | |
726 return AVPROBE_SCORE_MAX; | |
727 /* streamed files might not have any header */ | |
728 if (p->buf[0] == 'N' && p->buf[1] == 'S' && | |
729 p->buf[2] == 'V' && p->buf[3] == 's') | |
730 return AVPROBE_SCORE_MAX; | |
731 /* XXX: do streamed files always start at chunk boundary ?? */ | |
732 /* or do we need to search NSVs in the byte stream ? */ | |
733 /* seems the servers don't bother starting clean chunks... */ | |
734 /* sometimes even the first header is at 9KB or something :^) */ | |
735 for (i = 1; i < p->buf_size - 3; i++) { | |
736 if (p->buf[i+0] == 'N' && p->buf[i+1] == 'S' && | |
737 p->buf[i+2] == 'V' && p->buf[i+3] == 's') | |
738 return AVPROBE_SCORE_MAX-20; | |
739 } | |
740 /* so we'll have more luck on extension... */ | |
741 if (match_ext(p->filename, "nsv")) | |
742 return AVPROBE_SCORE_MAX-20; | |
743 /* FIXME: add mime-type check */ | |
744 return 0; | |
745 } | |
746 | |
1169 | 747 AVInputFormat nsv_demuxer = { |
594 | 748 "nsv", |
749 "NullSoft Video format", | |
750 sizeof(NSVContext), | |
751 nsv_probe, | |
752 nsv_read_header, | |
753 nsv_read_packet, | |
754 nsv_read_close, | |
755 nsv_read_seek, | |
756 }; |