MSE: Log more details during completing ChunkDemuxerStream reads

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 940 matching lines @@
     // If we're about to delete the selected range, also reset the seek state.
     DCHECK((*itr)->GetStartTimestamp() >= duration_dts);
     if (*itr == selected_range_)
       ResetSeekState();
     DeleteAndRemoveRange(&itr);
   }
 }
 
 SourceBufferStream::Status SourceBufferStream::GetNextBuffer(
     scoped_refptr<StreamParserBuffer>* out_buffer) {
+  DVLOG(2) << __FUNCTION__ << " " << GetStreamTypeName();
   if (!pending_buffer_.get()) {
     const SourceBufferStream::Status status = GetNextBufferInternal(out_buffer);
-    if (status != SourceBufferStream::kSuccess || !SetPendingBuffer(out_buffer))
+    if (status != SourceBufferStream::kSuccess ||
+        !SetPendingBuffer(out_buffer)) {
+      DVLOG(2) << __FUNCTION__ << " " << GetStreamTypeName()
+               << ": no previously pending buffer, returning status " << status;

[wolenetz, 2014/12/05 22:13:43]

Updated the message for clarity. Still a little grey, but better.

       return status;
+    }
   }
 
-  if (!pending_buffer_->splice_buffers().empty())
-    return HandleNextBufferWithSplice(out_buffer);
+  if (!pending_buffer_->splice_buffers().empty()) {
+    const SourceBufferStream::Status status =
+        HandleNextBufferWithSplice(out_buffer);
+    DVLOG(2) << __FUNCTION__ << " " << GetStreamTypeName()
+             << ": handled next buffer with splice, returning status "
+             << status;
+    return status;
+  }
 
+  const SourceBufferStream::Status status =
+      HandleNextBufferWithPreroll(out_buffer);
   DCHECK(pending_buffer_->preroll_buffer().get());

[wolenetz, 2014/12/05 22:13:43]

Oops - this DCHECK must be done *before*
HandleNextBufferWithPreroll(out_buffer).

-  return HandleNextBufferWithPreroll(out_buffer);
+  DVLOG(2) << __FUNCTION__ << " " << GetStreamTypeName()
+           << ": handled next buffer with preroll, returning status "
+           << status;
+  return status;
 }
 
 SourceBufferStream::Status SourceBufferStream::HandleNextBufferWithSplice(
     scoped_refptr<StreamParserBuffer>* out_buffer) {
   const BufferQueue& splice_buffers = pending_buffer_->splice_buffers();
   const size_t last_splice_buffer_index = splice_buffers.size() - 1;
 
   // Are there any splice buffers left to hand out?  The last buffer should be
   // handed out separately since it represents the first post-splice buffer.
   if (splice_buffers_index_ < last_splice_buffer_index) {
@@ skipping 563 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