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

Unified Diff: media/base/pipeline_impl.cc

Issue 1815883002: Merge M50: "Fix media memory usage reporting after a pipeline suspend." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 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 | media/base/pipeline_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl.cc
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index a9ee4f0d1379a9f992b495df12bb895bee1737e4..c0b29af1890d80d909c49cc9f1f044a6c41a1500 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -385,6 +385,8 @@ void PipelineImpl::StateTransitionTask(PipelineStatus status) {
case kSuspended:
renderer_.reset();
+ statistics_.audio_memory_usage = 0;
+ statistics_.video_memory_usage = 0;
base::ResetAndReturn(&suspend_cb_).Run(PIPELINE_OK);
return;
« no previous file with comments | « no previous file | media/base/pipeline_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698