Ticket #113: mythtv_avf_seq.patch

libs/libavformat/utils.c

@@ -808 +808 @@
     return  ((lsb - delta)&mask) + delta;
 }
 
+static int64_t lsb3full(int64_t lsb, int64_t base_ts, int lsb_bits){
+    int64_t mask = (lsb_bits < 64) ? (1LL<<lsb_bits)-1 : -1LL;
+    return  ((lsb - base_ts)&mask);
+}
+
 static void compute_pkt_fields(AVFormatContext *s, AVStream *st, 
                                AVCodecParserContext *pc, AVPacket *pkt)
 {
@@ -821 +826 @@
             pkt->dts= lsb2full(pkt->dts, st->cur_dts, st->pts_wrap_bits);
     }
 */    
+    if(s->start_time != AV_NOPTS_VALUE){
+        int64_t st1 = av_rescale(s->start_time, 
+                st->time_base.den,
+                AV_TIME_BASE * (int64_t)st->time_base.num);
+        if(pkt->pts != AV_NOPTS_VALUE)
+            pkt->pts= lsb3full(pkt->pts, st1, st->pts_wrap_bits);
+        if(pkt->dts != AV_NOPTS_VALUE)
+            pkt->dts= lsb3full(pkt->dts, st1, st->pts_wrap_bits);
+    }
+
     if (pkt->duration == 0) {
         compute_frame_duration(&num, &den, st, pc, pkt);
         if (den && num) {
@@ -1530 +1545 @@
         st= s->streams[stream_index];
        /* timestamp for default must be expressed in AV_TIME_BASE units */
         timestamp = av_rescale(timestamp, st->time_base.den, AV_TIME_BASE * (int64_t)st->time_base.num);
+        // compensate for start time adjust
+        if(s->start_time != AV_NOPTS_VALUE){
+            int64_t st1 = av_rescale(s->start_time, 
+                    st->time_base.den,
+                    AV_TIME_BASE * (int64_t)st->time_base.num);
+            if(timestamp != AV_NOPTS_VALUE)
+                timestamp= lsb3full(timestamp, -st1, st->pts_wrap_bits);
+        }
     }
     st= s->streams[stream_index];
 
@@ -1686 +1718 @@
     /* flush packet queue */
     flush_packet_queue(ic);
 
+    memset(&pkt1,0,sizeof(pkt1));
+
     for(i=0;i<ic->nb_streams;i++) {
         st = ic->streams[i];
         if (st->parser) {