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

Unified Diff: trunk/src/media/base/pipeline.cc

Issue 14320005: Revert 194993 "Remove reference counting from media::VideoDecode..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 | « trunk/src/media/base/mock_filters.h ('k') | trunk/src/media/base/pipeline_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/base/pipeline.cc
===================================================================
--- trunk/src/media/base/pipeline.cc (revision 195011)
+++ trunk/src/media/base/pipeline.cc (working copy)
@@ -944,6 +944,7 @@
video_renderer_ = filter_collection_->GetVideoRenderer();
video_renderer_->Initialize(
stream,
+ *filter_collection_->GetVideoDecoders(),
done_cb,
base::Bind(&Pipeline::OnUpdateStatistics, this),
base::Bind(&Pipeline::OnVideoTimeUpdate, this),
@@ -952,6 +953,7 @@
base::Bind(&Pipeline::SetError, this),
base::Bind(&Pipeline::GetMediaTime, this),
base::Bind(&Pipeline::GetMediaDuration, this));
+ filter_collection_->GetVideoDecoders()->clear();
}
void Pipeline::OnAudioUnderflow() {
« no previous file with comments | « trunk/src/media/base/mock_filters.h ('k') | trunk/src/media/base/pipeline_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698