Merge M50: "Supress pipeline errors during destruction and suspend."

media/base/pipeline_impl.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/pipeline_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 567 matching lines @@
   SetState(kStopping);
   pending_callbacks_.reset();
   DoStop(
       base::Bind(&PipelineImpl::OnStopCompleted, weak_factory_.GetWeakPtr()));
 }
 
 void PipelineImpl::ErrorChangedTask(PipelineStatus error) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_NE(PIPELINE_OK, error) << "PIPELINE_OK isn't an error!";
 
-  media_log_->AddEvent(media_log_->CreatePipelineErrorEvent(error));
+  // Don't report pipeline error events to the media log here. The embedder will
+  // log this when |error_cb_| is called. If the pipeline is already stopped or
+  // stopping we also don't want to log any event. In case we are suspending or
+  // suspended, the error may be recoverable, so don't propagate it now, instead
+  // let the subsequent seek during resume propagate it if it's unrecoverable.
 
-  if (state_ == kStopping || state_ == kStopped)
+  if (state_ == kStopping || state_ == kStopped || state_ == kSuspending ||
+      state_ == kSuspended) {
     return;
+  }
 
   SetState(kStopping);
   pending_callbacks_.reset();
   status_ = error;
 
   DoStop(
       base::Bind(&PipelineImpl::OnStopCompleted, weak_factory_.GetWeakPtr()));
 }
 
 void PipelineImpl::PlaybackRateChangedTask(double playback_rate) {
@@ skipping 259 matching lines @@
   metadata_cb_.Run(metadata);
 }
 
 void PipelineImpl::BufferingStateChanged(BufferingState new_buffering_state) {
   DVLOG(1) << __FUNCTION__ << "(" << new_buffering_state << ") ";
   DCHECK(task_runner_->BelongsToCurrentThread());
   buffering_state_cb_.Run(new_buffering_state);
 }
 
 }  // namespace media