Mercurial > libavformat.hg
annotate nutdec.c @ 6171:240beb8a3072 libavformat
asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
author | mru |
---|---|
date | Thu, 24 Jun 2010 15:10:06 +0000 |
parents | eeb6e3c4c32b |
children | 3b049f067bdd |
rev | line source |
---|---|
1477 | 1 /* |
2 * "NUT" Container Format demuxer | |
3 * Copyright (c) 2004-2006 Michael Niedermayer | |
4 * Copyright (c) 2003 Alex Beregszaszi | |
5 * | |
6 * This file is part of FFmpeg. | |
7 * | |
8 * FFmpeg is free software; you can redistribute it and/or | |
9 * modify it under the terms of the GNU Lesser General Public | |
10 * License as published by the Free Software Foundation; either | |
11 * version 2.1 of the License, or (at your option) any later version. | |
12 * | |
13 * FFmpeg is distributed in the hope that it will be useful, | |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
19 * License along with FFmpeg; if not, write to the Free Software | |
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
21 */ | |
22 | |
4605 | 23 #include <strings.h> |
3286 | 24 #include "libavutil/avstring.h" |
4201
7d2f3f1b68d8
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
4076
diff
changeset
|
25 #include "libavutil/bswap.h" |
3286 | 26 #include "libavutil/tree.h" |
1477 | 27 #include "nut.h" |
28 | |
29 #undef NDEBUG | |
30 #include <assert.h> | |
31 | |
32 static int get_str(ByteIOContext *bc, char *string, unsigned int maxlen){ | |
2700 | 33 unsigned int len= ff_get_v(bc); |
1477 | 34 |
35 if(len && maxlen) | |
36 get_buffer(bc, string, FFMIN(len, maxlen)); | |
37 while(len > maxlen){ | |
38 get_byte(bc); | |
39 len--; | |
40 } | |
41 | |
42 if(maxlen) | |
43 string[FFMIN(len, maxlen-1)]= 0; | |
44 | |
45 if(maxlen == len) | |
46 return -1; | |
47 else | |
48 return 0; | |
49 } | |
50 | |
51 static int64_t get_s(ByteIOContext *bc){ | |
2700 | 52 int64_t v = ff_get_v(bc) + 1; |
1477 | 53 |
54 if (v&1) return -(v>>1); | |
55 else return (v>>1); | |
56 } | |
57 | |
58 static uint64_t get_fourcc(ByteIOContext *bc){ | |
2700 | 59 unsigned int len= ff_get_v(bc); |
1477 | 60 |
61 if (len==2) return get_le16(bc); | |
62 else if(len==4) return get_le32(bc); | |
63 else return -1; | |
64 } | |
65 | |
66 #ifdef TRACE | |
67 static inline uint64_t get_v_trace(ByteIOContext *bc, char *file, char *func, int line){ | |
2700 | 68 uint64_t v= ff_get_v(bc); |
1477 | 69 |
2344 | 70 av_log(NULL, AV_LOG_DEBUG, "get_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); |
1477 | 71 return v; |
72 } | |
73 | |
74 static inline int64_t get_s_trace(ByteIOContext *bc, char *file, char *func, int line){ | |
75 int64_t v= get_s(bc); | |
76 | |
2344 | 77 av_log(NULL, AV_LOG_DEBUG, "get_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); |
1477 | 78 return v; |
79 } | |
80 | |
81 static inline uint64_t get_vb_trace(ByteIOContext *bc, char *file, char *func, int line){ | |
82 uint64_t v= get_vb(bc); | |
83 | |
2344 | 84 av_log(NULL, AV_LOG_DEBUG, "get_vb %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); |
1477 | 85 return v; |
86 } | |
2700 | 87 #define ff_get_v(bc) get_v_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) |
1477 | 88 #define get_s(bc) get_s_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) |
89 #define get_vb(bc) get_vb_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) | |
90 #endif | |
91 | |
2348 | 92 static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_checksum, uint64_t startcode) |
1477 | 93 { |
2035 | 94 int64_t size; |
1477 | 95 // start= url_ftell(bc) - 8; |
96 | |
2348 | 97 startcode= be2me_64(startcode); |
2683
153d6efc05b8
rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents:
2553
diff
changeset
|
98 startcode= ff_crc04C11DB7_update(0, &startcode, 8); |
2348 | 99 |
2683
153d6efc05b8
rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents:
2553
diff
changeset
|
100 init_checksum(bc, ff_crc04C11DB7_update, startcode); |
2700 | 101 size= ff_get_v(bc); |
1820
ec025d5fbbe2
get_packetheader() forgot to read the header_checksum in big packets
lu_zero
parents:
1682
diff
changeset
|
102 if(size > 4096) |
2333 | 103 get_be32(bc); |
104 if(get_checksum(bc) && size > 4096) | |
105 return -1; | |
1477 | 106 |
2683
153d6efc05b8
rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents:
2553
diff
changeset
|
107 init_checksum(bc, calculate_checksum ? ff_crc04C11DB7_update : NULL, 0); |
1477 | 108 |
109 return size; | |
110 } | |
111 | |
112 static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){ | |
113 uint64_t state=0; | |
114 | |
115 if(pos >= 0) | |
3142 | 116 url_fseek(bc, pos, SEEK_SET); //note, this may fail if the stream is not seekable, but that should not matter, as in this case we simply start where we currently are |
1477 | 117 |
118 while(!url_feof(bc)){ | |
119 state= (state<<8) | get_byte(bc); | |
120 if((state>>56) != 'N') | |
121 continue; | |
122 switch(state){ | |
123 case MAIN_STARTCODE: | |
124 case STREAM_STARTCODE: | |
125 case SYNCPOINT_STARTCODE: | |
126 case INFO_STARTCODE: | |
127 case INDEX_STARTCODE: | |
128 return state; | |
129 } | |
130 } | |
131 | |
132 return 0; | |
133 } | |
134 | |
135 /** | |
2393 | 136 * Find the given startcode. |
1477 | 137 * @param code the startcode |
138 * @param pos the start position of the search, or -1 if the current position | |
5909 | 139 * @return the position of the startcode or -1 if not found |
1477 | 140 */ |
141 static int64_t find_startcode(ByteIOContext *bc, uint64_t code, int64_t pos){ | |
142 for(;;){ | |
143 uint64_t startcode= find_any_startcode(bc, pos); | |
144 if(startcode == code) | |
145 return url_ftell(bc) - 8; | |
146 else if(startcode == 0) | |
147 return -1; | |
148 pos=-1; | |
149 } | |
150 } | |
151 | |
152 static int nut_probe(AVProbeData *p){ | |
153 int i; | |
154 uint64_t code= 0; | |
155 | |
156 for (i = 0; i < p->buf_size; i++) { | |
157 code = (code << 8) | p->buf[i]; | |
158 if (code == MAIN_STARTCODE) | |
159 return AVPROBE_SCORE_MAX; | |
160 } | |
161 return 0; | |
162 } | |
163 | |
164 #define GET_V(dst, check) \ | |
2700 | 165 tmp= ff_get_v(bc);\ |
1477 | 166 if(!(check)){\ |
167 av_log(s, AV_LOG_ERROR, "Error " #dst " is (%"PRId64")\n", tmp);\ | |
168 return -1;\ | |
169 }\ | |
170 dst= tmp; | |
171 | |
172 static int skip_reserved(ByteIOContext *bc, int64_t pos){ | |
173 pos -= url_ftell(bc); | |
174 if(pos<0){ | |
175 url_fseek(bc, pos, SEEK_CUR); | |
176 return -1; | |
177 }else{ | |
178 while(pos--) | |
179 get_byte(bc); | |
180 return 0; | |
181 } | |
182 } | |
183 | |
184 static int decode_main_header(NUTContext *nut){ | |
185 AVFormatContext *s= nut->avf; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
186 ByteIOContext *bc = s->pb; |
1477 | 187 uint64_t tmp, end; |
188 unsigned int stream_count; | |
3045 | 189 int i, j, tmp_stream, tmp_mul, tmp_pts, tmp_size, count, tmp_res, tmp_head_idx; |
3043 | 190 int64_t tmp_match; |
1477 | 191 |
2348 | 192 end= get_packetheader(nut, bc, 1, MAIN_STARTCODE); |
1485 | 193 end += url_ftell(bc); |
1477 | 194 |
195 GET_V(tmp , tmp >=2 && tmp <= 3) | |
196 GET_V(stream_count , tmp > 0 && tmp <=MAX_STREAMS) | |
197 | |
2700 | 198 nut->max_distance = ff_get_v(bc); |
1477 | 199 if(nut->max_distance > 65536){ |
200 av_log(s, AV_LOG_DEBUG, "max_distance %d\n", nut->max_distance); | |
201 nut->max_distance= 65536; | |
202 } | |
203 | |
204 GET_V(nut->time_base_count, tmp>0 && tmp<INT_MAX / sizeof(AVRational)) | |
205 nut->time_base= av_malloc(nut->time_base_count * sizeof(AVRational)); | |
206 | |
207 for(i=0; i<nut->time_base_count; i++){ | |
208 GET_V(nut->time_base[i].num, tmp>0 && tmp<(1ULL<<31)) | |
209 GET_V(nut->time_base[i].den, tmp>0 && tmp<(1ULL<<31)) | |
4242 | 210 if(av_gcd(nut->time_base[i].num, nut->time_base[i].den) != 1){ |
1477 | 211 av_log(s, AV_LOG_ERROR, "time base invalid\n"); |
212 return -1; | |
213 } | |
214 } | |
215 tmp_pts=0; | |
216 tmp_mul=1; | |
217 tmp_stream=0; | |
3043 | 218 tmp_match= 1-(1LL<<62); |
3045 | 219 tmp_head_idx= 0; |
1477 | 220 for(i=0; i<256;){ |
2700 | 221 int tmp_flags = ff_get_v(bc); |
222 int tmp_fields= ff_get_v(bc); | |
1477 | 223 if(tmp_fields>0) tmp_pts = get_s(bc); |
2700 | 224 if(tmp_fields>1) tmp_mul = ff_get_v(bc); |
225 if(tmp_fields>2) tmp_stream= ff_get_v(bc); | |
226 if(tmp_fields>3) tmp_size = ff_get_v(bc); | |
1477 | 227 else tmp_size = 0; |
2700 | 228 if(tmp_fields>4) tmp_res = ff_get_v(bc); |
1477 | 229 else tmp_res = 0; |
2700 | 230 if(tmp_fields>5) count = ff_get_v(bc); |
1477 | 231 else count = tmp_mul - tmp_size; |
3043 | 232 if(tmp_fields>6) tmp_match = get_s(bc); |
3045 | 233 if(tmp_fields>7) tmp_head_idx= ff_get_v(bc); |
1477 | 234 |
3045 | 235 while(tmp_fields-- > 8) |
2700 | 236 ff_get_v(bc); |
1477 | 237 |
238 if(count == 0 || i+count > 256){ | |
239 av_log(s, AV_LOG_ERROR, "illegal count %d at %d\n", count, i); | |
240 return -1; | |
241 } | |
242 if(tmp_stream >= stream_count){ | |
243 av_log(s, AV_LOG_ERROR, "illegal stream number\n"); | |
244 return -1; | |
245 } | |
246 | |
247 for(j=0; j<count; j++,i++){ | |
248 if (i == 'N') { | |
249 nut->frame_code[i].flags= FLAG_INVALID; | |
250 j--; | |
251 continue; | |
252 } | |
253 nut->frame_code[i].flags = tmp_flags ; | |
254 nut->frame_code[i].pts_delta = tmp_pts ; | |
255 nut->frame_code[i].stream_id = tmp_stream; | |
256 nut->frame_code[i].size_mul = tmp_mul ; | |
257 nut->frame_code[i].size_lsb = tmp_size+j; | |
258 nut->frame_code[i].reserved_count = tmp_res ; | |
3045 | 259 nut->frame_code[i].header_idx = tmp_head_idx; |
1477 | 260 } |
261 } | |
262 assert(nut->frame_code['N'].flags == FLAG_INVALID); | |
263 | |
3045 | 264 if(end > url_ftell(bc) + 4){ |
265 int rem= 1024; | |
266 GET_V(nut->header_count, tmp<128U) | |
267 nut->header_count++; | |
268 for(i=1; i<nut->header_count; i++){ | |
269 GET_V(nut->header_len[i], tmp>0 && tmp<256); | |
270 rem -= nut->header_len[i]; | |
271 if(rem < 0){ | |
272 av_log(s, AV_LOG_ERROR, "invalid elision header\n"); | |
273 return -1; | |
274 } | |
275 nut->header[i]= av_malloc(nut->header_len[i]); | |
276 get_buffer(bc, nut->header[i], nut->header_len[i]); | |
277 } | |
278 assert(nut->header_len[0]==0); | |
279 } | |
280 | |
1485 | 281 if(skip_reserved(bc, end) || get_checksum(bc)){ |
2393 | 282 av_log(s, AV_LOG_ERROR, "main header checksum mismatch\n"); |
1477 | 283 return -1; |
284 } | |
285 | |
286 nut->stream = av_mallocz(sizeof(StreamContext)*stream_count); | |
287 for(i=0; i<stream_count; i++){ | |
288 av_new_stream(s, i); | |
289 } | |
290 | |
291 return 0; | |
292 } | |
293 | |
294 static int decode_stream_header(NUTContext *nut){ | |
295 AVFormatContext *s= nut->avf; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
296 ByteIOContext *bc = s->pb; |
1477 | 297 StreamContext *stc; |
1516 | 298 int class, stream_id; |
1477 | 299 uint64_t tmp, end; |
300 AVStream *st; | |
301 | |
2348 | 302 end= get_packetheader(nut, bc, 1, STREAM_STARTCODE); |
1485 | 303 end += url_ftell(bc); |
1477 | 304 |
2327 | 305 GET_V(stream_id, tmp < s->nb_streams && !nut->stream[tmp].time_base); |
1477 | 306 stc= &nut->stream[stream_id]; |
307 | |
308 st = s->streams[stream_id]; | |
309 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2228
diff
changeset
|
310 return AVERROR(ENOMEM); |
1477 | 311 |
2700 | 312 class = ff_get_v(bc); |
1477 | 313 tmp = get_fourcc(bc); |
314 st->codec->codec_tag= tmp; | |
315 switch(class) | |
316 { | |
317 case 0: | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5909
diff
changeset
|
318 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
6039
eeb6e3c4c32b
Make the nut decoder read the ff_nut_video_tags to detect codec id of
stefano
parents:
6038
diff
changeset
|
319 st->codec->codec_id = av_codec_get_id( |
eeb6e3c4c32b
Make the nut decoder read the ff_nut_video_tags to detect codec id of
stefano
parents:
6038
diff
changeset
|
320 (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, 0 }, |
eeb6e3c4c32b
Make the nut decoder read the ff_nut_video_tags to detect codec id of
stefano
parents:
6038
diff
changeset
|
321 tmp); |
1477 | 322 break; |
323 case 1: | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5909
diff
changeset
|
324 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4605
diff
changeset
|
325 st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, tmp); |
1477 | 326 break; |
327 case 2: | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5909
diff
changeset
|
328 st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4605
diff
changeset
|
329 st->codec->codec_id = ff_codec_get_id(ff_nut_subtitle_tags, tmp); |
3101 | 330 break; |
1477 | 331 case 3: |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5909
diff
changeset
|
332 st->codec->codec_type = AVMEDIA_TYPE_DATA; |
1477 | 333 break; |
334 default: | |
2393 | 335 av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class); |
1477 | 336 return -1; |
337 } | |
3102 | 338 if(class<3 && st->codec->codec_id == CODEC_ID_NONE) |
5997
06f15a7a9bb8
Make the nut demuxer issue a more meaningful error message if it
stefano
parents:
5982
diff
changeset
|
339 av_log(s, AV_LOG_ERROR, "Unknown codec tag '0x%04x' for stream number %d\n", |
06f15a7a9bb8
Make the nut demuxer issue a more meaningful error message if it
stefano
parents:
5982
diff
changeset
|
340 (unsigned int)tmp, stream_id); |
3102 | 341 |
1477 | 342 GET_V(stc->time_base_id , tmp < nut->time_base_count); |
343 GET_V(stc->msb_pts_shift , tmp < 16); | |
2700 | 344 stc->max_pts_distance= ff_get_v(bc); |
2393 | 345 GET_V(stc->decode_delay , tmp < 1000); //sanity limit, raise this if Moore's law is true |
1477 | 346 st->codec->has_b_frames= stc->decode_delay; |
2700 | 347 ff_get_v(bc); //stream flags |
1477 | 348 |
349 GET_V(st->codec->extradata_size, tmp < (1<<30)); | |
350 if(st->codec->extradata_size){ | |
351 st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
352 get_buffer(bc, st->codec->extradata, st->codec->extradata_size); | |
353 } | |
354 | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5909
diff
changeset
|
355 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ |
1477 | 356 GET_V(st->codec->width , tmp > 0) |
357 GET_V(st->codec->height, tmp > 0) | |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3424
diff
changeset
|
358 st->sample_aspect_ratio.num= ff_get_v(bc); |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3424
diff
changeset
|
359 st->sample_aspect_ratio.den= ff_get_v(bc); |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3424
diff
changeset
|
360 if((!st->sample_aspect_ratio.num) != (!st->sample_aspect_ratio.den)){ |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3424
diff
changeset
|
361 av_log(s, AV_LOG_ERROR, "invalid aspect ratio %d/%d\n", st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); |
1477 | 362 return -1; |
363 } | |
2700 | 364 ff_get_v(bc); /* csp type */ |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5909
diff
changeset
|
365 }else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO){ |
1477 | 366 GET_V(st->codec->sample_rate , tmp > 0) |
3013 | 367 ff_get_v(bc); // samplerate_den |
1477 | 368 GET_V(st->codec->channels, tmp > 0) |
369 } | |
1485 | 370 if(skip_reserved(bc, end) || get_checksum(bc)){ |
2393 | 371 av_log(s, AV_LOG_ERROR, "stream header %d checksum mismatch\n", stream_id); |
1477 | 372 return -1; |
373 } | |
2327 | 374 stc->time_base= &nut->time_base[stc->time_base_id]; |
375 av_set_pts_info(s->streams[stream_id], 63, stc->time_base->num, stc->time_base->den); | |
1477 | 376 return 0; |
377 } | |
378 | |
3120
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
379 static void set_disposition_bits(AVFormatContext* avf, char* value, int stream_id){ |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
380 int flag = 0, i; |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
381 for (i=0; ff_nut_dispositions[i].flag; ++i) { |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
382 if (!strcmp(ff_nut_dispositions[i].str, value)) |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
383 flag = ff_nut_dispositions[i].flag; |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
384 } |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
385 if (!flag) |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
386 av_log(avf, AV_LOG_INFO, "unknown disposition type '%s'\n", value); |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
387 for (i = 0; i < avf->nb_streams; ++i) |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
388 if (stream_id == i || stream_id == -1) |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
389 avf->streams[i]->disposition |= flag; |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
390 } |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
391 |
1477 | 392 static int decode_info_header(NUTContext *nut){ |
393 AVFormatContext *s= nut->avf; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
394 ByteIOContext *bc = s->pb; |
5732
12baf46105f4
nutdec: make chapter start and length uint64_t to prevent overflows.
benoit
parents:
5729
diff
changeset
|
395 uint64_t tmp, chapter_start, chapter_len; |
12baf46105f4
nutdec: make chapter start and length uint64_t to prevent overflows.
benoit
parents:
5729
diff
changeset
|
396 unsigned int stream_id_plus1, count; |
1477 | 397 int chapter_id, i; |
398 int64_t value, end; | |
3005 | 399 char name[256], str_value[1024], type_str[256]; |
3006
fa2fb523fd6b
Fix info packet type, found by oded as well as the new pedantic const
michael
parents:
3005
diff
changeset
|
400 const char *type; |
3331
f89173ea4c5e
Chapter demuxing support. (untested as I have no nuts with chapters)
michael
parents:
3286
diff
changeset
|
401 AVChapter *chapter= NULL; |
4605 | 402 AVStream *st= NULL; |
1477 | 403 |
2348 | 404 end= get_packetheader(nut, bc, 1, INFO_STARTCODE); |
1485 | 405 end += url_ftell(bc); |
1477 | 406 |
407 GET_V(stream_id_plus1, tmp <= s->nb_streams) | |
408 chapter_id = get_s(bc); | |
2700 | 409 chapter_start= ff_get_v(bc); |
410 chapter_len = ff_get_v(bc); | |
411 count = ff_get_v(bc); | |
3331
f89173ea4c5e
Chapter demuxing support. (untested as I have no nuts with chapters)
michael
parents:
3286
diff
changeset
|
412 |
f89173ea4c5e
Chapter demuxing support. (untested as I have no nuts with chapters)
michael
parents:
3286
diff
changeset
|
413 if(chapter_id && !stream_id_plus1){ |
f89173ea4c5e
Chapter demuxing support. (untested as I have no nuts with chapters)
michael
parents:
3286
diff
changeset
|
414 int64_t start= chapter_start / nut->time_base_count; |
3334
7a823a401282
Pass time_base as argument to new_chapter() as well.
michael
parents:
3331
diff
changeset
|
415 chapter= ff_new_chapter(s, chapter_id, |
7a823a401282
Pass time_base as argument to new_chapter() as well.
michael
parents:
3331
diff
changeset
|
416 nut->time_base[chapter_start % nut->time_base_count], |
7a823a401282
Pass time_base as argument to new_chapter() as well.
michael
parents:
3331
diff
changeset
|
417 start, start + chapter_len, NULL); |
4605 | 418 } else if(stream_id_plus1) |
419 st= s->streams[stream_id_plus1 - 1]; | |
3331
f89173ea4c5e
Chapter demuxing support. (untested as I have no nuts with chapters)
michael
parents:
3286
diff
changeset
|
420 |
1477 | 421 for(i=0; i<count; i++){ |
422 get_str(bc, name, sizeof(name)); | |
423 value= get_s(bc); | |
424 if(value == -1){ | |
425 type= "UTF-8"; | |
426 get_str(bc, str_value, sizeof(str_value)); | |
427 }else if(value == -2){ | |
3006
fa2fb523fd6b
Fix info packet type, found by oded as well as the new pedantic const
michael
parents:
3005
diff
changeset
|
428 get_str(bc, type_str, sizeof(type_str)); |
fa2fb523fd6b
Fix info packet type, found by oded as well as the new pedantic const
michael
parents:
3005
diff
changeset
|
429 type= type_str; |
1477 | 430 get_str(bc, str_value, sizeof(str_value)); |
431 }else if(value == -3){ | |
432 type= "s"; | |
433 value= get_s(bc); | |
434 }else if(value == -4){ | |
435 type= "t"; | |
2700 | 436 value= ff_get_v(bc); |
1477 | 437 }else if(value < -4){ |
438 type= "r"; | |
439 get_s(bc); | |
440 }else{ | |
441 type= "v"; | |
442 } | |
443 | |
3275 | 444 if (stream_id_plus1 > s->nb_streams) { |
3120
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
445 av_log(s, AV_LOG_ERROR, "invalid stream id for info packet\n"); |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
446 continue; |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
447 } |
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
448 |
4605 | 449 if(!strcmp(type, "UTF-8")){ |
450 AVMetadata **metadata = NULL; | |
451 if(chapter_id==0 && !strcmp(name, "Disposition")) | |
3120
ea5623a8efde
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents:
3112
diff
changeset
|
452 set_disposition_bits(s, str_value, stream_id_plus1 - 1); |
4605 | 453 else if(chapter) metadata= &chapter->metadata; |
454 else if(stream_id_plus1) metadata= &st->metadata; | |
455 else metadata= &s->metadata; | |
456 if(metadata && strcasecmp(name,"Uses") | |
457 && strcasecmp(name,"Depends") && strcasecmp(name,"Replaces")) | |
5982
f74198942337
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents:
5913
diff
changeset
|
458 av_metadata_set2(metadata, name, str_value, 0); |
3331
f89173ea4c5e
Chapter demuxing support. (untested as I have no nuts with chapters)
michael
parents:
3286
diff
changeset
|
459 } |
1477 | 460 } |
461 | |
1485 | 462 if(skip_reserved(bc, end) || get_checksum(bc)){ |
2393 | 463 av_log(s, AV_LOG_ERROR, "info header checksum mismatch\n"); |
1477 | 464 return -1; |
465 } | |
466 return 0; | |
467 } | |
468 | |
1500 | 469 static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr){ |
1477 | 470 AVFormatContext *s= nut->avf; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
471 ByteIOContext *bc = s->pb; |
1500 | 472 int64_t end, tmp; |
1477 | 473 |
1478 | 474 nut->last_syncpoint_pos= url_ftell(bc)-8; |
1477 | 475 |
2348 | 476 end= get_packetheader(nut, bc, 1, SYNCPOINT_STARTCODE); |
1485 | 477 end += url_ftell(bc); |
1477 | 478 |
2700 | 479 tmp= ff_get_v(bc); |
480 *back_ptr= nut->last_syncpoint_pos - 16*ff_get_v(bc); | |
1500 | 481 if(*back_ptr < 0) |
482 return -1; | |
1477 | 483 |
3011
0439b354e005
ff_nut_reset_ts() expected to get 'ts*time_base_count', but muxer only
ods15
parents:
3006
diff
changeset
|
484 ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count], tmp / nut->time_base_count); |
1477 | 485 |
1485 | 486 if(skip_reserved(bc, end) || get_checksum(bc)){ |
1478 | 487 av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n"); |
1477 | 488 return -1; |
489 } | |
1500 | 490 |
491 *ts= tmp / s->nb_streams * av_q2d(nut->time_base[tmp % s->nb_streams])*AV_TIME_BASE; | |
2349 | 492 ff_nut_add_sp(nut, nut->last_syncpoint_pos, *back_ptr, *ts); |
1500 | 493 |
1477 | 494 return 0; |
495 } | |
496 | |
1484 | 497 static int find_and_decode_index(NUTContext *nut){ |
498 AVFormatContext *s= nut->avf; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
499 ByteIOContext *bc = s->pb; |
1484 | 500 uint64_t tmp, end; |
501 int i, j, syncpoint_count; | |
502 int64_t filesize= url_fsize(bc); | |
503 int64_t *syncpoints; | |
504 int8_t *has_keyframe; | |
3377 | 505 int ret= -1; |
1484 | 506 |
507 url_fseek(bc, filesize-12, SEEK_SET); | |
508 url_fseek(bc, filesize-get_be64(bc), SEEK_SET); | |
509 if(get_be64(bc) != INDEX_STARTCODE){ | |
510 av_log(s, AV_LOG_ERROR, "no index at the end\n"); | |
511 return -1; | |
512 } | |
513 | |
2348 | 514 end= get_packetheader(nut, bc, 1, INDEX_STARTCODE); |
1485 | 515 end += url_ftell(bc); |
1484 | 516 |
2700 | 517 ff_get_v(bc); //max_pts |
1484 | 518 GET_V(syncpoint_count, tmp < INT_MAX/8 && tmp > 0) |
519 syncpoints= av_malloc(sizeof(int64_t)*syncpoint_count); | |
520 has_keyframe= av_malloc(sizeof(int8_t)*(syncpoint_count+1)); | |
521 for(i=0; i<syncpoint_count; i++){ | |
3377 | 522 syncpoints[i] = ff_get_v(bc); |
523 if(syncpoints[i] <= 0) | |
524 goto fail; | |
1484 | 525 if(i) |
526 syncpoints[i] += syncpoints[i-1]; | |
527 } | |
528 | |
529 for(i=0; i<s->nb_streams; i++){ | |
530 int64_t last_pts= -1; | |
531 for(j=0; j<syncpoint_count;){ | |
2700 | 532 uint64_t x= ff_get_v(bc); |
1484 | 533 int type= x&1; |
534 int n= j; | |
535 x>>=1; | |
536 if(type){ | |
537 int flag= x&1; | |
538 x>>=1; | |
539 if(n+x >= syncpoint_count + 1){ | |
540 av_log(s, AV_LOG_ERROR, "index overflow A\n"); | |
3377 | 541 goto fail; |
1484 | 542 } |
543 while(x--) | |
544 has_keyframe[n++]= flag; | |
545 has_keyframe[n++]= !flag; | |
546 }else{ | |
547 while(x != 1){ | |
548 if(n>=syncpoint_count + 1){ | |
549 av_log(s, AV_LOG_ERROR, "index overflow B\n"); | |
3377 | 550 goto fail; |
1484 | 551 } |
552 has_keyframe[n++]= x&1; | |
553 x>>=1; | |
554 } | |
555 } | |
556 if(has_keyframe[0]){ | |
557 av_log(s, AV_LOG_ERROR, "keyframe before first syncpoint in index\n"); | |
3377 | 558 goto fail; |
1484 | 559 } |
560 assert(n<=syncpoint_count+1); | |
3012
2214e8b1cb4d
missing " && j<syncpoint_count" protection in the index parsing, as the
ods15
parents:
3011
diff
changeset
|
561 for(; j<n && j<syncpoint_count; j++){ |
1484 | 562 if(has_keyframe[j]){ |
2700 | 563 uint64_t B, A= ff_get_v(bc); |
1484 | 564 if(!A){ |
2700 | 565 A= ff_get_v(bc); |
566 B= ff_get_v(bc); | |
1484 | 567 //eor_pts[j][i] = last_pts + A + B |
568 }else | |
569 B= 0; | |
570 av_add_index_entry( | |
571 s->streams[i], | |
572 16*syncpoints[j-1], | |
573 last_pts + A, | |
574 0, | |
575 0, | |
576 AVINDEX_KEYFRAME); | |
577 last_pts += A + B; | |
578 } | |
579 } | |
580 } | |
581 } | |
582 | |
1485 | 583 if(skip_reserved(bc, end) || get_checksum(bc)){ |
2393 | 584 av_log(s, AV_LOG_ERROR, "index checksum mismatch\n"); |
3377 | 585 goto fail; |
1484 | 586 } |
3377 | 587 ret= 0; |
588 fail: | |
589 av_free(syncpoints); | |
590 av_free(has_keyframe); | |
591 return ret; | |
1484 | 592 } |
593 | |
1477 | 594 static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) |
595 { | |
596 NUTContext *nut = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
597 ByteIOContext *bc = s->pb; |
1477 | 598 int64_t pos; |
3035 | 599 int initialized_stream_count; |
1477 | 600 |
601 nut->avf= s; | |
602 | |
603 /* main header */ | |
604 pos=0; | |
1480 | 605 do{ |
1477 | 606 pos= find_startcode(bc, MAIN_STARTCODE, pos)+1; |
607 if (pos<0+1){ | |
2393 | 608 av_log(s, AV_LOG_ERROR, "No main startcode found.\n"); |
1477 | 609 return -1; |
610 } | |
1480 | 611 }while(decode_main_header(nut) < 0); |
1477 | 612 |
613 /* stream headers */ | |
614 pos=0; | |
3035 | 615 for(initialized_stream_count=0; initialized_stream_count < s->nb_streams;){ |
1477 | 616 pos= find_startcode(bc, STREAM_STARTCODE, pos)+1; |
617 if (pos<0+1){ | |
2393 | 618 av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n"); |
1477 | 619 return -1; |
620 } | |
621 if(decode_stream_header(nut) >= 0) | |
3035 | 622 initialized_stream_count++; |
1477 | 623 } |
624 | |
625 /* info headers */ | |
626 pos=0; | |
627 for(;;){ | |
628 uint64_t startcode= find_any_startcode(bc, pos); | |
629 pos= url_ftell(bc); | |
630 | |
631 if(startcode==0){ | |
632 av_log(s, AV_LOG_ERROR, "EOF before video frames\n"); | |
633 return -1; | |
634 }else if(startcode == SYNCPOINT_STARTCODE){ | |
635 nut->next_startcode= startcode; | |
636 break; | |
637 }else if(startcode != INFO_STARTCODE){ | |
638 continue; | |
639 } | |
640 | |
641 decode_info_header(nut); | |
642 } | |
643 | |
1478 | 644 s->data_offset= pos-8; |
645 | |
1501 | 646 if(!url_is_streamed(bc)){ |
1484 | 647 int64_t orig_pos= url_ftell(bc); |
648 find_and_decode_index(nut); | |
649 url_fseek(bc, orig_pos, SEEK_SET); | |
650 } | |
651 assert(nut->next_startcode == SYNCPOINT_STARTCODE); | |
652 | |
1477 | 653 return 0; |
654 } | |
655 | |
3045 | 656 static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, uint8_t *header_idx, int frame_code){ |
1477 | 657 AVFormatContext *s= nut->avf; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
658 ByteIOContext *bc = s->pb; |
1477 | 659 StreamContext *stc; |
660 int size, flags, size_mul, pts_delta, i, reserved_count; | |
661 uint64_t tmp; | |
662 | |
663 if(url_ftell(bc) > nut->last_syncpoint_pos + nut->max_distance){ | |
2393 | 664 av_log(s, AV_LOG_ERROR, "Last frame must have been damaged %"PRId64" > %"PRId64" + %d\n", url_ftell(bc), nut->last_syncpoint_pos, nut->max_distance); |
1477 | 665 return -1; |
666 } | |
667 | |
668 flags = nut->frame_code[frame_code].flags; | |
669 size_mul = nut->frame_code[frame_code].size_mul; | |
670 size = nut->frame_code[frame_code].size_lsb; | |
671 *stream_id = nut->frame_code[frame_code].stream_id; | |
672 pts_delta = nut->frame_code[frame_code].pts_delta; | |
673 reserved_count = nut->frame_code[frame_code].reserved_count; | |
3045 | 674 *header_idx = nut->frame_code[frame_code].header_idx; |
1477 | 675 |
676 if(flags & FLAG_INVALID) | |
677 return -1; | |
678 if(flags & FLAG_CODED) | |
2700 | 679 flags ^= ff_get_v(bc); |
1477 | 680 if(flags & FLAG_STREAM_ID){ |
681 GET_V(*stream_id, tmp < s->nb_streams) | |
682 } | |
683 stc= &nut->stream[*stream_id]; | |
684 if(flags&FLAG_CODED_PTS){ | |
2700 | 685 int coded_pts= ff_get_v(bc); |
1477 | 686 //FIXME check last_pts validity? |
687 if(coded_pts < (1<<stc->msb_pts_shift)){ | |
2338 | 688 *pts=ff_lsb2full(stc, coded_pts); |
1477 | 689 }else |
690 *pts=coded_pts - (1<<stc->msb_pts_shift); | |
691 }else | |
692 *pts= stc->last_pts + pts_delta; | |
693 if(flags&FLAG_SIZE_MSB){ | |
2700 | 694 size += size_mul*ff_get_v(bc); |
1477 | 695 } |
3044 | 696 if(flags&FLAG_MATCH_TIME) |
697 get_s(bc); | |
3045 | 698 if(flags&FLAG_HEADER_IDX) |
699 *header_idx= ff_get_v(bc); | |
1477 | 700 if(flags&FLAG_RESERVED) |
2700 | 701 reserved_count= ff_get_v(bc); |
1477 | 702 for(i=0; i<reserved_count; i++) |
2700 | 703 ff_get_v(bc); |
3045 | 704 |
705 if(*header_idx >= (unsigned)nut->header_count){ | |
706 av_log(s, AV_LOG_ERROR, "header_idx invalid\n"); | |
707 return -1; | |
708 } | |
709 if(size > 4096) | |
710 *header_idx=0; | |
711 size -= nut->header_len[*header_idx]; | |
712 | |
1477 | 713 if(flags&FLAG_CHECKSUM){ |
714 get_be32(bc); //FIXME check this | |
1518 | 715 }else if(size > 2*nut->max_distance || FFABS(stc->last_pts - *pts) > stc->max_pts_distance){ |
1509
edc979a1ecb5
check for frames with 2*size > max_dist and no crc
michael
parents:
1508
diff
changeset
|
716 av_log(s, AV_LOG_ERROR, "frame size > 2max_distance and no checksum\n"); |
edc979a1ecb5
check for frames with 2*size > max_dist and no crc
michael
parents:
1508
diff
changeset
|
717 return -1; |
1477 | 718 } |
719 | |
720 stc->last_pts= *pts; | |
1518 | 721 stc->last_flags= flags; |
1477 | 722 |
723 return size; | |
724 } | |
725 | |
726 static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){ | |
727 AVFormatContext *s= nut->avf; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
728 ByteIOContext *bc = s->pb; |
1518 | 729 int size, stream_id, discard; |
1477 | 730 int64_t pts, last_IP_pts; |
1518 | 731 StreamContext *stc; |
3045 | 732 uint8_t header_idx; |
1477 | 733 |
3045 | 734 size= decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code); |
1477 | 735 if(size < 0) |
736 return -1; | |
737 | |
1518 | 738 stc= &nut->stream[stream_id]; |
739 | |
740 if (stc->last_flags & FLAG_KEY) | |
741 stc->skip_until_key_frame=0; | |
1517
51b29c17bd1f
skip non keyframes after seeking between syncpoint and the first keyframe
michael
parents:
1516
diff
changeset
|
742 |
1477 | 743 discard= s->streams[ stream_id ]->discard; |
744 last_IP_pts= s->streams[ stream_id ]->last_IP_pts; | |
1518 | 745 if( (discard >= AVDISCARD_NONKEY && !(stc->last_flags & FLAG_KEY)) |
1477 | 746 ||(discard >= AVDISCARD_BIDIR && last_IP_pts != AV_NOPTS_VALUE && last_IP_pts > pts) |
1517
51b29c17bd1f
skip non keyframes after seeking between syncpoint and the first keyframe
michael
parents:
1516
diff
changeset
|
747 || discard >= AVDISCARD_ALL |
1518 | 748 || stc->skip_until_key_frame){ |
1477 | 749 url_fskip(bc, size); |
750 return 1; | |
751 } | |
752 | |
3045 | 753 av_new_packet(pkt, size + nut->header_len[header_idx]); |
754 memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]); | |
755 pkt->pos= url_ftell(bc); //FIXME | |
756 get_buffer(bc, pkt->data + nut->header_len[header_idx], size); | |
757 | |
1477 | 758 pkt->stream_index = stream_id; |
1518 | 759 if (stc->last_flags & FLAG_KEY) |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
760 pkt->flags |= AV_PKT_FLAG_KEY; |
1477 | 761 pkt->pts = pts; |
762 | |
763 return 0; | |
764 } | |
765 | |
766 static int nut_read_packet(AVFormatContext *s, AVPacket *pkt) | |
767 { | |
768 NUTContext *nut = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
769 ByteIOContext *bc = s->pb; |
1477 | 770 int i, frame_code=0, ret, skip; |
1500 | 771 int64_t ts, back_ptr; |
1477 | 772 |
773 for(;;){ | |
774 int64_t pos= url_ftell(bc); | |
775 uint64_t tmp= nut->next_startcode; | |
776 nut->next_startcode=0; | |
777 | |
778 if(tmp){ | |
779 pos-=8; | |
780 }else{ | |
781 frame_code = get_byte(bc); | |
1933 | 782 if(url_feof(bc)) |
783 return -1; | |
1477 | 784 if(frame_code == 'N'){ |
785 tmp= frame_code; | |
786 for(i=1; i<8; i++) | |
787 tmp = (tmp<<8) + get_byte(bc); | |
788 } | |
789 } | |
790 switch(tmp){ | |
791 case MAIN_STARTCODE: | |
792 case STREAM_STARTCODE: | |
793 case INDEX_STARTCODE: | |
2348 | 794 skip= get_packetheader(nut, bc, 0, tmp); |
1477 | 795 url_fseek(bc, skip, SEEK_CUR); |
796 break; | |
797 case INFO_STARTCODE: | |
798 if(decode_info_header(nut)<0) | |
799 goto resync; | |
800 break; | |
801 case SYNCPOINT_STARTCODE: | |
1500 | 802 if(decode_syncpoint(nut, &ts, &back_ptr)<0) |
1477 | 803 goto resync; |
804 frame_code = get_byte(bc); | |
805 case 0: | |
806 ret= decode_frame(nut, pkt, frame_code); | |
807 if(ret==0) | |
808 return 0; | |
809 else if(ret==1) //ok but discard packet | |
810 break; | |
811 default: | |
812 resync: | |
813 av_log(s, AV_LOG_DEBUG, "syncing from %"PRId64"\n", pos); | |
1508 | 814 tmp= find_any_startcode(bc, nut->last_syncpoint_pos+1); |
1477 | 815 if(tmp==0) |
816 return -1; | |
817 av_log(s, AV_LOG_DEBUG, "sync\n"); | |
818 nut->next_startcode= tmp; | |
819 } | |
820 } | |
821 } | |
822 | |
1478 | 823 static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos_arg, int64_t pos_limit){ |
824 NUTContext *nut = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
825 ByteIOContext *bc = s->pb; |
1500 | 826 int64_t pos, pts, back_ptr; |
1478 | 827 av_log(s, AV_LOG_DEBUG, "read_timestamp(X,%d,%"PRId64",%"PRId64")\n", stream_index, *pos_arg, pos_limit); |
828 | |
829 pos= *pos_arg; | |
830 do{ | |
831 pos= find_startcode(bc, SYNCPOINT_STARTCODE, pos)+1; | |
832 if(pos < 1){ | |
833 assert(nut->next_startcode == 0); | |
2393 | 834 av_log(s, AV_LOG_ERROR, "read_timestamp failed.\n"); |
1478 | 835 return AV_NOPTS_VALUE; |
836 } | |
1500 | 837 }while(decode_syncpoint(nut, &pts, &back_ptr) < 0); |
1478 | 838 *pos_arg = pos-1; |
839 assert(nut->last_syncpoint_pos == *pos_arg); | |
840 | |
2170 | 841 av_log(s, AV_LOG_DEBUG, "return %"PRId64" %"PRId64"\n", pts,back_ptr ); |
1500 | 842 if (stream_index == -1) return pts; |
843 else if(stream_index == -2) return back_ptr; | |
844 | |
845 assert(0); | |
1478 | 846 } |
847 | |
1500 | 848 static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags){ |
849 NUTContext *nut = s->priv_data; | |
850 AVStream *st= s->streams[stream_index]; | |
4076 | 851 Syncpoint dummy={.ts= pts*av_q2d(st->time_base)*AV_TIME_BASE}; |
852 Syncpoint nopts_sp= {.ts= AV_NOPTS_VALUE, .back_ptr= AV_NOPTS_VALUE}; | |
853 Syncpoint *sp, *next_node[2]= {&nopts_sp, &nopts_sp}; | |
1500 | 854 int64_t pos, pos2, ts; |
1517
51b29c17bd1f
skip non keyframes after seeking between syncpoint and the first keyframe
michael
parents:
1516
diff
changeset
|
855 int i; |
1500 | 856 |
1501 | 857 if(st->index_entries){ |
858 int index= av_index_search_timestamp(st, pts, flags); | |
859 if(index<0) | |
860 return -1; | |
861 | |
862 pos2= st->index_entries[index].pos; | |
863 ts = st->index_entries[index].timestamp; | |
864 }else{ | |
5902 | 865 av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pts_cmp, |
866 (void **) next_node); | |
2170 | 867 av_log(s, AV_LOG_DEBUG, "%"PRIu64"-%"PRIu64" %"PRId64"-%"PRId64"\n", next_node[0]->pos, next_node[1]->pos, |
1502 | 868 next_node[0]->ts , next_node[1]->ts); |
869 pos= av_gen_search(s, -1, dummy.ts, next_node[0]->pos, next_node[1]->pos, next_node[1]->pos, | |
870 next_node[0]->ts , next_node[1]->ts, AVSEEK_FLAG_BACKWARD, &ts, nut_read_timestamp); | |
1500 | 871 |
1502 | 872 if(!(flags & AVSEEK_FLAG_BACKWARD)){ |
873 dummy.pos= pos+16; | |
874 next_node[1]= &nopts_sp; | |
5902 | 875 av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp, |
876 (void **) next_node); | |
1502 | 877 pos2= av_gen_search(s, -2, dummy.pos, next_node[0]->pos , next_node[1]->pos, next_node[1]->pos, |
878 next_node[0]->back_ptr, next_node[1]->back_ptr, flags, &ts, nut_read_timestamp); | |
879 if(pos2>=0) | |
880 pos= pos2; | |
3139 | 881 //FIXME dir but I think it does not matter |
1502 | 882 } |
883 dummy.pos= pos; | |
5902 | 884 sp= av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp, |
885 NULL); | |
1500 | 886 |
1502 | 887 assert(sp); |
888 pos2= sp->back_ptr - 15; | |
1501 | 889 } |
890 av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos2); | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
891 pos= find_startcode(s->pb, SYNCPOINT_STARTCODE, pos2); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
892 url_fseek(s->pb, pos, SEEK_SET); |
1500 | 893 av_log(NULL, AV_LOG_DEBUG, "SP: %"PRId64"\n", pos); |
1501 | 894 if(pos2 > pos || pos2 + 15 < pos){ |
1500 | 895 av_log(NULL, AV_LOG_ERROR, "no syncpoint at backptr pos\n"); |
896 } | |
1517
51b29c17bd1f
skip non keyframes after seeking between syncpoint and the first keyframe
michael
parents:
1516
diff
changeset
|
897 for(i=0; i<s->nb_streams; i++) |
51b29c17bd1f
skip non keyframes after seeking between syncpoint and the first keyframe
michael
parents:
1516
diff
changeset
|
898 nut->stream[i].skip_until_key_frame=1; |
51b29c17bd1f
skip non keyframes after seeking between syncpoint and the first keyframe
michael
parents:
1516
diff
changeset
|
899 |
1500 | 900 return 0; |
901 } | |
902 | |
1477 | 903 static int nut_read_close(AVFormatContext *s) |
904 { | |
905 NUTContext *nut = s->priv_data; | |
5729 | 906 int i; |
1477 | 907 |
908 av_freep(&nut->time_base); | |
909 av_freep(&nut->stream); | |
5738 | 910 ff_nut_free_sp(nut); |
5729 | 911 for(i = 1; i < nut->header_count; i++) |
912 av_freep(&nut->header[i]); | |
1477 | 913 |
914 return 0; | |
915 } | |
916 | |
4206 | 917 #if CONFIG_NUT_DEMUXER |
1477 | 918 AVInputFormat nut_demuxer = { |
919 "nut", | |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3377
diff
changeset
|
920 NULL_IF_CONFIG_SMALL("NUT format"), |
1477 | 921 sizeof(NUTContext), |
922 nut_probe, | |
923 nut_read_header, | |
924 nut_read_packet, | |
925 nut_read_close, | |
1500 | 926 read_seek, |
1477 | 927 .extensions = "nut", |
5704
6b9c2a6d8fa4
Introduce metadata conversion table for NUT muxer and demuxer.
kostya
parents:
5058
diff
changeset
|
928 .metadata_conv = ff_nut_metadata_conv, |
6038
d0ea87d82842
Define ff_nut_video_tags and make Nut muxer and demuxer set it in
stefano
parents:
5997
diff
changeset
|
929 .codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, |
1477 | 930 }; |
931 #endif |