From 15ad9550d81f35b99e92026d2a1d828974a12bdb Mon Sep 17 00:00:00 2001 From: jk Date: Tue, 7 Dec 2010 11:37:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D0=B2=D1=8B=D1=87=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BB=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=B9=20=D1=84=D1=80=D0=B0=D0=B3=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mp4frag/mp4frag.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mp4frag/mp4frag.cc b/mp4frag/mp4frag.cc index 41d87ff..44067e9 100644 --- a/mp4frag/mp4frag.cc +++ b/mp4frag/mp4frag.cc @@ -34,6 +34,7 @@ using namespace boost::system; void generate_fragments(std::vector& fragments, boost::shared_ptr& ctx, double timestep) { double limit_ts = timestep; double now; + double timebase = 0; unsigned nsample = 0; fragments.clear(); @@ -45,6 +46,10 @@ void generate_fragments(std::vector& fragments, boost::shared_ptrtimestamp(); if ( si->_video && si->_keyframe && now >= limit_ts ) { + if ( fragments.size() ) { + fragments.back()._duration = now - timebase; + timebase = now; + } fragments.push_back(Fragment()); samplelist = &(fragments.back()._samples); limit_ts = now + timestep; @@ -57,6 +62,9 @@ void generate_fragments(std::vector& fragments, boost::shared_ptr_sample_size + 11 + (si->_video ? 5 : 2) + 4; } + if ( fragments.size() ) { + fragments.back()._duration = ctx->duration() - timebase; + } }