avformat/mpegtsenc: move some code around and simplify a bit
authorMarton Balint <cus@passwd.hu>
Wed, 14 Aug 2019 22:51:10 +0000 (00:51 +0200)
committerMarton Balint <cus@passwd.hu>
Fri, 23 Aug 2019 20:49:01 +0000 (22:49 +0200)
PCR does not need to be recalcualted for CBR when inserting a NULL or PCR only
packet.

Signed-off-by: Marton Balint <cus@passwd.hu>
libavformat/mpegtsenc.c

index 4ff8725..a72242f 100644 (file)
@@ -1221,6 +1221,15 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
                 }
                 ts->next_pcr = next_pcr;
             }
+            if (dts != AV_NOPTS_VALUE && (dts - pcr / 300) > delay) {
+                /* pcr insert gets priority over null packet insert */
+                if (write_pcr)
+                    mpegts_insert_pcr_only(s, st);
+                else
+                    mpegts_insert_null_packet(s);
+                /* recalculate write_pcr and possibly retransmit si_info */
+                continue;
+            }
         } else if (ts_st->pcr_period && dts != AV_NOPTS_VALUE) {
             pcr = (dts - delay) * 300;
             if (pcr - ts_st->last_pcr >= ts_st->pcr_period && is_start) {
@@ -1229,17 +1238,6 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
             }
         }
 
-        if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE &&
-            (dts - get_pcr(ts, s->pb) / 300) > delay) {
-            /* pcr insert gets priority over null packet insert */
-            if (write_pcr)
-                mpegts_insert_pcr_only(s, st);
-            else
-                mpegts_insert_null_packet(s);
-            /* recalculate write_pcr and possibly retransmit si_info */
-            continue;
-        }
-
         /* prepare packet header */
         q    = buf;
         *q++ = 0x47;