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

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

Issue 11428095: Pass in media message loop to VideoRendererBase and enforce calling on the right thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/media/webmediaplayer_impl.h" 5 #include "webkit/media/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 AsWeakPtr())); 177 AsWeakPtr()));
178 178
179 // Also we want to be notified of |main_loop_| destruction. 179 // Also we want to be notified of |main_loop_| destruction.
180 main_loop_->AddDestructionObserver(this); 180 main_loop_->AddDestructionObserver(this);
181 181
182 // Create default video renderer. 182 // Create default video renderer.
183 scoped_refptr<media::VideoRendererBase> video_renderer = 183 scoped_refptr<media::VideoRendererBase> video_renderer =
184 new media::VideoRendererBase( 184 new media::VideoRendererBase(
185 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_), 185 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_),
186 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque), 186 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
187 true); 187 true,
188 pipeline_message_loop);
188 filter_collection_->AddVideoRenderer(video_renderer); 189 filter_collection_->AddVideoRenderer(video_renderer);
189 proxy_->set_frame_provider(video_renderer); 190 proxy_->set_frame_provider(video_renderer);
190 191
191 // Create default audio renderer. 192 // Create default audio renderer.
192 filter_collection_->AddAudioRenderer( 193 filter_collection_->AddAudioRenderer(
193 new media::AudioRendererImpl(new media::NullAudioSink())); 194 new media::AudioRendererImpl(new media::NullAudioSink()));
194 } 195 }
195 196
196 WebMediaPlayerImpl::~WebMediaPlayerImpl() { 197 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
197 DCHECK_EQ(main_loop_, MessageLoop::current()); 198 DCHECK_EQ(main_loop_, MessageLoop::current());
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 return audio_source_provider_; 1198 return audio_source_provider_;
1198 } 1199 }
1199 1200
1200 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { 1201 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
1201 DCHECK_EQ(main_loop_, MessageLoop::current()); 1202 DCHECK_EQ(main_loop_, MessageLoop::current());
1202 incremented_externally_allocated_memory_ = true; 1203 incremented_externally_allocated_memory_ = true;
1203 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); 1204 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
1204 } 1205 }
1205 1206
1206 } // namespace webkit_media 1207 } // namespace webkit_media
OLDNEW
« media/filters/video_renderer_base.cc ('K') | « media/filters/video_renderer_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698