avcodec_decode_audio2()

[ffmpeg] / libavformat / nutdec.c

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 96538e5496188e79e625f2ea856d59935427d156..7e0f8cd9347f65b37a6a5e70355d445601bf40d6 100644 (file)
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -637,7 +637,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;
@@ -682,14 +682,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;
 }
@@ -697,25 +696,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;
 
@@ -813,6 +819,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);
@@ -851,6 +858,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;
 }