Media: Nicer MSE append logging

media/filters/source_buffer_stream.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/source_buffer_stream.h"
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 
@@ skipping 71 matching lines @@
 
   std::stringstream ss;
   for (const auto* range_ptr : ranges) {
     if (range_ptr != ranges.front())
       ss << " ";
     ss << RangeToString(*range_ptr);
   }
   return ss.str();
 }
 
+std::string BufferQueueToLogString(
+    const SourceBufferStream::BufferQueue& buffers) {
+  std::stringstream result;
+  if (buffers.front()->GetDecodeTimestamp().InMicroseconds() ==
+      buffers.front()->timestamp().InMicroseconds() &&
+      buffers.back()->GetDecodeTimestamp().InMicroseconds() ==
+      buffers.back()->timestamp().InMicroseconds()) {
+    result << "dts/pts=[" << buffers.front()->timestamp().InSecondsF() << ";"
+           << buffers.back()->timestamp().InSecondsF() << "(last frame dur="
+           << buffers.back()->duration().InSecondsF() << ")]";
+  } else {
+    result << "dts=[" << buffers.front()->GetDecodeTimestamp().InSecondsF()
+           << ";" << buffers.back()->GetDecodeTimestamp().InSecondsF()
+           << "] pts=[" << buffers.front()->timestamp().InSecondsF() << ";"
+           << buffers.back()->timestamp().InSecondsF() << "(last frame dur="
+           << buffers.back()->duration().InSecondsF() << ")]";
+  }
+  return result.str();
+}
+
 SourceBufferRange::GapPolicy TypeToGapPolicy(SourceBufferStream::Type type) {
   switch (type) {
     case SourceBufferStream::kAudio:
     case SourceBufferStream::kVideo:
       return SourceBufferRange::NO_GAPS_ALLOWED;
     case SourceBufferStream::kText:
       return SourceBufferRange::ALLOW_GAPS;
   }
 
   NOTREACHED();
@@ skipping 120 matching lines @@
 bool SourceBufferStream::Append(const BufferQueue& buffers) {
   TRACE_EVENT2("media", "SourceBufferStream::Append",
                "stream type", GetStreamTypeName(),
                "buffers to append", buffers.size());
 
   DCHECK(!buffers.empty());
   DCHECK(media_segment_start_time_ != kNoDecodeTimestamp());
   DCHECK(media_segment_start_time_ <= buffers.front()->GetDecodeTimestamp());
   DCHECK(!end_of_stream_);
 
-  DVLOG(1) << __FUNCTION__ << " " << GetStreamTypeName() << ": buffers dts=["
-           << buffers.front()->GetDecodeTimestamp().InSecondsF() << ";"
-           << buffers.back()->GetDecodeTimestamp().InSecondsF() << "] pts=["
-           << buffers.front()->timestamp().InSecondsF() << ";"
-           << buffers.back()->timestamp().InSecondsF() << "(last frame dur="
-           << buffers.back()->duration().InSecondsF() << ")]";
+  DVLOG(1) << __FUNCTION__ << " " << GetStreamTypeName()
+           << ": buffers " << BufferQueueToLogString(buffers);
 
   // New media segments must begin with a keyframe.
   // TODO(wolenetz): Relax this requirement. See http://crbug.com/229412.
   if (new_media_segment_ && !buffers.front()->is_key_frame()) {
     MEDIA_LOG(ERROR, media_log_) << "Media segment did not begin with key "
                                     "frame. Support for such segments will be "
                                     "available in a future version. Please see "
                                     "https://crbug.com/229412.";
     return false;
   }
@@ skipping 1403 matching lines @@
     return false;
 
   DCHECK_NE(have_splice_buffers, have_preroll_buffer);
   splice_buffers_index_ = 0;
   pending_buffer_.swap(*out_buffer);
   pending_buffers_complete_ = false;
   return true;
 }
 
 }  // namespace media