smoothstreamingenc: Don't assume streams start from timestamp 0

Message ID 1351067304-12767-1-git-send-email-martin@martin.st
State Committed
Commit c44cef978bd5c2692606a7a4ef4a7da393147ab0
Headers show

Commit Message

Martin Storsjö Oct. 24, 2012, 8:28 a.m.
Also use dts instead of pts for deciding where to split fragments.
---
 libavformat/smoothstreamingenc.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Luca Barbato Oct. 24, 2012, 10:01 a.m. | #1
On 10/24/12 10:28 AM, Martin Storsjö wrote:
> Also use dts instead of pts for deciding where to split fragments.
> ---
>   libavformat/smoothstreamingenc.c |    9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)

Fine for me.

lu

Patch

diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 69d555f..1ed675a 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -559,12 +559,15 @@  static int ism_write_packet(AVFormatContext *s, AVPacket *pkt)
     SmoothStreamingContext *c = s->priv_data;
     AVStream *st = s->streams[pkt->stream_index];
     OutputStream *os = &c->streams[pkt->stream_index];
-    int64_t end_pts = (c->nb_fragments + 1) * c->min_frag_duration;
+    int64_t end_dts = (c->nb_fragments + 1) * c->min_frag_duration;
     int ret;
 
+    if (st->first_dts == AV_NOPTS_VALUE)
+        st->first_dts = pkt->dts;
+
     if ((!c->has_video || st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
-        av_compare_ts(pkt->pts, st->time_base,
-                      end_pts, AV_TIME_BASE_Q) >= 0 &&
+        av_compare_ts(pkt->dts - st->first_dts, st->time_base,
+                      end_dts, AV_TIME_BASE_Q) >= 0 &&
         pkt->flags & AV_PKT_FLAG_KEY && os->packets_written) {
 
         if ((ret = ism_flush(s, 0)) < 0)