Update media duration if data is appended after the previous duration

media/filters/chunk_demuxer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/chunk_demuxer.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 505 matching lines @@
 }
 
 ChunkDemuxer::ChunkDemuxer(ChunkDemuxerClient* client)
     : state_(WAITING_FOR_INIT),
       host_(NULL),
       client_(client),
       start_time_(kNoTimestamp()) {
   DCHECK(client);
 }
 
-void ChunkDemuxer::Initialize(DemuxerHost* host,
-                              const PipelineStatusCB& cb) {
+void ChunkDemuxer::Initialize(DemuxerHost* host, const PipelineStatusCB& cb) {
   DVLOG(1) << "Init()";
   {
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, WAITING_FOR_INIT);
     host_ = host;
 
     ChangeState_Locked(INITIALIZING);
     init_cb_ = cb;
   }
 
@@ skipping 252 matching lines @@
 
     if (audio_ && !video_) {
       ranges = audio_->GetBufferedRanges();
     } else if (!audio_ && video_) {
       ranges = video_->GetBufferedRanges();
     } else {
       ranges = ComputeIntersection();
     }
   }
 
+  if (ranges.size() > 0) {
+    base::TimeDelta last_timestamp_buffered = ranges.end(ranges.size() - 1);
+    if (last_timestamp_buffered > duration_)
+      UpdateDuration(last_timestamp_buffered);
+  }
+
   for (size_t i = 0; i < ranges.size(); ++i)
     host_->AddBufferedTimeRange(ranges.start(i), ranges.end(i));
 
   if (!cb.is_null())
     cb.Run(PIPELINE_OK);
 
   return true;
 }
 
 void ChunkDemuxer::Abort(const std::string& id) {
@@ skipping 151 matching lines @@
   DVLOG(1) << "OnStreamParserInitDone(" << success << ", "
            << duration.InSecondsF() << ")";
   lock_.AssertAcquired();
   DCHECK_EQ(state_, INITIALIZING);
   if (!success || (!audio_ && !video_)) {
     ReportError_Locked(DEMUXER_ERROR_COULD_NOT_OPEN);
     return;
   }
 
   if (duration > duration_)
-    duration_ = duration;
+    UpdateDuration(duration);
 
   // Wait until all streams have initialized.
   if ((!source_id_audio_.empty() && !audio_) ||
       (!source_id_video_.empty() && !video_))
     return;
 
-  host_->SetDuration(duration_);
-
   ChangeState_Locked(WAITING_FOR_START_TIME);
 }
 
 bool ChunkDemuxer::OnNewConfigs(bool has_audio, bool has_video,
                                 const AudioDecoderConfig& audio_config,
                                 const VideoDecoderConfig& video_config) {
   DVLOG(1) << "OnNewConfigs(" << has_audio << ", " << has_video
            << ", " << audio_config.IsValidConfig()
            << ", " << video_config.IsValidConfig() << ")";
   CHECK(audio_config.IsValidConfig() || video_config.IsValidConfig());
@@ skipping 96 matching lines @@
 
   if (audio_) {
     audio_->SetStartTime(start_time_);
     audio_->Seek(start_time_);
   }
   if (video_) {
     video_->SetStartTime(start_time_);
     video_->Seek(start_time_);
   }
 
+  if (start_time_ > duration_)
+    UpdateDuration(start_time_);
+
   // The demuxer is now initialized after the |start_timestamp_| was set.
   ChangeState_Locked(INITIALIZED);
   base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
 }
 
 void ChunkDemuxer::OnEndOfMediaSegment(const std::string& source_id) {
   DVLOG(2) << "OnEndOfMediaSegment(" << source_id << ")";
   CHECK(IsValidId(source_id));
   source_info_map_[source_id].can_update_offset = true;
 }
@@ skipping 10 matching lines @@
         (*itr)->GetDecodeTimestamp() + timestamp_offset);
     (*itr)->SetTimestamp((*itr)->GetTimestamp() + timestamp_offset);
   }
 }
 
 bool ChunkDemuxer::IsValidId(const std::string& source_id) const {
   return source_info_map_.count(source_id) > 0u &&
       stream_parser_map_.count(source_id) > 0u;
 }
 
+void ChunkDemuxer::UpdateDuration(base::TimeDelta new_duration) {
+  duration_ = new_duration;
+  host_->SetDuration(new_duration);
+}
+
 }  // namespace media