Index: media/base/pipeline_impl.cc |
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc |
index 0a88b2db609ea156a863596f8eade9e00e68a9fa..9ea52593d4b0ad31cb49b572a8db25867e8a21af 100644 |
--- a/media/base/pipeline_impl.cc |
+++ b/media/base/pipeline_impl.cc |
@@ -342,6 +342,9 @@ void PipelineImpl::SetClockForTesting(Clock* clock) { |
} |
void PipelineImpl::SetCurrentReadPosition(int64 offset) { |
+ media_log_->AddEvent( |
+ media_log_->CreateIntegerEvent( |
+ MediaLogEvent::CURRENT_READ_POSITION_SET, "read_position", offset)); |
base::AutoLock auto_lock(lock_); |
// The current read position should never be ahead of the buffered byte |
@@ -473,6 +476,8 @@ void PipelineImpl::SetError(PipelineStatus error) { |
message_loop_->PostTask(FROM_HERE, |
NewRunnableMethod(this, &PipelineImpl::ErrorChangedTask, error)); |
+ |
+ media_log_->AddEvent(media_log_->CreatePipelineErrorEvent(error)); |
} |
base::TimeDelta PipelineImpl::GetTime() const { |
@@ -487,6 +492,9 @@ base::TimeDelta PipelineImpl::GetDuration() const { |
void PipelineImpl::SetTime(base::TimeDelta time) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent( |
+ media_log_->CreateTimeEvent(MediaLogEvent::TIME_SET, "time", time)); |
+ |
base::AutoLock auto_lock(lock_); |
// If we were waiting for a valid timestamp and such timestamp arrives, we |
@@ -504,24 +512,40 @@ void PipelineImpl::SetTime(base::TimeDelta time) { |
void PipelineImpl::SetDuration(base::TimeDelta duration) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent( |
+ media_log_->CreateTimeEvent( |
+ MediaLogEvent::DURATION_SET, "duration", duration)); |
+ |
base::AutoLock auto_lock(lock_); |
duration_ = duration; |
} |
void PipelineImpl::SetBufferedTime(base::TimeDelta buffered_time) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent( |
+ media_log_->CreateTimeEvent( |
+ MediaLogEvent::BUFFERED_TIME_SET, "buffered_time", buffered_time)); |
+ |
base::AutoLock auto_lock(lock_); |
buffered_time_ = buffered_time; |
} |
void PipelineImpl::SetTotalBytes(int64 total_bytes) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent( |
+ media_log_->CreateIntegerEvent( |
+ MediaLogEvent::TOTAL_BYTES_SET, "total_bytes", total_bytes)); |
+ |
base::AutoLock auto_lock(lock_); |
total_bytes_ = total_bytes; |
} |
void PipelineImpl::SetBufferedBytes(int64 buffered_bytes) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent( |
+ media_log_->CreateIntegerEvent( |
+ MediaLogEvent::BUFFERED_BYTES_SET, "buffered_bytes", buffered_bytes)); |
+ |
base::AutoLock auto_lock(lock_); |
// See comments in SetCurrentReadPosition() about capping. |
@@ -532,6 +556,8 @@ void PipelineImpl::SetBufferedBytes(int64 buffered_bytes) { |
void PipelineImpl::SetVideoSize(size_t width, size_t height) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent(media_log_->CreateVideoSizeSetEvent(width, height)); |
+ |
base::AutoLock auto_lock(lock_); |
video_width_ = width; |
video_height_ = height; |
@@ -539,6 +565,10 @@ void PipelineImpl::SetVideoSize(size_t width, size_t height) { |
void PipelineImpl::SetStreaming(bool streaming) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent( |
+ media_log_->CreateBooleanEvent( |
+ MediaLogEvent::STREAMING_SET, "streaming", streaming)); |
+ |
base::AutoLock auto_lock(lock_); |
streaming_ = streaming; |
} |
@@ -547,10 +577,15 @@ void PipelineImpl::NotifyEnded() { |
DCHECK(IsRunning()); |
message_loop_->PostTask(FROM_HERE, |
NewRunnableMethod(this, &PipelineImpl::NotifyEndedTask)); |
+ media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::ENDED)); |
} |
void PipelineImpl::SetLoaded(bool loaded) { |
DCHECK(IsRunning()); |
+ media_log_->AddEvent( |
+ media_log_->CreateBooleanEvent( |
+ MediaLogEvent::LOADED_SET, "loaded", loaded)); |
+ |
base::AutoLock auto_lock(lock_); |
loaded_ = loaded; |
} |
@@ -563,6 +598,10 @@ void PipelineImpl::SetNetworkActivity(bool network_activity) { |
} |
message_loop_->PostTask(FROM_HERE, |
NewRunnableMethod(this, &PipelineImpl::NotifyNetworkEventTask)); |
+ media_log_->AddEvent( |
+ media_log_->CreateBooleanEvent( |
+ MediaLogEvent::NETWORK_ACTIVITY_SET, |
+ "network_activity", network_activity)); |
} |
void PipelineImpl::DisableAudioRenderer() { |
@@ -571,6 +610,8 @@ void PipelineImpl::DisableAudioRenderer() { |
// Disable renderer on the message loop. |
message_loop_->PostTask(FROM_HERE, |
NewRunnableMethod(this, &PipelineImpl::DisableAudioRendererTask)); |
+ media_log_->AddEvent( |
+ media_log_->CreateEvent(MediaLogEvent::AUDIO_RENDERER_DISABLED)); |
} |
// Called from any thread. |