Skip to content

F
ffmpeg.wasm-core
Commit a559d65c authored by Asen Lekov's avatar Asen Lekov Committed by Diego Biurrun
Browse files
Options

nutdec: K&R formatting cosmetics 

Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent a40ba3af
Show whitespace changes
Inline Side-by-side
Showing with 500 additions and 436 deletions
libavformat/nutdec.c
View file @ a559d65c
...@@ -33,59 +33,76 @@ ...@@ -33,59 +33,76 @@
#define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */ #define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */
static int get_str(AVIOContext *bc, char *string, unsigned int maxlen){ static int get_str(AVIOContext *bc, char *string, unsigned int maxlen)
unsigned int len= ffio_read_varlen(bc); {
unsigned int len = ffio_read_varlen(bc);
if(len && maxlen) if (len && maxlen)
avio_read(bc, string, FFMIN(len, maxlen)); avio_read(bc, string, FFMIN(len, maxlen));
while(len > maxlen){ while (len > maxlen) {
avio_r8(bc); avio_r8(bc);
len--; len--;
} }
if(maxlen) if (maxlen)
string[FFMIN(len, maxlen-1)]= 0; string[FFMIN(len, maxlen - 1)] = 0;
if(maxlen == len) if (maxlen == len)
return -1; return -1;
else else
return 0; return 0;
} }
static int64_t get_s(AVIOContext *bc){ static int64_t get_s(AVIOContext *bc)
{
int64_t v = ffio_read_varlen(bc) + 1; int64_t v = ffio_read_varlen(bc) + 1;
if (v&1) return -(v>>1); if (v & 1)
else return (v>>1); return -(v >> 1);
else
return (v >> 1);
} }
static uint64_t get_fourcc(AVIOContext *bc){ static uint64_t get_fourcc(AVIOContext *bc)
unsigned int len= ffio_read_varlen(bc); {
unsigned int len = ffio_read_varlen(bc);
if (len==2) return avio_rl16(bc); if (len == 2)
else if(len==4) return avio_rl32(bc); return avio_rl16(bc);
else return -1; else if (len == 4)
return avio_rl32(bc);
else
return -1;
} }
#ifdef TRACE #ifdef TRACE
static inline uint64_t get_v_trace(AVIOContext *bc, char *file, char *func, int line){ static inline uint64_t get_v_trace(AVIOContext *bc, char *file,
uint64_t v= ffio_read_varlen(bc); char *func, int line)
{
uint64_t v = ffio_read_varlen(bc);
av_log(NULL, AV_LOG_DEBUG, "get_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); av_log(NULL, AV_LOG_DEBUG, "get_v %5"PRId64" / %"PRIX64" in %s %s:%d\n",
v, v, file, func, line);
return v; return v;
} }
static inline int64_t get_s_trace(AVIOContext *bc, char *file, char *func, int line){ static inline int64_t get_s_trace(AVIOContext *bc, char *file,
int64_t v= get_s(bc); 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); av_log(NULL, AV_LOG_DEBUG, "get_s %5"PRId64" / %"PRIX64" in %s %s:%d\n",
v, v, file, func, line);
return v; return v;
} }
static inline uint64_t get_vb_trace(AVIOContext *bc, char *file, char *func, int line){ static inline uint64_t get_vb_trace(AVIOContext *bc, char *file,
uint64_t v= get_vb(bc); 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); av_log(NULL, AV_LOG_DEBUG, "get_vb %5"PRId64" / %"PRIX64" in %s %s:%d\n",
v, v, file, func, line);
return v; return v;
} }
#define ffio_read_varlen(bc) get_v_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define ffio_read_varlen(bc) get_v_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__)
...@@ -93,19 +110,20 @@ static inline uint64_t get_vb_trace(AVIOContext *bc, char *file, char *func, int ...@@ -93,19 +110,20 @@ static inline uint64_t get_vb_trace(AVIOContext *bc, char *file, char *func, int
#define get_vb(bc) get_vb_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_vb(bc) get_vb_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#endif #endif
static int get_packetheader(NUTContext *nut, AVIOContext *bc, int calculate_checksum, uint64_t startcode) static int get_packetheader(NUTContext *nut, AVIOContext *bc,
int calculate_checksum, uint64_t startcode)
{ {
int64_t size; int64_t size;
// start= avio_tell(bc) - 8; // start = avio_tell(bc) - 8;
startcode= av_be2ne64(startcode); startcode = av_be2ne64(startcode);
startcode= ff_crc04C11DB7_update(0, (uint8_t*)&startcode, 8); startcode = ff_crc04C11DB7_update(0, (uint8_t*) &startcode, 8);
ffio_init_checksum(bc, ff_crc04C11DB7_update, startcode); ffio_init_checksum(bc, ff_crc04C11DB7_update, startcode);
size= ffio_read_varlen(bc); size = ffio_read_varlen(bc);
if(size > 4096) if (size > 4096)
avio_rb32(bc); avio_rb32(bc);
if(ffio_get_checksum(bc) && size > 4096) if (ffio_get_checksum(bc) && size > 4096)
return -1; return -1;
ffio_init_checksum(bc, calculate_checksum ? ff_crc04C11DB7_update : NULL, 0); ffio_init_checksum(bc, calculate_checksum ? ff_crc04C11DB7_update : NULL, 0);
...@@ -113,17 +131,19 @@ static int get_packetheader(NUTContext *nut, AVIOContext *bc, int calculate_chec ...@@ -113,17 +131,19 @@ static int get_packetheader(NUTContext *nut, AVIOContext *bc, int calculate_chec
return size; return size;
} }
static uint64_t find_any_startcode(AVIOContext *bc, int64_t pos){ static uint64_t find_any_startcode(AVIOContext *bc, int64_t pos)
uint64_t state=0; {
uint64_t state = 0;
if(pos >= 0)
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 if (pos >= 0)
/* Note, this may fail if the stream is not seekable, but that should
while(!bc->eof_reached){ * not matter, as in this case we simply start where we currently are */
state= (state<<8) | avio_r8(bc); avio_seek(bc, pos, SEEK_SET);
if((state>>56) != 'N') while (!bc->eof_reached) {
state = (state << 8) | avio_r8(bc);
if ((state >> 56) != 'N')
continue; continue;
switch(state){ switch (state) {
case MAIN_STARTCODE: case MAIN_STARTCODE:
case STREAM_STARTCODE: case STREAM_STARTCODE:
case SYNCPOINT_STARTCODE: case SYNCPOINT_STARTCODE:
...@@ -142,20 +162,22 @@ static uint64_t find_any_startcode(AVIOContext *bc, int64_t pos){ ...@@ -142,20 +162,22 @@ static uint64_t find_any_startcode(AVIOContext *bc, int64_t pos){
* @param pos the start position of the search, or -1 if the current position * @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 * @return the position of the startcode or -1 if not found
*/ */
static int64_t find_startcode(AVIOContext *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); for (;;) {
if(startcode == code) uint64_t startcode = find_any_startcode(bc, pos);
if (startcode == code)
return avio_tell(bc) - 8; return avio_tell(bc) - 8;
else if(startcode == 0) else if (startcode == 0)
return -1; return -1;
pos=-1; pos = -1;
} }
} }
static int nut_probe(AVProbeData *p){ static int nut_probe(AVProbeData *p)
{
int i; int i;
uint64_t code= 0; uint64_t code = 0;
for (i = 0; i < p->buf_size; i++) { for (i = 0; i < p->buf_size; i++) {
code = (code << 8) | p->buf[i]; code = (code << 8) | p->buf[i];
...@@ -166,160 +188,176 @@ static int nut_probe(AVProbeData *p){ ...@@ -166,160 +188,176 @@ static int nut_probe(AVProbeData *p){
} }
#define GET_V(dst, check) \ #define GET_V(dst, check) \
tmp= ffio_read_varlen(bc);\ tmp = ffio_read_varlen(bc); \
if(!(check)){\ if (!(check)) { \
av_log(s, AV_LOG_ERROR, "Error " #dst " is (%"PRId64")\n", tmp);\ av_log(s, AV_LOG_ERROR, "Error " #dst " is (%"PRId64")\n", tmp); \
return -1;\ return -1; \
}\ } \
dst= tmp; dst = tmp;
static int skip_reserved(AVIOContext *bc, int64_t pos){ static int skip_reserved(AVIOContext *bc, int64_t pos)
{
pos -= avio_tell(bc); pos -= avio_tell(bc);
if(pos<0){ if (pos < 0) {
avio_seek(bc, pos, SEEK_CUR); avio_seek(bc, pos, SEEK_CUR);
return -1; return -1;
}else{ } else {
while(pos--) while (pos--)
avio_r8(bc); avio_r8(bc);
return 0; return 0;
} }
} }
static int decode_main_header(NUTContext *nut){ static int decode_main_header(NUTContext *nut)
AVFormatContext *s= nut->avf; {
AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
uint64_t tmp, end; uint64_t tmp, end;
unsigned int stream_count; unsigned int stream_count;
int i, j, tmp_stream, tmp_mul, tmp_pts, tmp_size, count, tmp_res, tmp_head_idx; int i, j, count;
int tmp_stream, tmp_mul, tmp_pts, tmp_size, tmp_res, tmp_head_idx;
end= get_packetheader(nut, bc, 1, MAIN_STARTCODE); end = get_packetheader(nut, bc, 1, MAIN_STARTCODE);
end += avio_tell(bc); end += avio_tell(bc);
GET_V(tmp , tmp >=2 && tmp <= 3) GET_V(tmp, tmp >= 2 && tmp <= 3)
GET_V(stream_count , tmp > 0 && tmp <= NUT_MAX_STREAMS) GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS)
nut->max_distance = ffio_read_varlen(bc); nut->max_distance = ffio_read_varlen(bc);
if(nut->max_distance > 65536){ if (nut->max_distance > 65536) {
av_log(s, AV_LOG_DEBUG, "max_distance %d\n", nut->max_distance); av_log(s, AV_LOG_DEBUG, "max_distance %d\n", nut->max_distance);
nut->max_distance= 65536; nut->max_distance = 65536;
} }
GET_V(nut->time_base_count, tmp>0 && tmp<INT_MAX / sizeof(AVRational)) GET_V(nut->time_base_count, tmp > 0 && tmp < INT_MAX / sizeof(AVRational))
nut->time_base= av_malloc(nut->time_base_count * sizeof(AVRational)); nut->time_base = av_malloc(nut->time_base_count * sizeof(AVRational));
for(i=0; i<nut->time_base_count; i++){ for (i = 0; i < nut->time_base_count; i++) {
GET_V(nut->time_base[i].num, tmp>0 && tmp<(1ULL<<31)) GET_V(nut->time_base[i].num, tmp > 0 && tmp < (1ULL << 31))
GET_V(nut->time_base[i].den, tmp>0 && tmp<(1ULL<<31)) 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){ if (av_gcd(nut->time_base[i].num, nut->time_base[i].den) != 1) {
av_log(s, AV_LOG_ERROR, "time base invalid\n"); av_log(s, AV_LOG_ERROR, "time base invalid\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} }
tmp_pts=0; tmp_pts = 0;
tmp_mul=1; tmp_mul = 1;
tmp_stream=0; tmp_stream = 0;
tmp_head_idx= 0; tmp_head_idx = 0;
for(i=0; i<256;){ for (i = 0; i < 256;) {
int tmp_flags = ffio_read_varlen(bc); int tmp_flags = ffio_read_varlen(bc);
int tmp_fields= ffio_read_varlen(bc); int tmp_fields = ffio_read_varlen(bc);
if(tmp_fields>0) tmp_pts = get_s(bc);
if(tmp_fields>1) tmp_mul = ffio_read_varlen(bc); if (tmp_fields > 0)
if(tmp_fields>2) tmp_stream= ffio_read_varlen(bc); tmp_pts = get_s(bc);
if(tmp_fields>3) tmp_size = ffio_read_varlen(bc); if (tmp_fields > 1)
else tmp_size = 0; tmp_mul = ffio_read_varlen(bc);
if(tmp_fields>4) tmp_res = ffio_read_varlen(bc); if (tmp_fields > 2)
else tmp_res = 0; tmp_stream = ffio_read_varlen(bc);
if(tmp_fields>5) count = ffio_read_varlen(bc); if (tmp_fields > 3)
else count = tmp_mul - tmp_size; tmp_size = ffio_read_varlen(bc);
if(tmp_fields>6) get_s(bc); else
if(tmp_fields>7) tmp_head_idx= ffio_read_varlen(bc); tmp_size = 0;
if (tmp_fields > 4)
while(tmp_fields-- > 8) tmp_res = ffio_read_varlen(bc);
else
tmp_res = 0;
if (tmp_fields > 5)
count = ffio_read_varlen(bc);
else
count = tmp_mul - tmp_size;
if (tmp_fields > 6)
get_s(bc);
if (tmp_fields > 7)
tmp_head_idx = ffio_read_varlen(bc);
while (tmp_fields-- > 8)
ffio_read_varlen(bc); ffio_read_varlen(bc);
if(count == 0 || i+count > 256){ if (count == 0 || i + count > 256) {
av_log(s, AV_LOG_ERROR, "illegal count %d at %d\n", count, i); av_log(s, AV_LOG_ERROR, "illegal count %d at %d\n", count, i);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(tmp_stream >= stream_count){ if (tmp_stream >= stream_count) {
av_log(s, AV_LOG_ERROR, "illegal stream number\n"); av_log(s, AV_LOG_ERROR, "illegal stream number\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for(j=0; j<count; j++,i++){ for (j = 0; j < count; j++, i++) {
if (i == 'N') { if (i == 'N') {
nut->frame_code[i].flags= FLAG_INVALID; nut->frame_code[i].flags = FLAG_INVALID;
j--; j--;
continue; continue;
} }
nut->frame_code[i].flags = tmp_flags ; nut->frame_code[i].flags = tmp_flags;
nut->frame_code[i].pts_delta = tmp_pts ; nut->frame_code[i].pts_delta = tmp_pts;
nut->frame_code[i].stream_id = tmp_stream; nut->frame_code[i].stream_id = tmp_stream;
nut->frame_code[i].size_mul = tmp_mul ; nut->frame_code[i].size_mul = tmp_mul;
nut->frame_code[i].size_lsb = tmp_size+j; nut->frame_code[i].size_lsb = tmp_size + j;
nut->frame_code[i].reserved_count = tmp_res ; nut->frame_code[i].reserved_count = tmp_res;
nut->frame_code[i].header_idx = tmp_head_idx; nut->frame_code[i].header_idx = tmp_head_idx;
} }
} }
assert(nut->frame_code['N'].flags == FLAG_INVALID); assert(nut->frame_code['N'].flags == FLAG_INVALID);
if(end > avio_tell(bc) + 4){ if (end > avio_tell(bc) + 4) {
int rem= 1024; int rem = 1024;
GET_V(nut->header_count, tmp<128U) GET_V(nut->header_count, tmp < 128U)
nut->header_count++; nut->header_count++;
for(i=1; i<nut->header_count; i++){ for (i = 1; i < nut->header_count; i++) {
GET_V(nut->header_len[i], tmp>0 && tmp<256); GET_V(nut->header_len[i], tmp > 0 && tmp < 256);
rem -= nut->header_len[i]; rem -= nut->header_len[i];
if(rem < 0){ if (rem < 0) {
av_log(s, AV_LOG_ERROR, "invalid elision header\n"); av_log(s, AV_LOG_ERROR, "invalid elision header\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
nut->header[i]= av_malloc(nut->header_len[i]); nut->header[i] = av_malloc(nut->header_len[i]);
avio_read(bc, nut->header[i], nut->header_len[i]); avio_read(bc, nut->header[i], nut->header_len[i]);
} }
assert(nut->header_len[0]==0); assert(nut->header_len[0] == 0);
} }
if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
av_log(s, AV_LOG_ERROR, "main header checksum mismatch\n"); av_log(s, AV_LOG_ERROR, "main header checksum mismatch\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
nut->stream = av_mallocz(sizeof(StreamContext)*stream_count); nut->stream = av_mallocz(sizeof(StreamContext) * stream_count);
for(i=0; i<stream_count; i++){ for (i = 0; i < stream_count; i++)
avformat_new_stream(s, NULL); avformat_new_stream(s, NULL);
}
return 0; return 0;
} }
static int decode_stream_header(NUTContext *nut){ static int decode_stream_header(NUTContext *nut)
AVFormatContext *s= nut->avf; {
AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
StreamContext *stc; StreamContext *stc;
int class, stream_id; int class, stream_id;
uint64_t tmp, end; uint64_t tmp, end;
AVStream *st; AVStream *st;
end= get_packetheader(nut, bc, 1, STREAM_STARTCODE); end = get_packetheader(nut, bc, 1, STREAM_STARTCODE);
end += avio_tell(bc); end += avio_tell(bc);
GET_V(stream_id, tmp < s->nb_streams && !nut->stream[tmp].time_base); GET_V(stream_id, tmp < s->nb_streams && !nut->stream[tmp].time_base);
stc= &nut->stream[stream_id]; stc = &nut->stream[stream_id];
st = s->streams[stream_id]; st = s->streams[stream_id];
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
class = ffio_read_varlen(bc); class = ffio_read_varlen(bc);
tmp = get_fourcc(bc); tmp = get_fourcc(bc);
st->codec->codec_tag= tmp; st->codec->codec_tag = tmp;
switch(class) switch (class) {
{
case 0: case 0:
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = av_codec_get_id( st->codec->codec_id = av_codec_get_id((const AVCodecTag * const []) {
(const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, 0 }, ff_codec_bmp_tags,
ff_nut_video_tags,
0
},
tmp); tmp);
break; break;
case 1: case 1:
...@@ -337,53 +375,60 @@ static int decode_stream_header(NUTContext *nut){ ...@@ -337,53 +375,60 @@ static int decode_stream_header(NUTContext *nut){
av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class); av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class);
return -1; return -1;
} }
if(class<3 && st->codec->codec_id == CODEC_ID_NONE) if (class < 3 && st->codec->codec_id == CODEC_ID_NONE)
av_log(s, AV_LOG_ERROR, "Unknown codec tag '0x%04x' for stream number %d\n", av_log(s, AV_LOG_ERROR,
(unsigned int)tmp, stream_id); "Unknown codec tag '0x%04x' for stream number %d\n",
(unsigned int) tmp, stream_id);
GET_V(stc->time_base_id , tmp < nut->time_base_count);
GET_V(stc->msb_pts_shift , tmp < 16); GET_V(stc->time_base_id, tmp < nut->time_base_count);
stc->max_pts_distance= ffio_read_varlen(bc); GET_V(stc->msb_pts_shift, tmp < 16);
GET_V(stc->decode_delay , tmp < 1000); //sanity limit, raise this if Moore's law is true stc->max_pts_distance = ffio_read_varlen(bc);
st->codec->has_b_frames= stc->decode_delay; GET_V(stc->decode_delay, tmp < 1000); // sanity limit, raise this if Moore's law is true
ffio_read_varlen(bc); //stream flags st->codec->has_b_frames = stc->decode_delay;
ffio_read_varlen(bc); // stream flags
GET_V(st->codec->extradata_size, tmp < (1<<30));
if(st->codec->extradata_size){ GET_V(st->codec->extradata_size, tmp < (1 << 30));
st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); if (st->codec->extradata_size) {
st->codec->extradata = av_mallocz(st->codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
avio_read(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){ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
GET_V(st->codec->width , tmp > 0) GET_V(st->codec->width, tmp > 0)
GET_V(st->codec->height, tmp > 0) GET_V(st->codec->height, tmp > 0)
st->sample_aspect_ratio.num= ffio_read_varlen(bc); st->sample_aspect_ratio.num = ffio_read_varlen(bc);
st->sample_aspect_ratio.den= ffio_read_varlen(bc); st->sample_aspect_ratio.den = ffio_read_varlen(bc);
if((!st->sample_aspect_ratio.num) != (!st->sample_aspect_ratio.den)){ if ((!st->sample_aspect_ratio.num) != (!st->sample_aspect_ratio.den)) {
av_log(s, AV_LOG_ERROR, "invalid aspect ratio %d/%d\n", st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); av_log(s, AV_LOG_ERROR, "invalid aspect ratio %d/%d\n",
st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
return -1; return -1;
} }
ffio_read_varlen(bc); /* csp type */ ffio_read_varlen(bc); /* csp type */
}else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO){ } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
GET_V(st->codec->sample_rate , tmp > 0) GET_V(st->codec->sample_rate, tmp > 0)
ffio_read_varlen(bc); // samplerate_den ffio_read_varlen(bc); // samplerate_den
GET_V(st->codec->channels, tmp > 0) GET_V(st->codec->channels, tmp > 0)
} }
if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
av_log(s, AV_LOG_ERROR, "stream header %d checksum mismatch\n", stream_id); av_log(s, AV_LOG_ERROR,
"stream header %d checksum mismatch\n", stream_id);
return -1; return -1;
} }
stc->time_base= &nut->time_base[stc->time_base_id]; stc->time_base = &nut->time_base[stc->time_base_id];
avpriv_set_pts_info(s->streams[stream_id], 63, stc->time_base->num, stc->time_base->den); avpriv_set_pts_info(s->streams[stream_id], 63, stc->time_base->num,
stc->time_base->den);
return 0; return 0;
} }
static void set_disposition_bits(AVFormatContext* avf, char* value, int stream_id){ static void set_disposition_bits(AVFormatContext *avf, char *value,
int stream_id)
{
int flag = 0, i; int flag = 0, i;
for (i=0; ff_nut_dispositions[i].flag; ++i) {
for (i = 0; ff_nut_dispositions[i].flag; ++i)
if (!strcmp(ff_nut_dispositions[i].str, value)) if (!strcmp(ff_nut_dispositions[i].str, value))
flag = ff_nut_dispositions[i].flag; flag = ff_nut_dispositions[i].flag;
}
if (!flag) if (!flag)
av_log(avf, AV_LOG_INFO, "unknown disposition type '%s'\n", value); av_log(avf, AV_LOG_INFO, "unknown disposition type '%s'\n", value);
for (i = 0; i < avf->nb_streams; ++i) for (i = 0; i < avf->nb_streams; ++i)
...@@ -391,8 +436,9 @@ static void set_disposition_bits(AVFormatContext* avf, char* value, int stream_i ...@@ -391,8 +436,9 @@ static void set_disposition_bits(AVFormatContext* avf, char* value, int stream_i
avf->streams[i]->disposition |= flag; avf->streams[i]->disposition |= flag;
} }
static int decode_info_header(NUTContext *nut){ static int decode_info_header(NUTContext *nut)
AVFormatContext *s= nut->avf; {
AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
uint64_t tmp, chapter_start, chapter_len; uint64_t tmp, chapter_start, chapter_len;
unsigned int stream_id_plus1, count; unsigned int stream_id_plus1, count;
...@@ -400,52 +446,53 @@ static int decode_info_header(NUTContext *nut){ ...@@ -400,52 +446,53 @@ static int decode_info_header(NUTContext *nut){
int64_t value, end; int64_t value, end;
char name[256], str_value[1024], type_str[256]; char name[256], str_value[1024], type_str[256];
const char *type; const char *type;
AVChapter *chapter= NULL; AVChapter *chapter = NULL;
AVStream *st= NULL; AVStream *st = NULL;
AVDictionary **metadata = NULL; AVDictionary **metadata = NULL;
end= get_packetheader(nut, bc, 1, INFO_STARTCODE); end = get_packetheader(nut, bc, 1, INFO_STARTCODE);
end += avio_tell(bc); end += avio_tell(bc);
GET_V(stream_id_plus1, tmp <= s->nb_streams) GET_V(stream_id_plus1, tmp <= s->nb_streams)
chapter_id = get_s(bc); chapter_id = get_s(bc);
chapter_start= ffio_read_varlen(bc); chapter_start = ffio_read_varlen(bc);
chapter_len = ffio_read_varlen(bc); chapter_len = ffio_read_varlen(bc);
count = ffio_read_varlen(bc); count = ffio_read_varlen(bc);
if(chapter_id && !stream_id_plus1){ if (chapter_id && !stream_id_plus1) {
int64_t start= chapter_start / nut->time_base_count; int64_t start = chapter_start / nut->time_base_count;
chapter= avpriv_new_chapter(s, chapter_id, chapter = avpriv_new_chapter(s, chapter_id,
nut->time_base[chapter_start % nut->time_base_count], nut->time_base[chapter_start %
nut->time_base_count],
start, start + chapter_len, NULL); start, start + chapter_len, NULL);
metadata = &chapter->metadata; metadata = &chapter->metadata;
} else if(stream_id_plus1) { } else if (stream_id_plus1) {
st= s->streams[stream_id_plus1 - 1]; st = s->streams[stream_id_plus1 - 1];
metadata = &st->metadata; metadata = &st->metadata;
} else } else
metadata = &s->metadata; metadata = &s->metadata;
for(i=0; i<count; i++){ for (i = 0; i < count; i++) {
get_str(bc, name, sizeof(name)); get_str(bc, name, sizeof(name));
value= get_s(bc); value = get_s(bc);
if(value == -1){ if (value == -1) {
type= "UTF-8"; type = "UTF-8";
get_str(bc, str_value, sizeof(str_value)); get_str(bc, str_value, sizeof(str_value));
}else if(value == -2){ } else if (value == -2) {
get_str(bc, type_str, sizeof(type_str)); get_str(bc, type_str, sizeof(type_str));
type= type_str; type = type_str;
get_str(bc, str_value, sizeof(str_value)); get_str(bc, str_value, sizeof(str_value));
}else if(value == -3){ } else if (value == -3) {
type= "s"; type = "s";
value= get_s(bc); value = get_s(bc);
}else if(value == -4){ } else if (value == -4) {
type= "t"; type = "t";
value= ffio_read_varlen(bc); value = ffio_read_varlen(bc);
}else if(value < -4){ } else if (value < -4) {
type= "r"; type = "r";
get_s(bc); get_s(bc);
}else{ } else {
type= "v"; type = "v";
} }
if (stream_id_plus1 > s->nb_streams) { if (stream_id_plus1 > s->nb_streams) {
...@@ -453,143 +500,143 @@ static int decode_info_header(NUTContext *nut){ ...@@ -453,143 +500,143 @@ static int decode_info_header(NUTContext *nut){
continue; continue;
} }
if(!strcmp(type, "UTF-8")){ if (!strcmp(type, "UTF-8")) {
if(chapter_id==0 && !strcmp(name, "Disposition")) { if (chapter_id == 0 && !strcmp(name, "Disposition")) {
set_disposition_bits(s, str_value, stream_id_plus1 - 1); set_disposition_bits(s, str_value, stream_id_plus1 - 1);
continue; continue;
} }
if(metadata && av_strcasecmp(name,"Uses") if (metadata && av_strcasecmp(name, "Uses") &&
&& av_strcasecmp(name,"Depends") && av_strcasecmp(name,"Replaces")) av_strcasecmp(name, "Depends") && av_strcasecmp(name, "Replaces"))
av_dict_set(metadata, name, str_value, 0); av_dict_set(metadata, name, str_value, 0);
} }
} }
if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
av_log(s, AV_LOG_ERROR, "info header checksum mismatch\n"); av_log(s, AV_LOG_ERROR, "info header checksum mismatch\n");
return -1; return -1;
} }
return 0; return 0;
} }
static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr){ static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr)
AVFormatContext *s= nut->avf; {
AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
int64_t end, tmp; int64_t end, tmp;
nut->last_syncpoint_pos= avio_tell(bc)-8; nut->last_syncpoint_pos = avio_tell(bc) - 8;
end= get_packetheader(nut, bc, 1, SYNCPOINT_STARTCODE); end = get_packetheader(nut, bc, 1, SYNCPOINT_STARTCODE);
end += avio_tell(bc); end += avio_tell(bc);
tmp= ffio_read_varlen(bc); tmp = ffio_read_varlen(bc);
*back_ptr= nut->last_syncpoint_pos - 16*ffio_read_varlen(bc); *back_ptr = nut->last_syncpoint_pos - 16 * ffio_read_varlen(bc);
if(*back_ptr < 0) if (*back_ptr < 0)
return -1; return -1;
ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count], tmp / nut->time_base_count); ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count],
tmp / nut->time_base_count);
if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n"); av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n");
return -1; return -1;
} }
*ts= tmp / s->nb_streams * av_q2d(nut->time_base[tmp % s->nb_streams])*AV_TIME_BASE; *ts = tmp / s->nb_streams *
av_q2d(nut->time_base[tmp % s->nb_streams]) * AV_TIME_BASE;
ff_nut_add_sp(nut, nut->last_syncpoint_pos, *back_ptr, *ts); ff_nut_add_sp(nut, nut->last_syncpoint_pos, *back_ptr, *ts);
return 0; return 0;
} }
static int find_and_decode_index(NUTContext *nut){ static int find_and_decode_index(NUTContext *nut)
AVFormatContext *s= nut->avf; {
AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
uint64_t tmp, end; uint64_t tmp, end;
int i, j, syncpoint_count; int i, j, syncpoint_count;
int64_t filesize= avio_size(bc); int64_t filesize = avio_size(bc);
int64_t *syncpoints; int64_t *syncpoints;
int8_t *has_keyframe; int8_t *has_keyframe;
int ret= -1; int ret = -1;
avio_seek(bc, filesize-12, SEEK_SET); avio_seek(bc, filesize - 12, SEEK_SET);
avio_seek(bc, filesize-avio_rb64(bc), SEEK_SET); avio_seek(bc, filesize - avio_rb64(bc), SEEK_SET);
if(avio_rb64(bc) != INDEX_STARTCODE){ if (avio_rb64(bc) != INDEX_STARTCODE) {
av_log(s, AV_LOG_ERROR, "no index at the end\n"); av_log(s, AV_LOG_ERROR, "no index at the end\n");
return -1; return -1;
} }
end= get_packetheader(nut, bc, 1, INDEX_STARTCODE); end = get_packetheader(nut, bc, 1, INDEX_STARTCODE);
end += avio_tell(bc); end += avio_tell(bc);
ffio_read_varlen(bc); //max_pts ffio_read_varlen(bc); // max_pts
GET_V(syncpoint_count, tmp < INT_MAX/8 && tmp > 0) GET_V(syncpoint_count, tmp < INT_MAX / 8 && tmp > 0)
syncpoints= av_malloc(sizeof(int64_t)*syncpoint_count); syncpoints = av_malloc(sizeof(int64_t) * syncpoint_count);
has_keyframe= av_malloc(sizeof(int8_t)*(syncpoint_count+1)); has_keyframe = av_malloc(sizeof(int8_t) * (syncpoint_count + 1));
for(i=0; i<syncpoint_count; i++){ for (i = 0; i < syncpoint_count; i++) {
syncpoints[i] = ffio_read_varlen(bc); syncpoints[i] = ffio_read_varlen(bc);
if(syncpoints[i] <= 0) if (syncpoints[i] <= 0)
goto fail; goto fail;
if(i) if (i)
syncpoints[i] += syncpoints[i-1]; syncpoints[i] += syncpoints[i - 1];
} }
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++) {
int64_t last_pts= -1; int64_t last_pts = -1;
for(j=0; j<syncpoint_count;){ for (j = 0; j < syncpoint_count;) {
uint64_t x= ffio_read_varlen(bc); uint64_t x = ffio_read_varlen(bc);
int type= x&1; int type = x & 1;
int n= j; int n = j;
x>>=1; x >>= 1;
if(type){ if (type) {
int flag= x&1; int flag = x & 1;
x>>=1; x >>= 1;
if(n+x >= syncpoint_count + 1){ if (n + x >= syncpoint_count + 1) {
av_log(s, AV_LOG_ERROR, "index overflow A\n"); av_log(s, AV_LOG_ERROR, "index overflow A\n");
goto fail; goto fail;
} }
while(x--) while (x--)
has_keyframe[n++]= flag; has_keyframe[n++] = flag;
has_keyframe[n++]= !flag; has_keyframe[n++] = !flag;
}else{ } else {
while(x != 1){ while (x != 1) {
if(n>=syncpoint_count + 1){ if (n >= syncpoint_count + 1) {
av_log(s, AV_LOG_ERROR, "index overflow B\n"); av_log(s, AV_LOG_ERROR, "index overflow B\n");
goto fail; goto fail;
} }
has_keyframe[n++]= x&1; has_keyframe[n++] = x & 1;
x>>=1; x >>= 1;
} }
} }
if(has_keyframe[0]){ if (has_keyframe[0]) {
av_log(s, AV_LOG_ERROR, "keyframe before first syncpoint in index\n"); av_log(s, AV_LOG_ERROR, "keyframe before first syncpoint in index\n");
goto fail; goto fail;
} }
assert(n<=syncpoint_count+1); assert(n <= syncpoint_count + 1);
for(; j<n && j<syncpoint_count; j++){ for (; j < n && j < syncpoint_count; j++) {
if(has_keyframe[j]){ if (has_keyframe[j]) {
uint64_t B, A= ffio_read_varlen(bc); uint64_t B, A = ffio_read_varlen(bc);
if(!A){ if (!A) {
A= ffio_read_varlen(bc); A = ffio_read_varlen(bc);
B= ffio_read_varlen(bc); B = ffio_read_varlen(bc);
//eor_pts[j][i] = last_pts + A + B // eor_pts[j][i] = last_pts + A + B
}else } else
B= 0; B = 0;
av_add_index_entry( av_add_index_entry(s->streams[i], 16 * syncpoints[j - 1],
s->streams[i], last_pts + A, 0, 0, AVINDEX_KEYFRAME);
16*syncpoints[j-1],
last_pts + A,
0,
0,
AVINDEX_KEYFRAME);
last_pts += A + B; last_pts += A + B;
} }
} }
} }
} }
if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
av_log(s, AV_LOG_ERROR, "index checksum mismatch\n"); av_log(s, AV_LOG_ERROR, "index checksum mismatch\n");
goto fail; goto fail;
} }
ret= 0; ret = 0;
fail: fail:
av_free(syncpoints); av_free(syncpoints);
av_free(has_keyframe); av_free(has_keyframe);
...@@ -603,53 +650,53 @@ static int nut_read_header(AVFormatContext *s) ...@@ -603,53 +650,53 @@ static int nut_read_header(AVFormatContext *s)
int64_t pos; int64_t pos;
int initialized_stream_count; int initialized_stream_count;
nut->avf= s; nut->avf = s;
/* main header */ /* main header */
pos=0; pos = 0;
do{ do {
pos= find_startcode(bc, MAIN_STARTCODE, pos)+1; pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1;
if (pos<0+1){ if (pos < 0 + 1) {
av_log(s, AV_LOG_ERROR, "No main startcode found.\n"); av_log(s, AV_LOG_ERROR, "No main startcode found.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
}while(decode_main_header(nut) < 0); } while (decode_main_header(nut) < 0);
/* stream headers */ /* stream headers */
pos=0; pos = 0;
for(initialized_stream_count=0; initialized_stream_count < s->nb_streams;){ for (initialized_stream_count = 0; initialized_stream_count < s->nb_streams;) {
pos= find_startcode(bc, STREAM_STARTCODE, pos)+1; pos = find_startcode(bc, STREAM_STARTCODE, pos) + 1;
if (pos<0+1){ if (pos < 0 + 1) {
av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n"); av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(decode_stream_header(nut) >= 0) if (decode_stream_header(nut) >= 0)
initialized_stream_count++; initialized_stream_count++;
} }
/* info headers */ /* info headers */
pos=0; pos = 0;
for(;;){ for (;;) {
uint64_t startcode= find_any_startcode(bc, pos); uint64_t startcode = find_any_startcode(bc, pos);
pos= avio_tell(bc); pos = avio_tell(bc);
if(startcode==0){ if (startcode == 0) {
av_log(s, AV_LOG_ERROR, "EOF before video frames\n"); av_log(s, AV_LOG_ERROR, "EOF before video frames\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}else if(startcode == SYNCPOINT_STARTCODE){ } else if (startcode == SYNCPOINT_STARTCODE) {
nut->next_startcode= startcode; nut->next_startcode = startcode;
break; break;
}else if(startcode != INFO_STARTCODE){ } else if (startcode != INFO_STARTCODE) {
continue; continue;
} }
decode_info_header(nut); decode_info_header(nut);
} }
s->data_offset= pos-8; s->data_offset = pos - 8;
if(bc->seekable){ if (bc->seekable) {
int64_t orig_pos= avio_tell(bc); int64_t orig_pos = avio_tell(bc);
find_and_decode_index(nut); find_and_decode_index(nut);
avio_seek(bc, orig_pos, SEEK_SET); avio_seek(bc, orig_pos, SEEK_SET);
} }
...@@ -660,15 +707,19 @@ static int nut_read_header(AVFormatContext *s) ...@@ -660,15 +707,19 @@ static int nut_read_header(AVFormatContext *s)
return 0; return 0;
} }
static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, uint8_t *header_idx, int frame_code){ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id,
AVFormatContext *s= nut->avf; uint8_t *header_idx, int frame_code)
{
AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
StreamContext *stc; StreamContext *stc;
int size, flags, size_mul, pts_delta, i, reserved_count; int size, flags, size_mul, pts_delta, i, reserved_count;
uint64_t tmp; uint64_t tmp;
if(avio_tell(bc) > nut->last_syncpoint_pos + nut->max_distance){ if (avio_tell(bc) > nut->last_syncpoint_pos + nut->max_distance) {
av_log(s, AV_LOG_ERROR, "Last frame must have been damaged %"PRId64" > %"PRId64" + %d\n", avio_tell(bc), nut->last_syncpoint_pos, nut->max_distance); av_log(s, AV_LOG_ERROR,
"Last frame must have been damaged %"PRId64" > %"PRId64" + %d\n",
avio_tell(bc), nut->last_syncpoint_pos, nut->max_distance);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -680,86 +731,88 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, ui ...@@ -680,86 +731,88 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, ui
reserved_count = nut->frame_code[frame_code].reserved_count; reserved_count = nut->frame_code[frame_code].reserved_count;
*header_idx = nut->frame_code[frame_code].header_idx; *header_idx = nut->frame_code[frame_code].header_idx;
if(flags & FLAG_INVALID) if (flags & FLAG_INVALID)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if(flags & FLAG_CODED) if (flags & FLAG_CODED)
flags ^= ffio_read_varlen(bc); flags ^= ffio_read_varlen(bc);
if(flags & FLAG_STREAM_ID){ if (flags & FLAG_STREAM_ID) {
GET_V(*stream_id, tmp < s->nb_streams) GET_V(*stream_id, tmp < s->nb_streams)
} }
stc= &nut->stream[*stream_id]; stc = &nut->stream[*stream_id];
if(flags&FLAG_CODED_PTS){ if (flags & FLAG_CODED_PTS) {
int coded_pts= ffio_read_varlen(bc); int coded_pts = ffio_read_varlen(bc);
//FIXME check last_pts validity? // FIXME check last_pts validity?
if(coded_pts < (1<<stc->msb_pts_shift)){ if (coded_pts < (1 << stc->msb_pts_shift)) {
*pts=ff_lsb2full(stc, coded_pts); *pts = ff_lsb2full(stc, coded_pts);
}else } else
*pts=coded_pts - (1<<stc->msb_pts_shift); *pts = coded_pts - (1 << stc->msb_pts_shift);
}else } else
*pts= stc->last_pts + pts_delta; *pts = stc->last_pts + pts_delta;
if(flags&FLAG_SIZE_MSB){ if (flags & FLAG_SIZE_MSB)
size += size_mul*ffio_read_varlen(bc); size += size_mul * ffio_read_varlen(bc);
} if (flags & FLAG_MATCH_TIME)
if(flags&FLAG_MATCH_TIME)
get_s(bc); get_s(bc);
if(flags&FLAG_HEADER_IDX) if (flags & FLAG_HEADER_IDX)
*header_idx= ffio_read_varlen(bc); *header_idx = ffio_read_varlen(bc);
if(flags&FLAG_RESERVED) if (flags & FLAG_RESERVED)
reserved_count= ffio_read_varlen(bc); reserved_count = ffio_read_varlen(bc);
for(i=0; i<reserved_count; i++) for (i = 0; i < reserved_count; i++)
ffio_read_varlen(bc); ffio_read_varlen(bc);
if(*header_idx >= (unsigned)nut->header_count){ if (*header_idx >= (unsigned)nut->header_count) {
av_log(s, AV_LOG_ERROR, "header_idx invalid\n"); av_log(s, AV_LOG_ERROR, "header_idx invalid\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(size > 4096) if (size > 4096)
*header_idx=0; *header_idx = 0;
size -= nut->header_len[*header_idx]; size -= nut->header_len[*header_idx];
if(flags&FLAG_CHECKSUM){ if (flags & FLAG_CHECKSUM) {
avio_rb32(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){ } 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"); av_log(s, AV_LOG_ERROR, "frame size > 2max_distance and no checksum\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
stc->last_pts= *pts; stc->last_pts = *pts;
stc->last_flags= flags; stc->last_flags = flags;
return size; return size;
} }
static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code)
AVFormatContext *s= nut->avf; {
AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
int size, stream_id, discard; int size, stream_id, discard;
int64_t pts, last_IP_pts; int64_t pts, last_IP_pts;
StreamContext *stc; StreamContext *stc;
uint8_t header_idx; uint8_t header_idx;
size= decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code); size = decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code);
if(size < 0) if (size < 0)
return size; return size;
stc= &nut->stream[stream_id]; stc = &nut->stream[stream_id];
if (stc->last_flags & FLAG_KEY) if (stc->last_flags & FLAG_KEY)
stc->skip_until_key_frame=0; stc->skip_until_key_frame = 0;
discard= s->streams[ stream_id ]->discard; discard = s->streams[stream_id]->discard;
last_IP_pts= s->streams[ stream_id ]->last_IP_pts; last_IP_pts = s->streams[stream_id]->last_IP_pts;
if( (discard >= AVDISCARD_NONKEY && !(stc->last_flags & FLAG_KEY)) if ((discard >= AVDISCARD_NONKEY && !(stc->last_flags & FLAG_KEY)) ||
||(discard >= AVDISCARD_BIDIR && last_IP_pts != AV_NOPTS_VALUE && last_IP_pts > pts) (discard >= AVDISCARD_BIDIR && last_IP_pts != AV_NOPTS_VALUE &&
|| discard >= AVDISCARD_ALL last_IP_pts > pts) ||
|| stc->skip_until_key_frame){ discard >= AVDISCARD_ALL ||
stc->skip_until_key_frame) {
avio_skip(bc, size); avio_skip(bc, size);
return 1; return 1;
} }
av_new_packet(pkt, size + nut->header_len[header_idx]); av_new_packet(pkt, size + nut->header_len[header_idx]);
memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]); memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]);
pkt->pos= avio_tell(bc); //FIXME pkt->pos = avio_tell(bc); // FIXME
avio_read(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; pkt->stream_index = stream_id;
...@@ -774,135 +827,146 @@ static int nut_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -774,135 +827,146 @@ static int nut_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
NUTContext *nut = s->priv_data; NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
int i, frame_code=0, ret, skip; int i, frame_code = 0, ret, skip;
int64_t ts, back_ptr; int64_t ts, back_ptr;
for(;;){ for (;;) {
int64_t pos= avio_tell(bc); int64_t pos = avio_tell(bc);
uint64_t tmp= nut->next_startcode; uint64_t tmp = nut->next_startcode;
nut->next_startcode=0; nut->next_startcode = 0;
if(tmp){ if (tmp) {
pos-=8; pos -= 8;
}else{ } else {
frame_code = avio_r8(bc); frame_code = avio_r8(bc);
if(bc->eof_reached) if (bc->eof_reached)
return -1; return -1;
if(frame_code == 'N'){ if (frame_code == 'N') {
tmp= frame_code; tmp = frame_code;
for(i=1; i<8; i++) for (i = 1; i < 8; i++)
tmp = (tmp<<8) + avio_r8(bc); tmp = (tmp << 8) + avio_r8(bc);
} }
} }
switch(tmp){ switch (tmp) {
case MAIN_STARTCODE: case MAIN_STARTCODE:
case STREAM_STARTCODE: case STREAM_STARTCODE:
case INDEX_STARTCODE: case INDEX_STARTCODE:
skip= get_packetheader(nut, bc, 0, tmp); skip = get_packetheader(nut, bc, 0, tmp);
avio_skip(bc, skip); avio_skip(bc, skip);
break; break;
case INFO_STARTCODE: case INFO_STARTCODE:
if(decode_info_header(nut)<0) if (decode_info_header(nut) < 0)
goto resync; goto resync;
break; break;
case SYNCPOINT_STARTCODE: case SYNCPOINT_STARTCODE:
if(decode_syncpoint(nut, &ts, &back_ptr)<0) if (decode_syncpoint(nut, &ts, &back_ptr) < 0)
goto resync; goto resync;
frame_code = avio_r8(bc); frame_code = avio_r8(bc);
case 0: case 0:
ret= decode_frame(nut, pkt, frame_code); ret = decode_frame(nut, pkt, frame_code);
if(ret==0) if (ret == 0)
return 0; return 0;
else if(ret==1) //ok but discard packet else if (ret == 1) // OK but discard packet
break; break;
default: default:
resync: resync:
av_log(s, AV_LOG_DEBUG, "syncing from %"PRId64"\n", pos); av_log(s, AV_LOG_DEBUG, "syncing from %"PRId64"\n", pos);
tmp= find_any_startcode(bc, nut->last_syncpoint_pos+1); tmp = find_any_startcode(bc, nut->last_syncpoint_pos + 1);
if(tmp==0) if (tmp == 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_log(s, AV_LOG_DEBUG, "sync\n"); av_log(s, AV_LOG_DEBUG, "sync\n");
nut->next_startcode= tmp; nut->next_startcode = tmp;
} }
} }
} }
static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos_arg, int64_t pos_limit){ static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index,
int64_t *pos_arg, int64_t pos_limit)
{
NUTContext *nut = s->priv_data; NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
int64_t pos, pts, back_ptr; 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); av_log(s, AV_LOG_DEBUG, "read_timestamp(X,%d,%"PRId64",%"PRId64")\n",
stream_index, *pos_arg, pos_limit);
pos= *pos_arg; pos = *pos_arg;
do{ do {
pos= find_startcode(bc, SYNCPOINT_STARTCODE, pos)+1; pos = find_startcode(bc, SYNCPOINT_STARTCODE, pos) + 1;
if(pos < 1){ if (pos < 1) {
assert(nut->next_startcode == 0); assert(nut->next_startcode == 0);
av_log(s, AV_LOG_ERROR, "read_timestamp failed.\n"); av_log(s, AV_LOG_ERROR, "read_timestamp failed.\n");
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;
} }
}while(decode_syncpoint(nut, &pts, &back_ptr) < 0); } while (decode_syncpoint(nut, &pts, &back_ptr) < 0);
*pos_arg = pos-1; *pos_arg = pos - 1;
assert(nut->last_syncpoint_pos == *pos_arg); assert(nut->last_syncpoint_pos == *pos_arg);
av_log(s, AV_LOG_DEBUG, "return %"PRId64" %"PRId64"\n", pts,back_ptr ); av_log(s, AV_LOG_DEBUG, "return %"PRId64" %"PRId64"\n", pts, back_ptr);
if (stream_index == -1) return pts; if (stream_index == -1)
else if(stream_index == -2) return back_ptr; return pts;
else if (stream_index == -2)
return back_ptr;
assert(0); assert(0);
} }
static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags){ static int read_seek(AVFormatContext *s, int stream_index,
int64_t pts, int flags)
{
NUTContext *nut = s->priv_data; NUTContext *nut = s->priv_data;
AVStream *st= s->streams[stream_index]; AVStream *st = s->streams[stream_index];
Syncpoint dummy={.ts= pts*av_q2d(st->time_base)*AV_TIME_BASE}; Syncpoint dummy = { .ts = pts * av_q2d(st->time_base) * AV_TIME_BASE };
Syncpoint nopts_sp= {.ts= AV_NOPTS_VALUE, .back_ptr= AV_NOPTS_VALUE}; Syncpoint nopts_sp = { .ts = AV_NOPTS_VALUE, .back_ptr = AV_NOPTS_VALUE };
Syncpoint *sp, *next_node[2]= {&nopts_sp, &nopts_sp}; Syncpoint *sp, *next_node[2] = { &nopts_sp, &nopts_sp };
int64_t pos, pos2, ts; int64_t pos, pos2, ts;
int i; int i;
if(st->index_entries){ if (st->index_entries) {
int index= av_index_search_timestamp(st, pts, flags); int index = av_index_search_timestamp(st, pts, flags);
if(index<0) if (index < 0)
return -1; return -1;
pos2= st->index_entries[index].pos; pos2 = st->index_entries[index].pos;
ts = st->index_entries[index].timestamp; ts = st->index_entries[index].timestamp;
}else{ } else {
av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pts_cmp, av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pts_cmp,
(void **) next_node); (void **) next_node);
av_log(s, AV_LOG_DEBUG, "%"PRIu64"-%"PRIu64" %"PRId64"-%"PRId64"\n", next_node[0]->pos, next_node[1]->pos, av_log(s, AV_LOG_DEBUG, "%"PRIu64"-%"PRIu64" %"PRId64"-%"PRId64"\n",
next_node[0]->ts , next_node[1]->ts); next_node[0]->pos, next_node[1]->pos, next_node[0]->ts,
pos = ff_gen_search(s, -1, dummy.ts, next_node[0]->pos, next_node[1]->pos, next_node[1]->pos, next_node[1]->ts);
next_node[0]->ts , next_node[1]->ts, AVSEEK_FLAG_BACKWARD, &ts, nut_read_timestamp); pos = ff_gen_search(s, -1, dummy.ts, next_node[0]->pos,
next_node[1]->pos, next_node[1]->pos,
if(!(flags & AVSEEK_FLAG_BACKWARD)){ next_node[0]->ts, next_node[1]->ts,
dummy.pos= pos+16; AVSEEK_FLAG_BACKWARD, &ts, nut_read_timestamp);
next_node[1]= &nopts_sp;
if (!(flags & AVSEEK_FLAG_BACKWARD)) {
dummy.pos = pos + 16;
next_node[1] = &nopts_sp;
av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp, av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
(void **) next_node); (void **) next_node);
pos2 = ff_gen_search(s, -2, dummy.pos, next_node[0]->pos , next_node[1]->pos, next_node[1]->pos, pos2 = ff_gen_search(s, -2, dummy.pos, next_node[0]->pos,
next_node[0]->back_ptr, next_node[1]->back_ptr, flags, &ts, nut_read_timestamp); next_node[1]->pos, next_node[1]->pos,
if(pos2>=0) next_node[0]->back_ptr, next_node[1]->back_ptr,
pos= pos2; flags, &ts, nut_read_timestamp);
//FIXME dir but I think it does not matter if (pos2 >= 0)
} pos = pos2;
dummy.pos= pos; // FIXME dir but I think it does not matter
sp= av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp, }
dummy.pos = pos;
sp = av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
NULL); NULL);
assert(sp); assert(sp);
pos2= sp->back_ptr - 15; pos2 = sp->back_ptr - 15;
} }
av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos2); av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos2);
pos= find_startcode(s->pb, SYNCPOINT_STARTCODE, pos2); pos = find_startcode(s->pb, SYNCPOINT_STARTCODE, pos2);
avio_seek(s->pb, pos, SEEK_SET); avio_seek(s->pb, pos, SEEK_SET);
av_log(NULL, AV_LOG_DEBUG, "SP: %"PRId64"\n", pos); av_log(NULL, AV_LOG_DEBUG, "SP: %"PRId64"\n", pos);
if(pos2 > pos || pos2 + 15 < pos){ if (pos2 > pos || pos2 + 15 < pos)
av_log(NULL, AV_LOG_ERROR, "no syncpoint at backptr pos\n"); av_log(NULL, AV_LOG_ERROR, "no syncpoint at backptr pos\n");
} for (i = 0; i < s->nb_streams; i++)
for(i=0; i<s->nb_streams; i++) nut->stream[i].skip_until_key_frame = 1;
nut->stream[i].skip_until_key_frame=1;
return 0; return 0;
} }
...@@ -915,7 +979,7 @@ static int nut_read_close(AVFormatContext *s) ...@@ -915,7 +979,7 @@ static int nut_read_close(AVFormatContext *s)
av_freep(&nut->time_base); av_freep(&nut->time_base);
av_freep(&nut->stream); av_freep(&nut->stream);
ff_nut_free_sp(nut); ff_nut_free_sp(nut);
for(i = 1; i < nut->header_count; i++) for (i = 1; i < nut->header_count; i++)
av_freep(&nut->header[i]); av_freep(&nut->header[i]);
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment