[FFmpeg-cvslog] ffmpeg: use av_stream_get_end_pts()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 20:16:22 2014 +0200| [1f359c85599b58ffed58e61e543f2acb0a3d6295] | committer: Michael Niedermayer

ffmpeg: use av_stream_get_end_pts()

Simplifies code and should correct timing values when -*sync drop is used

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f359c85599b58ffed58e61e543f2acb0a3d6295
---

 ffmpeg.c     |   10 +++-------
 ffmpeg.h     |    1 -
 ffmpeg_opt.c |    1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index eafcf0f..5299f0e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -658,12 +658,8 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
         pkt->dts = max;
       }
     }
-    ost->last_mux_dts_plus_duration =
     ost->last_mux_dts = pkt->dts;
 
-    if (ost->last_mux_dts_plus_duration != AV_NOPTS_VALUE)
-        ost->last_mux_dts_plus_duration += pkt->duration;
-
     ost->data_size += pkt->size;
     ost->packets_written++;
 
@@ -1107,7 +1103,7 @@ static void do_video_stats(OutputStream *ost, int frame_size)
 
         fprintf(vstats_file,"f_size= %6d ", frame_size);
         /* compute pts value */
-        ti1 = ost->last_mux_dts_plus_duration * av_q2d(ost->st->time_base);
+        ti1 = av_stream_get_end_pts(ost->st) * av_q2d(ost->st->time_base);
         if (ti1 < 0.01)
             ti1 = 0.01;
 
@@ -1419,8 +1415,8 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
             vid = 1;
         }
         /* compute min output value */
-        if (ost->last_mux_dts_plus_duration != AV_NOPTS_VALUE)
-            pts = FFMAX(pts, av_rescale_q(ost->last_mux_dts_plus_duration,
+        if (av_stream_get_end_pts(ost->st) != AV_NOPTS_VALUE)
+            pts = FFMAX(pts, av_rescale_q(av_stream_get_end_pts(ost->st),
                                           ost->st->time_base, AV_TIME_BASE_Q));
     }
 
diff --git a/ffmpeg.h b/ffmpeg.h
index 01b983d..41d6663 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -378,7 +378,6 @@ typedef struct OutputStream {
     int64_t first_pts;
     /* dts of the last packet sent to the muxer */
     int64_t last_mux_dts;
-    int64_t last_mux_dts_plus_duration;
     AVBitStreamFilterContext *bitstream_filters;
     AVCodec *enc;
     int64_t max_frames;
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index eefd8f0..eeacf58 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1152,7 +1152,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
         input_streams[source_index]->st->discard = AVDISCARD_NONE;
     }
     ost->last_mux_dts = AV_NOPTS_VALUE;
-    ost->last_mux_dts_plus_duration = AV_NOPTS_VALUE;
 
     return ost;
 }