int64_t value, end;
char name[256], str_value[1024], type_str[256];
const char *type;
+ AVChapter *chapter= NULL;
end= get_packetheader(nut, bc, 1, INFO_STARTCODE);
end += url_ftell(bc);
chapter_start= ff_get_v(bc);
chapter_len = ff_get_v(bc);
count = ff_get_v(bc);
+
+ if(chapter_id && !stream_id_plus1){
+ int64_t start= chapter_start / nut->time_base_count;
+ chapter= ff_new_chapter(s, chapter_id,
+ nut->time_base[chapter_start % nut->time_base_count],
+ start, start + chapter_len, NULL);
+ }
+
for(i=0; i<count; i++){
get_str(bc, name, sizeof(name));
value= get_s(bc);
else if(!strcmp(name, "Disposition"))
set_disposition_bits(s, str_value, stream_id_plus1 - 1);
}
+ if(chapter && !strcmp(type, "UTF-8")){
+ if(!strcmp(name, "Title"))
+ chapter->title= av_strdup(str_value);
+ }
}
if(skip_reserved(bc, end) || get_checksum(bc)){
int64_t filesize= url_fsize(bc);
int64_t *syncpoints;
int8_t *has_keyframe;
+ int ret= -1;
url_fseek(bc, filesize-12, SEEK_SET);
url_fseek(bc, filesize-get_be64(bc), SEEK_SET);
syncpoints= av_malloc(sizeof(int64_t)*syncpoint_count);
has_keyframe= av_malloc(sizeof(int8_t)*(syncpoint_count+1));
for(i=0; i<syncpoint_count; i++){
- GET_V(syncpoints[i], tmp>0)
+ syncpoints[i] = ff_get_v(bc);
+ if(syncpoints[i] <= 0)
+ goto fail;
if(i)
syncpoints[i] += syncpoints[i-1];
}
x>>=1;
if(n+x >= syncpoint_count + 1){
av_log(s, AV_LOG_ERROR, "index overflow A\n");
- return -1;
+ goto fail;
}
while(x--)
has_keyframe[n++]= flag;
while(x != 1){
if(n>=syncpoint_count + 1){
av_log(s, AV_LOG_ERROR, "index overflow B\n");
- return -1;
+ goto fail;
}
has_keyframe[n++]= x&1;
x>>=1;
}
if(has_keyframe[0]){
av_log(s, AV_LOG_ERROR, "keyframe before first syncpoint in index\n");
- return -1;
+ goto fail;
}
assert(n<=syncpoint_count+1);
for(; j<n && j<syncpoint_count; j++){
if(skip_reserved(bc, end) || get_checksum(bc)){
av_log(s, AV_LOG_ERROR, "index checksum mismatch\n");
- return -1;
+ goto fail;
}
- return 0;
+ ret= 0;
+fail:
+ av_free(syncpoints);
+ av_free(has_keyframe);
+ return ret;
}
static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap)
#ifdef CONFIG_NUT_DEMUXER
AVInputFormat nut_demuxer = {
"nut",
- "nut format",
+ NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext),
nut_probe,
nut_read_header,