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

Side by Side Diff: webkit/glue/webmediaplayer_impl.cc

Issue 4291001: Convert implicit scoped_refptr constructor calls to explicit ones, part 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/build
Patch Set: comments Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « webkit/glue/plugins/plugin_lib.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "webkit/glue/webmediaplayer_impl.h" 5 #include "webkit/glue/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 if (use_simple_data_source) { 278 if (use_simple_data_source) {
279 filter_collection_.push_back(simple_data_source); 279 filter_collection_.push_back(simple_data_source);
280 filter_collection_.push_back(buffered_data_source); 280 filter_collection_.push_back(buffered_data_source);
281 } else { 281 } else {
282 filter_collection_.push_back(buffered_data_source); 282 filter_collection_.push_back(buffered_data_source);
283 filter_collection_.push_back(simple_data_source); 283 filter_collection_.push_back(simple_data_source);
284 } 284 }
285 285
286 // Add in the default filter factories. 286 // Add in the default filter factories.
287 filter_collection_.push_back(new media::FFmpegDemuxer()); 287 filter_collection_.push_back(make_scoped_refptr(
288 filter_collection_.push_back(new media::FFmpegAudioDecoder()); 288 new media::FFmpegDemuxer()));
289 filter_collection_.push_back(new media::FFmpegVideoDecoder(NULL)); 289 filter_collection_.push_back(make_scoped_refptr(
290 filter_collection_.push_back(new media::NullAudioRenderer()); 290 new media::FFmpegAudioDecoder()));
291 filter_collection_.push_back(make_scoped_refptr(
292 new media::FFmpegVideoDecoder(NULL)));
293 filter_collection_.push_back(make_scoped_refptr(
294 new media::NullAudioRenderer()));
291 } 295 }
292 296
293 WebMediaPlayerImpl::~WebMediaPlayerImpl() { 297 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
294 Destroy(); 298 Destroy();
295 299
296 // Finally tell the |main_loop_| we don't want to be notified of destruction 300 // Finally tell the |main_loop_| we don't want to be notified of destruction
297 // event. 301 // event.
298 if (main_loop_) { 302 if (main_loop_) {
299 main_loop_->RemoveDestructionObserver(this); 303 main_loop_->RemoveDestructionObserver(this);
300 } 304 }
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 pipeline_stopped_.Signal(); 795 pipeline_stopped_.Signal();
792 } 796 }
793 797
794 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 798 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
795 DCHECK(MessageLoop::current() == main_loop_); 799 DCHECK(MessageLoop::current() == main_loop_);
796 DCHECK(client_); 800 DCHECK(client_);
797 return client_; 801 return client_;
798 } 802 }
799 803
800 } // namespace webkit_glue 804 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/plugins/plugin_lib.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698