Update SourceBufferStream and its unit tests to always expect valid durations.

media/base/stream_parser_buffer.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/base/stream_parser_buffer.h"
 
 #include "base/logging.h"
 #include "media/base/buffers.h"
 
 namespace media {
@@ skipping 88 matching lines @@
 
 void StreamParserBuffer::SetConfigId(int config_id) {
   config_id_ = config_id;
   if (preroll_buffer_)
     preroll_buffer_->SetConfigId(config_id);
 }
 
 void StreamParserBuffer::ConvertToSpliceBuffer(
     const BufferQueue& pre_splice_buffers) {
   DCHECK(splice_buffers_.empty());
+  DCHECK(duration() > base::TimeDelta())
+      << "Only buffers with a valid duration can convert to a splice buffer."
+      << " pts " << timestamp().InSecondsF()
+      << " dts " << GetDecodeTimestamp().InSecondsF();

[wolenetz, 2014/07/09 22:42:16]

nit: add dur to logging

[acolwell GONE FROM CHROMIUM, 2014/07/15 18:49:26]

Done.

   DCHECK(!end_of_stream());
 
   // Make a copy of this first, before making any changes.
   scoped_refptr<StreamParserBuffer> overlapping_buffer = CopyBuffer(*this);
   overlapping_buffer->set_splice_timestamp(kNoTimestamp());
 
   const scoped_refptr<StreamParserBuffer>& first_splice_buffer =
       pre_splice_buffers.front();
 
   // Ensure the given buffers are actually before the splice point.
@@ skipping 13 matching lines @@
   SetDecodeTimestamp(first_splice_buffer->GetDecodeTimestamp());
   SetConfigId(first_splice_buffer->GetConfigId());
   set_timestamp(first_splice_buffer->timestamp());
   is_keyframe_ = first_splice_buffer->IsKeyframe();
   type_ = first_splice_buffer->type();
   track_id_ = first_splice_buffer->track_id();
   set_splice_timestamp(overlapping_buffer->timestamp());
 
   // The splice duration is the duration of all buffers before the splice plus
   // the highest ending timestamp after the splice point.
+  DCHECK(overlapping_buffer->duration() > base::TimeDelta());
+  DCHECK(pre_splice_buffers.back()->duration() > base::TimeDelta());
   set_duration(
       std::max(overlapping_buffer->timestamp() + overlapping_buffer->duration(),
                pre_splice_buffers.back()->timestamp() +
                    pre_splice_buffers.back()->duration()) -
       first_splice_buffer->timestamp());
 
   // Copy all pre splice buffers into our wrapper buffer.
   for (BufferQueue::const_iterator it = pre_splice_buffers.begin();
        it != pre_splice_buffers.end();
        ++it) {
@@ skipping 30 matching lines @@
       std::make_pair(kInfiniteDuration(), base::TimeDelta()));
 }
 
 void StreamParserBuffer::set_timestamp(base::TimeDelta timestamp) {
   DecoderBuffer::set_timestamp(timestamp);
   if (preroll_buffer_)
     preroll_buffer_->set_timestamp(timestamp);
 }
 
 }  // namespace media