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 743 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_) {
+      duration_ = last_timestamp_buffered;
+      host_->SetDuration(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 159 matching lines @@
   }
 
   if (duration > duration_)
     duration_ = duration;
 
   // Wait until all streams have initialized.
   if ((!source_id_audio_.empty() && !audio_) ||
       (!source_id_video_.empty() && !video_))
     return;
 
-  host_->SetDuration(duration_);

[acolwell GONE FROM CHROMIUM, 2012/07/20 21:18:36]

This isn't needed anymore because of the code in OnNewMediaSegment()?

[vrk (LEFT CHROMIUM), 2012/07/26 22:27:26]

Yes. My thought was, I was moving this line to happen right before transitioning
to the INITIALIZED state, which is where it happened prior to my change that
added WAITING_FOR_START_TIME. However, there's no harm in keeping this here, and
that means I don't have to change unit tests :) so I reinstated these lines!

-
   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 97 matching lines @@
 
   if (audio_) {
     audio_->SetStartTime(start_time_);
     audio_->Seek(start_time_);
   }
   if (video_) {
     video_->SetStartTime(start_time_);
     video_->Seek(start_time_);
   }
 
+  duration_ = std::max(duration_, start_time_);

[acolwell GONE FROM CHROMIUM, 2012/07/20 21:18:36]

A couple questions here:
- Shouldn't the SetDuration() call be conditional on whether duration_ changed
or not? 
- Don't we want to use (start_time - start_time_) here for a duration? If the
first append starts at 10 seconds I don't think we want the duration to be 10
seconds.
- WDYT about creating a UpdateDuration() helper function so duration_ updates
and host_->SetDuration() calls are all in one place?

[vrk (LEFT CHROMIUM), 2012/07/26 22:27:26]

As I said in my other comment, my thinking was I was moving the SetDuration()
call from OnStreamParserInitDone() to here.

But adding a conditional makes sense for 2 reasons: a) unittests require fewer
changes, b) Append()s may occur before we call the init_cb_, and these Append()s
may increase the duration.
I think we run into weirdness when the duration is less than the current time
(i.e. a lot of the code assumes duration == end of file). See bug:
crbug.com/137275

It is unideal/unintuitive logic - clearly the duration is going to be >
start_time_, since start_time_ is where it starts! But I need to set a more
accurate duration before calling the |init_cb_|, and if start_time_ > duration_,
then I believe start_time_ is the most accurate duration we have.
SG! Done.

+  host_->SetDuration(duration_);
+
   // 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_GT(stream_info_map_.count(source_id_video_), 0u);
   stream_info_map_[source_id_video_].can_update_offset = true;
 }
 
 }  // namespace media