* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "tree.h"
+#include "libavutil/avstring.h"
+#include "libavutil/tree.h"
#include "nut.h"
-#include "avstring.h"
#undef NDEBUG
#include <assert.h>
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 are currently
+ 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
while(!url_feof(bc)){
state= (state<<8) | get_byte(bc);
ByteIOContext *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;
+ int i, j, tmp_stream, tmp_mul, tmp_pts, tmp_size, count, tmp_res, tmp_head_idx;
int64_t tmp_match;
end= get_packetheader(nut, bc, 1, MAIN_STARTCODE);
tmp_mul=1;
tmp_stream=0;
tmp_match= 1-(1LL<<62);
+ tmp_head_idx= 0;
for(i=0; i<256;){
int tmp_flags = ff_get_v(bc);
int tmp_fields= ff_get_v(bc);
if(tmp_fields>5) count = ff_get_v(bc);
else count = tmp_mul - tmp_size;
if(tmp_fields>6) tmp_match = get_s(bc);
+ if(tmp_fields>7) tmp_head_idx= ff_get_v(bc);
- while(tmp_fields-- > 7)
+ while(tmp_fields-- > 8)
ff_get_v(bc);
if(count == 0 || i+count > 256){
nut->frame_code[i].size_mul = tmp_mul ;
nut->frame_code[i].size_lsb = tmp_size+j;
nut->frame_code[i].reserved_count = tmp_res ;
+ nut->frame_code[i].header_idx = tmp_head_idx;
}
}
assert(nut->frame_code['N'].flags == FLAG_INVALID);
+ if(end > url_ftell(bc) + 4){
+ int rem= 1024;
+ GET_V(nut->header_count, tmp<128U)
+ nut->header_count++;
+ for(i=1; i<nut->header_count; i++){
+ GET_V(nut->header_len[i], tmp>0 && tmp<256);
+ rem -= nut->header_len[i];
+ if(rem < 0){
+ av_log(s, AV_LOG_ERROR, "invalid elision header\n");
+ return -1;
+ }
+ nut->header[i]= av_malloc(nut->header_len[i]);
+ get_buffer(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;
case 0:
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = codec_get_id(codec_bmp_tags, tmp);
- if (st->codec->codec_id == CODEC_ID_NONE)
- av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
break;
case 1:
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = codec_get_id(codec_wav_tags, tmp);
- if (st->codec->codec_id == CODEC_ID_NONE)
- av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
break;
case 2:
-// st->codec->codec_type = CODEC_TYPE_TEXT;
-// break;
+ st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+ st->codec->codec_id = codec_get_id(ff_nut_subtitle_tags, tmp);
+ break;
case 3:
st->codec->codec_type = CODEC_TYPE_DATA;
break;
av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class);
return -1;
}
+ if(class<3 && st->codec->codec_id == CODEC_ID_NONE)
+ av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
+
GET_V(stc->time_base_id , tmp < nut->time_base_count);
GET_V(stc->msb_pts_shift , tmp < 16);
stc->max_pts_distance= ff_get_v(bc);
return 0;
}
+static void set_disposition_bits(AVFormatContext* avf, char* value, int stream_id){
+ int flag = 0, i;
+ for (i=0; ff_nut_dispositions[i].flag; ++i) {
+ if (!strcmp(ff_nut_dispositions[i].str, value))
+ flag = ff_nut_dispositions[i].flag;
+ }
+ if (!flag)
+ av_log(avf, AV_LOG_INFO, "unknown disposition type '%s'\n", value);
+ for (i = 0; i < avf->nb_streams; ++i)
+ if (stream_id == i || stream_id == -1)
+ avf->streams[i]->disposition |= flag;
+}
+
static int decode_info_header(NUTContext *nut){
AVFormatContext *s= nut->avf;
ByteIOContext *bc = s->pb;
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);
type= "v";
}
+ if (stream_id_plus1 > s->nb_streams) {
+ av_log(s, AV_LOG_ERROR, "invalid stream id for info packet\n");
+ continue;
+ }
+
if(chapter_id==0 && !strcmp(type, "UTF-8")){
if (!strcmp(name, "Author"))
av_strlcpy(s->author , str_value, sizeof(s->author));
av_strlcpy(s->copyright, str_value, sizeof(s->copyright));
else if(!strcmp(name, "Description"))
av_strlcpy(s->comment , str_value, sizeof(s->comment));
+ 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);
}
}
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)
return 0;
}
-static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, int frame_code){
+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;
StreamContext *stc;
*stream_id = nut->frame_code[frame_code].stream_id;
pts_delta = nut->frame_code[frame_code].pts_delta;
reserved_count = nut->frame_code[frame_code].reserved_count;
+ *header_idx = nut->frame_code[frame_code].header_idx;
if(flags & FLAG_INVALID)
return -1;
}
if(flags&FLAG_MATCH_TIME)
get_s(bc);
+ if(flags&FLAG_HEADER_IDX)
+ *header_idx= ff_get_v(bc);
if(flags&FLAG_RESERVED)
reserved_count= ff_get_v(bc);
for(i=0; i<reserved_count; i++)
ff_get_v(bc);
+
+ if(*header_idx >= (unsigned)nut->header_count){
+ av_log(s, AV_LOG_ERROR, "header_idx invalid\n");
+ return -1;
+ }
+ if(size > 4096)
+ *header_idx=0;
+ size -= nut->header_len[*header_idx];
+
if(flags&FLAG_CHECKSUM){
get_be32(bc); //FIXME check this
}else if(size > 2*nut->max_distance || FFABS(stc->last_pts - *pts) > stc->max_pts_distance){
int size, stream_id, discard;
int64_t pts, last_IP_pts;
StreamContext *stc;
+ uint8_t header_idx;
- size= decode_frame_header(nut, &pts, &stream_id, frame_code);
+ size= decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code);
if(size < 0)
return -1;
return 1;
}
- av_get_packet(bc, pkt, size);
+ 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);
+
pkt->stream_index = stream_id;
if (stc->last_flags & FLAG_KEY)
pkt->flags |= PKT_FLAG_KEY;
next_node[0]->back_ptr, next_node[1]->back_ptr, flags, &ts, nut_read_timestamp);
if(pos2>=0)
pos= pos2;
- //FIXME dir but i think it does not matter
+ //FIXME dir but I think it does not matter
}
dummy.pos= pos;
sp= av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, NULL);
#ifdef CONFIG_NUT_DEMUXER
AVInputFormat nut_demuxer = {
"nut",
- "nut format",
+ NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext),
nut_probe,
nut_read_header,
projects / ffmpeg / blobdiff