indent

[ffmpeg] / libavcodec / parser.c

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 4a908ac22c8bc1ade075242a0d64ec8a9d5961fc..94399bfbbe51151d0a8e1fbfdac42747f07acd45 100644 (file)
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -76,17 +76,21 @@ AVCodecParserContext *av_parser_init(int codec_id)
     return s;
 }
 
-void ff_fetch_timestamp(AVCodecParserContext *s){
+void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
     int i;
+
     s->dts= s->pts= AV_NOPTS_VALUE;
     s->offset= 0;
     for(i = 0; i < AV_PARSER_PTS_NB; i++) {
-        if (   s->next_frame_offset >= s->cur_frame_offset[i]
-            &&(s->     frame_offset <  s->cur_frame_offset[i] || !s->frame_offset)
-            && s->next_frame_offset <  s->cur_frame_end[i]){
+        if (   s->next_frame_offset + off >= s->cur_frame_offset[i]
+            &&(s->     frame_offset       <  s->cur_frame_offset[i] || !s->frame_offset)
+            //check is disabled  becausue mpeg-ts doesnt send complete PES packets
+            && /*s->next_frame_offset + off <*/  s->cur_frame_end[i]){
             s->dts= s->cur_frame_dts[i];
             s->pts= s->cur_frame_pts[i];
             s->offset = s->next_frame_offset - s->cur_frame_offset[i];
+            if(remove)
+                s->cur_frame_offset[i]= INT64_MAX;
         }
     }
 }
@@ -130,19 +134,21 @@ int av_parser_parse(AVCodecParserContext *s,
         buf = dummy_buf;
     } else {
         /* add a new packet descriptor */
-        i = (s->cur_frame_start_index + 1) & (AV_PARSER_PTS_NB - 1);
-        s->cur_frame_start_index = i;
-        s->cur_frame_offset[i] = s->cur_offset;
-        s->cur_frame_end[i] = s->cur_offset + buf_size;
-        s->cur_frame_pts[i] = pts;
-        s->cur_frame_dts[i] = dts;
+        if(pts != AV_NOPTS_VALUE || dts != AV_NOPTS_VALUE){
+            i = (s->cur_frame_start_index + 1) & (AV_PARSER_PTS_NB - 1);
+            s->cur_frame_start_index = i;
+            s->cur_frame_offset[i] = s->cur_offset;
+            s->cur_frame_end[i] = s->cur_offset + buf_size;
+            s->cur_frame_pts[i] = pts;
+            s->cur_frame_dts[i] = dts;
+        }
     }
 
     if (s->fetch_timestamp){
         s->fetch_timestamp=0;
         s->last_pts = s->pts;
         s->last_dts = s->dts;
-        ff_fetch_timestamp(s);
+        ff_fetch_timestamp(s, 0, 0);
     }
 
     /* WARNING: the returned index can be negative */