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

Side by Side Diff: media/filters/renderer_impl.cc

Issue 511323003: media: Remove FilterCollection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « media/filters/renderer_impl.h ('k') | media/media.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/renderer_impl.h" 5 #include "media/filters/renderer_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "media/base/audio_renderer.h" 13 #include "media/base/audio_renderer.h"
14 #include "media/base/demuxer.h" 14 #include "media/base/demuxer.h"
15 #include "media/base/filter_collection.h"
16 #include "media/base/time_delta_interpolator.h" 15 #include "media/base/time_delta_interpolator.h"
17 #include "media/base/time_source.h" 16 #include "media/base/time_source.h"
18 #include "media/base/video_renderer.h" 17 #include "media/base/video_renderer.h"
19 18
20 namespace media { 19 namespace media {
21 20
22 RendererImpl::RendererImpl( 21 RendererImpl::RendererImpl(
23 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 22 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
24 Demuxer* demuxer, 23 Demuxer* demuxer,
25 scoped_ptr<AudioRenderer> audio_renderer, 24 scoped_ptr<AudioRenderer> audio_renderer,
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 DCHECK(task_runner_->BelongsToCurrentThread()); 564 DCHECK(task_runner_->BelongsToCurrentThread());
566 565
567 if (!init_cb_.is_null()) 566 if (!init_cb_.is_null())
568 base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_ABORT); 567 base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_ABORT);
569 568
570 if (!flush_cb_.is_null()) 569 if (!flush_cb_.is_null())
571 base::ResetAndReturn(&flush_cb_).Run(); 570 base::ResetAndReturn(&flush_cb_).Run();
572 } 571 }
573 572
574 } // namespace media 573 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/renderer_impl.h ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698