Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Unified Diff: media/filters/source_buffer_stream.cc

Issue 1261423002: Media: Nicer MSE append logging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_stream.cc
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index fa10c37ef0c583ae0cc48b0db9b83e3efdc0a4c0..f359deda40254de22c5173fa96ec83870651868f 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -219,6 +219,26 @@ void SourceBufferStream::OnNewMediaSegment(
}
}
+static std::string BufferQueueToLogString(
wolenetz 2015/07/30 18:55:15 nit: s/static/...move to anonymous namespace at th
servolk 2015/07/30 19:46:16 Done.
+ 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();
+}
+
bool SourceBufferStream::Append(const BufferQueue& buffers) {
TRACE_EVENT2("media", "SourceBufferStream::Append",
"stream type", GetStreamTypeName(),
@@ -229,12 +249,8 @@ bool SourceBufferStream::Append(const BufferQueue& buffers) {
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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698