X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnutdec.c;h=8831dc0a3eafa00ea1bb0d6ee7c03836c81c1bbe;hb=e356fc57a2e9887370caec58d8aafeafd1f336dc;hp=1b616dee4a1c47b098d0aef523c57db354790c0e;hpb=8fc0162ac44f3e60798552ca6d19387be95cae4c;p=ffmpeg diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 1b616dee4a1..8831dc0a3ea 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -29,13 +29,19 @@ #undef NDEBUG #include -static int get_str(ByteIOContext *bc, char *string, unsigned int maxlen){ +#if FF_API_MAX_STREAMS +#define NUT_MAX_STREAMS MAX_STREAMS +#else +#define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */ +#endif + +static int get_str(AVIOContext *bc, char *string, unsigned int maxlen){ unsigned int len= ff_get_v(bc); if(len && maxlen) - get_buffer(bc, string, FFMIN(len, maxlen)); + avio_read(bc, string, FFMIN(len, maxlen)); while(len > maxlen){ - get_byte(bc); + avio_r8(bc); len--; } @@ -48,37 +54,37 @@ static int get_str(ByteIOContext *bc, char *string, unsigned int maxlen){ return 0; } -static int64_t get_s(ByteIOContext *bc){ +static int64_t get_s(AVIOContext *bc){ int64_t v = ff_get_v(bc) + 1; if (v&1) return -(v>>1); else return (v>>1); } -static uint64_t get_fourcc(ByteIOContext *bc){ +static uint64_t get_fourcc(AVIOContext *bc){ unsigned int len= ff_get_v(bc); - if (len==2) return get_le16(bc); - else if(len==4) return get_le32(bc); + if (len==2) return avio_rl16(bc); + else if(len==4) return avio_rl32(bc); else return -1; } #ifdef TRACE -static inline uint64_t get_v_trace(ByteIOContext *bc, char *file, char *func, int line){ +static inline uint64_t get_v_trace(AVIOContext *bc, char *file, char *func, int line){ uint64_t v= ff_get_v(bc); av_log(NULL, AV_LOG_DEBUG, "get_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); return v; } -static inline int64_t get_s_trace(ByteIOContext *bc, char *file, char *func, int line){ +static inline int64_t get_s_trace(AVIOContext *bc, char *file, char *func, int line){ int64_t v= get_s(bc); av_log(NULL, AV_LOG_DEBUG, "get_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); return v; } -static inline uint64_t get_vb_trace(ByteIOContext *bc, char *file, char *func, int line){ +static inline uint64_t get_vb_trace(AVIOContext *bc, char *file, char *func, int line){ uint64_t v= get_vb(bc); av_log(NULL, AV_LOG_DEBUG, "get_vb %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); @@ -89,7 +95,7 @@ static inline uint64_t get_vb_trace(ByteIOContext *bc, char *file, char *func, i #define get_vb(bc) get_vb_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) #endif -static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_checksum, uint64_t startcode) +static int get_packetheader(NUTContext *nut, AVIOContext *bc, int calculate_checksum, uint64_t startcode) { int64_t size; // start= url_ftell(bc) - 8; @@ -100,7 +106,7 @@ static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_ch init_checksum(bc, ff_crc04C11DB7_update, startcode); size= ff_get_v(bc); if(size > 4096) - get_be32(bc); + avio_rb32(bc); if(get_checksum(bc) && size > 4096) return -1; @@ -109,14 +115,14 @@ static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_ch return size; } -static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){ +static uint64_t find_any_startcode(AVIOContext *bc, int64_t pos){ uint64_t state=0; if(pos >= 0) - 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 + avio_seek(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 while(!url_feof(bc)){ - state= (state<<8) | get_byte(bc); + state= (state<<8) | avio_r8(bc); if((state>>56) != 'N') continue; switch(state){ @@ -138,7 +144,7 @@ static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){ * @param pos the start position of the search, or -1 if the current position * @return the position of the startcode or -1 if not found */ -static int64_t find_startcode(ByteIOContext *bc, uint64_t code, int64_t pos){ +static int64_t find_startcode(AVIOContext *bc, uint64_t code, int64_t pos){ for(;;){ uint64_t startcode= find_any_startcode(bc, pos); if(startcode == code) @@ -169,21 +175,21 @@ static int nut_probe(AVProbeData *p){ }\ dst= tmp; -static int skip_reserved(ByteIOContext *bc, int64_t pos){ +static int skip_reserved(AVIOContext *bc, int64_t pos){ pos -= url_ftell(bc); if(pos<0){ - url_fseek(bc, pos, SEEK_CUR); + avio_seek(bc, pos, SEEK_CUR); return -1; }else{ while(pos--) - get_byte(bc); + avio_r8(bc); return 0; } } static int decode_main_header(NUTContext *nut){ AVFormatContext *s= nut->avf; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; uint64_t tmp, end; unsigned int stream_count; int i, j, tmp_stream, tmp_mul, tmp_pts, tmp_size, count, tmp_res, tmp_head_idx; @@ -193,7 +199,7 @@ static int decode_main_header(NUTContext *nut){ end += url_ftell(bc); GET_V(tmp , tmp >=2 && tmp <= 3) - GET_V(stream_count , tmp > 0 && tmp <=MAX_STREAMS) + GET_V(stream_count , tmp > 0 && tmp <= NUT_MAX_STREAMS) nut->max_distance = ff_get_v(bc); if(nut->max_distance > 65536){ @@ -209,7 +215,7 @@ static int decode_main_header(NUTContext *nut){ GET_V(nut->time_base[i].den, tmp>0 && tmp<(1ULL<<31)) if(av_gcd(nut->time_base[i].num, nut->time_base[i].den) != 1){ av_log(s, AV_LOG_ERROR, "time base invalid\n"); - return -1; + return AVERROR_INVALIDDATA; } } tmp_pts=0; @@ -237,11 +243,11 @@ static int decode_main_header(NUTContext *nut){ if(count == 0 || i+count > 256){ av_log(s, AV_LOG_ERROR, "illegal count %d at %d\n", count, i); - return -1; + return AVERROR_INVALIDDATA; } if(tmp_stream >= stream_count){ av_log(s, AV_LOG_ERROR, "illegal stream number\n"); - return -1; + return AVERROR_INVALIDDATA; } for(j=0; jheader_len[i]; if(rem < 0){ av_log(s, AV_LOG_ERROR, "invalid elision header\n"); - return -1; + return AVERROR_INVALIDDATA; } nut->header[i]= av_malloc(nut->header_len[i]); - get_buffer(bc, nut->header[i], nut->header_len[i]); + avio_read(bc, nut->header[i], nut->header_len[i]); } assert(nut->header_len[0]==0); } if(skip_reserved(bc, end) || get_checksum(bc)){ av_log(s, AV_LOG_ERROR, "main header checksum mismatch\n"); - return -1; + return AVERROR_INVALIDDATA; } nut->stream = av_mallocz(sizeof(StreamContext)*stream_count); @@ -293,7 +299,7 @@ static int decode_main_header(NUTContext *nut){ static int decode_stream_header(NUTContext *nut){ AVFormatContext *s= nut->avf; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; StreamContext *stc; int class, stream_id; uint64_t tmp, end; @@ -349,7 +355,7 @@ static int decode_stream_header(NUTContext *nut){ GET_V(st->codec->extradata_size, tmp < (1<<30)); if(st->codec->extradata_size){ st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); - get_buffer(bc, st->codec->extradata, st->codec->extradata_size); + avio_read(bc, st->codec->extradata, st->codec->extradata_size); } if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ @@ -391,7 +397,7 @@ static void set_disposition_bits(AVFormatContext* avf, char* value, int stream_i static int decode_info_header(NUTContext *nut){ AVFormatContext *s= nut->avf; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; uint64_t tmp, chapter_start, chapter_len; unsigned int stream_id_plus1, count; int chapter_id, i; @@ -400,6 +406,7 @@ static int decode_info_header(NUTContext *nut){ const char *type; AVChapter *chapter= NULL; AVStream *st= NULL; + AVMetadata **metadata = NULL; end= get_packetheader(nut, bc, 1, INFO_STARTCODE); end += url_ftell(bc); @@ -415,8 +422,12 @@ static int decode_info_header(NUTContext *nut){ chapter= ff_new_chapter(s, chapter_id, nut->time_base[chapter_start % nut->time_base_count], start, start + chapter_len, NULL); - } else if(stream_id_plus1) + metadata = &chapter->metadata; + } else if(stream_id_plus1) { st= s->streams[stream_id_plus1 - 1]; + metadata = &st->metadata; + } else + metadata = &s->metadata; for(i=0; imetadata; - else if(stream_id_plus1) metadata= &st->metadata; - else metadata= &s->metadata; + continue; + } if(metadata && strcasecmp(name,"Uses") && strcasecmp(name,"Depends") && strcasecmp(name,"Replaces")) av_metadata_set2(metadata, name, str_value, 0); @@ -468,7 +477,7 @@ static int decode_info_header(NUTContext *nut){ static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr){ AVFormatContext *s= nut->avf; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; int64_t end, tmp; nut->last_syncpoint_pos= url_ftell(bc)-8; @@ -496,7 +505,7 @@ static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr){ static int find_and_decode_index(NUTContext *nut){ AVFormatContext *s= nut->avf; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; uint64_t tmp, end; int i, j, syncpoint_count; int64_t filesize= url_fsize(bc); @@ -504,9 +513,9 @@ static int find_and_decode_index(NUTContext *nut){ int8_t *has_keyframe; int ret= -1; - url_fseek(bc, filesize-12, SEEK_SET); - url_fseek(bc, filesize-get_be64(bc), SEEK_SET); - if(get_be64(bc) != INDEX_STARTCODE){ + avio_seek(bc, filesize-12, SEEK_SET); + avio_seek(bc, filesize-avio_rb64(bc), SEEK_SET); + if(avio_rb64(bc) != INDEX_STARTCODE){ av_log(s, AV_LOG_ERROR, "no index at the end\n"); return -1; } @@ -594,7 +603,7 @@ fail: static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) { NUTContext *nut = s->priv_data; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; int64_t pos; int initialized_stream_count; @@ -606,7 +615,7 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) pos= find_startcode(bc, MAIN_STARTCODE, pos)+1; if (pos<0+1){ av_log(s, AV_LOG_ERROR, "No main startcode found.\n"); - return -1; + return AVERROR_INVALIDDATA; } }while(decode_main_header(nut) < 0); @@ -616,7 +625,7 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) pos= find_startcode(bc, STREAM_STARTCODE, pos)+1; if (pos<0+1){ av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n"); - return -1; + return AVERROR_INVALIDDATA; } if(decode_stream_header(nut) >= 0) initialized_stream_count++; @@ -630,7 +639,7 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) if(startcode==0){ av_log(s, AV_LOG_ERROR, "EOF before video frames\n"); - return -1; + return AVERROR_INVALIDDATA; }else if(startcode == SYNCPOINT_STARTCODE){ nut->next_startcode= startcode; break; @@ -646,23 +655,25 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) if(!url_is_streamed(bc)){ int64_t orig_pos= url_ftell(bc); find_and_decode_index(nut); - url_fseek(bc, orig_pos, SEEK_SET); + avio_seek(bc, orig_pos, SEEK_SET); } assert(nut->next_startcode == SYNCPOINT_STARTCODE); + ff_metadata_conv_ctx(s, NULL, ff_nut_metadata_conv); + return 0; } static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, uint8_t *header_idx, int frame_code){ AVFormatContext *s= nut->avf; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; StreamContext *stc; int size, flags, size_mul, pts_delta, i, reserved_count; uint64_t tmp; if(url_ftell(bc) > nut->last_syncpoint_pos + nut->max_distance){ 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); - return -1; + return AVERROR_INVALIDDATA; } flags = nut->frame_code[frame_code].flags; @@ -674,7 +685,7 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, ui *header_idx = nut->frame_code[frame_code].header_idx; if(flags & FLAG_INVALID) - return -1; + return AVERROR_INVALIDDATA; if(flags & FLAG_CODED) flags ^= ff_get_v(bc); if(flags & FLAG_STREAM_ID){ @@ -704,17 +715,17 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, ui if(*header_idx >= (unsigned)nut->header_count){ av_log(s, AV_LOG_ERROR, "header_idx invalid\n"); - return -1; + return AVERROR_INVALIDDATA; } if(size > 4096) *header_idx=0; size -= nut->header_len[*header_idx]; if(flags&FLAG_CHECKSUM){ - get_be32(bc); //FIXME check this + avio_rb32(bc); //FIXME check this }else if(size > 2*nut->max_distance || FFABS(stc->last_pts - *pts) > stc->max_pts_distance){ av_log(s, AV_LOG_ERROR, "frame size > 2max_distance and no checksum\n"); - return -1; + return AVERROR_INVALIDDATA; } stc->last_pts= *pts; @@ -725,7 +736,7 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, ui static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){ AVFormatContext *s= nut->avf; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; int size, stream_id, discard; int64_t pts, last_IP_pts; StreamContext *stc; @@ -733,7 +744,7 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){ size= decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code); if(size < 0) - return -1; + return size; stc= &nut->stream[stream_id]; @@ -746,14 +757,14 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){ ||(discard >= AVDISCARD_BIDIR && last_IP_pts != AV_NOPTS_VALUE && last_IP_pts > pts) || discard >= AVDISCARD_ALL || stc->skip_until_key_frame){ - url_fskip(bc, size); + avio_seek(bc, size, SEEK_CUR); return 1; } av_new_packet(pkt, size + nut->header_len[header_idx]); memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]); pkt->pos= url_ftell(bc); //FIXME - get_buffer(bc, pkt->data + nut->header_len[header_idx], size); + avio_read(bc, pkt->data + nut->header_len[header_idx], size); pkt->stream_index = stream_id; if (stc->last_flags & FLAG_KEY) @@ -766,7 +777,7 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){ static int nut_read_packet(AVFormatContext *s, AVPacket *pkt) { NUTContext *nut = s->priv_data; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; int i, frame_code=0, ret, skip; int64_t ts, back_ptr; @@ -778,13 +789,13 @@ static int nut_read_packet(AVFormatContext *s, AVPacket *pkt) if(tmp){ pos-=8; }else{ - frame_code = get_byte(bc); + frame_code = avio_r8(bc); if(url_feof(bc)) return -1; if(frame_code == 'N'){ tmp= frame_code; for(i=1; i<8; i++) - tmp = (tmp<<8) + get_byte(bc); + tmp = (tmp<<8) + avio_r8(bc); } } switch(tmp){ @@ -792,7 +803,7 @@ static int nut_read_packet(AVFormatContext *s, AVPacket *pkt) case STREAM_STARTCODE: case INDEX_STARTCODE: skip= get_packetheader(nut, bc, 0, tmp); - url_fseek(bc, skip, SEEK_CUR); + avio_seek(bc, skip, SEEK_CUR); break; case INFO_STARTCODE: if(decode_info_header(nut)<0) @@ -801,7 +812,7 @@ static int nut_read_packet(AVFormatContext *s, AVPacket *pkt) case SYNCPOINT_STARTCODE: if(decode_syncpoint(nut, &ts, &back_ptr)<0) goto resync; - frame_code = get_byte(bc); + frame_code = avio_r8(bc); case 0: ret= decode_frame(nut, pkt, frame_code); if(ret==0) @@ -813,7 +824,7 @@ resync: av_log(s, AV_LOG_DEBUG, "syncing from %"PRId64"\n", pos); tmp= find_any_startcode(bc, nut->last_syncpoint_pos+1); if(tmp==0) - return -1; + return AVERROR_INVALIDDATA; av_log(s, AV_LOG_DEBUG, "sync\n"); nut->next_startcode= tmp; } @@ -822,7 +833,7 @@ av_log(s, AV_LOG_DEBUG, "sync\n"); static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos_arg, int64_t pos_limit){ NUTContext *nut = s->priv_data; - ByteIOContext *bc = s->pb; + AVIOContext *bc = s->pb; int64_t pos, pts, back_ptr; av_log(s, AV_LOG_DEBUG, "read_timestamp(X,%d,%"PRId64",%"PRId64")\n", stream_index, *pos_arg, pos_limit); @@ -889,7 +900,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag } av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos2); pos= find_startcode(s->pb, SYNCPOINT_STARTCODE, pos2); - url_fseek(s->pb, pos, SEEK_SET); + avio_seek(s->pb, pos, SEEK_SET); av_log(NULL, AV_LOG_DEBUG, "SP: %"PRId64"\n", pos); if(pos2 > pos || pos2 + 15 < pos){ av_log(NULL, AV_LOG_ERROR, "no syncpoint at backptr pos\n"); @@ -915,7 +926,7 @@ static int nut_read_close(AVFormatContext *s) } #if CONFIG_NUT_DEMUXER -AVInputFormat nut_demuxer = { +AVInputFormat ff_nut_demuxer = { "nut", NULL_IF_CONFIG_SMALL("NUT format"), sizeof(NUTContext), @@ -925,7 +936,6 @@ AVInputFormat nut_demuxer = { nut_read_close, read_seek, .extensions = "nut", - .metadata_conv = ff_nut_metadata_conv, .codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, }; #endif