Merge M50: "Fix media memory usage reporting after a pipeline 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 367 matching lines @@
         text_renderer_->StartPlaying();
 
       base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK);
 
       PlaybackRateChangedTask(GetPlaybackRate());
       VolumeChangedTask(GetVolume());
       return;
 
     case kSuspended:
       renderer_.reset();
+      statistics_.audio_memory_usage = 0;
+      statistics_.video_memory_usage = 0;
       base::ResetAndReturn(&suspend_cb_).Run(PIPELINE_OK);
       return;
 
     case kStopping:
     case kStopped:
     case kCreated:
     case kSeeking:
     case kSuspending:
     case kResuming:
       NOTREACHED() << "State has no transition: " << state_;
@@ skipping 461 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