[FFmpeg-cvslog] r16604 - in trunk: libavformat/mpegtsenc.c tests/libav.regression.ref

[bcoudurier]

Author: bcoudurier
Date: Wed Jan 14 23:14:35 2009
New Revision: 16604

Log:
use delay to avoid negative dts

Modified:
   trunk/libavformat/mpegtsenc.c
   trunk/tests/libav.regression.ref

Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c	Wed Jan 14 22:57:10 2009	(r16603)
+++ trunk/libavformat/mpegtsenc.c	Wed Jan 14 23:14:35 2009	(r16604)
@@ -672,6 +672,7 @@ static int mpegts_write_packet(AVFormatC
     MpegTSWriteStream *ts_st = st->priv_data;
     int len, max_payload_size;
     const uint8_t *access_unit_index = NULL;
+    const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
 
     if (st->codec->codec_type == CODEC_TYPE_SUBTITLE) {
         /* for subtitle, a single PES packet must be generated */
@@ -717,8 +718,8 @@ static int mpegts_write_packet(AVFormatC
         if (access_unit_index && access_unit_index < buf &&
             ts_st->payload_pts == AV_NOPTS_VALUE &&
             ts_st->payload_dts == AV_NOPTS_VALUE) {
-            ts_st->payload_dts = pkt->dts;
-            ts_st->payload_pts = pkt->pts;
+            ts_st->payload_dts = pkt->dts + delay;
+            ts_st->payload_pts = pkt->pts + delay;
         }
         if (ts_st->payload_index >= max_payload_size) {
             mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index,

Modified: trunk/tests/libav.regression.ref
==============================================================================
--- trunk/tests/libav.regression.ref	Wed Jan 14 22:57:10 2009	(r16603)
+++ trunk/tests/libav.regression.ref	Wed Jan 14 23:14:35 2009	(r16604)
@@ -9,7 +9,7 @@ c351132527ccb1e8cab06cc0822fde23 *./test
 bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg
 378880 ./tests/data/b-libav.mpg
 ./tests/data/b-libav.mpg CRC=0x2b71a386
-d1ab4041e32fb802bb164844d91cc5fe *./tests/data/b-libav.ts
+9fd96456cbf2a550da816e563316d92f *./tests/data/b-libav.ts
 471692 ./tests/data/b-libav.ts
 ./tests/data/b-libav.ts CRC=0xcc4948e1
 1b28a16652bb8ac528b33f7478ca18b6 *./tests/data/b-libav.swf