cosmetics: indentation

[ffmpeg] / libavformat / nutdec.c

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index b3e49435dea850aa307f7d53f2b400d0e4e6ad59..c0f331c27c58fbdf5269adb0d7b6af0a451d75fb 100644 (file)
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -27,25 +27,15 @@
 #undef NDEBUG
 #include <assert.h>
 
-static uint64_t get_v(ByteIOContext *bc/*, maxstuffing*/){
+static uint64_t get_v(ByteIOContext *bc){
     uint64_t val = 0;
+    int tmp;
 
-    for(;;)
-    {
-        int tmp = get_byte(bc);
-
-//         if(tmp=0x80){
-//             if(!maxstuffing-- || val)
-//                 return -1;
-//         }
-
-        if (tmp&0x80)
-            val= (val<<7) + tmp - 0x80;
-        else{
-            return (val<<7) + tmp;
-        }
-    }
-    return -1;
+    do{
+        tmp = get_byte(bc);
+        val= (val<<7) + (tmp&127);
+    }while(tmp&128);
+    return val;
 }
 
 static int get_str(ByteIOContext *bc, char *string, unsigned int maxlen){
@@ -114,6 +104,8 @@ static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_ch
 //    start= url_ftell(bc) - 8;
 
     size= get_v(bc);
+    if(size > 4096)
+        get_be32(bc); //FIXME check this
 
     init_checksum(bc, calculate_checksum ? av_crc04C11DB7_update : NULL, 0);
 
@@ -292,7 +284,7 @@ static int decode_stream_header(NUTContext *nut){
     AVFormatContext *s= nut->avf;
     ByteIOContext *bc = &s->pb;
     StreamContext *stc;
-    int class, nom, denom, stream_id;
+    int class, stream_id;
     uint64_t tmp, end;
     AVStream *st;
 
@@ -642,7 +634,7 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap)
     return 0;
 }
 
-static int decode_frame_header(NUTContext *nut, int *flags_ret, int64_t *pts, int *stream_id, int frame_code){
+static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, int frame_code){
     AVFormatContext *s= nut->avf;
     ByteIOContext *bc = &s->pb;
     StreamContext *stc;
@@ -687,14 +679,13 @@ static int decode_frame_header(NUTContext *nut, int *flags_ret, int64_t *pts, in
         get_v(bc);
     if(flags&FLAG_CHECKSUM){
         get_be32(bc); //FIXME check this
-    }else if(size > 2*nut->max_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");
         return -1;
     }
-    *flags_ret= flags;
 
     stc->last_pts= *pts;
-    stc->last_key_frame= flags&FLAG_KEY; //FIXME change to last flags
+    stc->last_flags= flags;
 
     return size;
 }
@@ -702,25 +693,32 @@ static int decode_frame_header(NUTContext *nut, int *flags_ret, int64_t *pts, in
 static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code){
     AVFormatContext *s= nut->avf;
     ByteIOContext *bc = &s->pb;
-    int size, stream_id, flags, discard;
+    int size, stream_id, discard;
     int64_t pts, last_IP_pts;
+    StreamContext *stc;
 
-    size= decode_frame_header(nut, &flags, &pts, &stream_id, frame_code);
+    size= decode_frame_header(nut, &pts, &stream_id, frame_code);
     if(size < 0)
         return -1;
 
+    stc= &nut->stream[stream_id];
+
+    if (stc->last_flags & FLAG_KEY)
+        stc->skip_until_key_frame=0;
+
     discard= s->streams[ stream_id ]->discard;
     last_IP_pts= s->streams[ stream_id ]->last_IP_pts;
-    if(  (discard >= AVDISCARD_NONKEY && !(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_ALL){
+       || discard >= AVDISCARD_ALL
+       || stc->skip_until_key_frame){
         url_fskip(bc, size);
         return 1;
     }
 
     av_get_packet(bc, pkt, size);
     pkt->stream_index = stream_id;
-    if (flags & FLAG_KEY)
+    if (stc->last_flags & FLAG_KEY)
         pkt->flags |= PKT_FLAG_KEY;
     pkt->pts = pts;
 
@@ -739,13 +737,12 @@ static int nut_read_packet(AVFormatContext *s, AVPacket *pkt)
         uint64_t tmp= nut->next_startcode;
         nut->next_startcode=0;
 
-        if (url_feof(bc))
-            return -1;
-
         if(tmp){
             pos-=8;
         }else{
             frame_code = get_byte(bc);
+            if(url_feof(bc))
+                return -1;
             if(frame_code == 'N'){
                 tmp= frame_code;
                 for(i=1; i<8; i++)
@@ -789,7 +786,6 @@ static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index, int64_t
     NUTContext *nut = s->priv_data;
     ByteIOContext *bc = &s->pb;
     int64_t pos, pts, back_ptr;
-    int frame_code, stream_id,size, flags;
 av_log(s, AV_LOG_DEBUG, "read_timestamp(X,%d,%"PRId64",%"PRId64")\n", stream_index, *pos_arg, pos_limit);
 
     pos= *pos_arg;
@@ -810,24 +806,6 @@ resync:
     else if(stream_index == -2) return back_ptr;
 
 assert(0);
-    do{
-        frame_code= get_byte(bc);
-        if(frame_code == 'N'){
-            pos= url_ftell(bc)-1;
-            goto resync;
-        }
-        //FIXME consider pos_limit and eof
-        size= decode_frame_header(nut, &flags, &pts, &stream_id, frame_code);
-
-        if(size < 0)
-            goto resync;
-
-        url_fseek(bc, size, SEEK_CUR);
-    }while(stream_id != stream_index || !(flags & FLAG_KEY));
-    assert(nut->next_startcode == 0);
-    av_log(s, AV_LOG_DEBUG, "read_timestamp success\n");
-
-    return pts;
 }
 
 static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags){
@@ -837,6 +815,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag
     syncpoint_t nopts_sp= {.ts= AV_NOPTS_VALUE, .back_ptr= AV_NOPTS_VALUE};
     syncpoint_t *sp, *next_node[2]= {&nopts_sp, &nopts_sp};
     int64_t pos, pos2, ts;
+    int i;
 
     if(st->index_entries){
         int index= av_index_search_timestamp(st, pts, flags);
@@ -875,6 +854,9 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag
     if(pos2 > pos || pos2 + 15 < pos){
         av_log(NULL, AV_LOG_ERROR, "no syncpoint at backptr pos\n");
     }
+    for(i=0; i<s->nb_streams; i++)
+        nut->stream[i].skip_until_key_frame=1;
+
     return 0;
 }
 
@@ -898,7 +880,6 @@ AVInputFormat nut_demuxer = {
     nut_read_packet,
     nut_read_close,
     read_seek,
-//    nut_read_timestamp,
     .extensions = "nut",
 };
 #endif