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

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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 FROM_HERE, 169 FROM_HERE,
170 base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory, 170 base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory,
171 AsWeakPtr())); 171 AsWeakPtr()));
172 172
173 // Also we want to be notified of |main_loop_| destruction. 173 // Also we want to be notified of |main_loop_| destruction.
174 main_loop_->AddDestructionObserver(this); 174 main_loop_->AddDestructionObserver(this);
175 175
176 // Create default video renderer. 176 // Create default video renderer.
177 scoped_refptr<media::VideoRendererBase> video_renderer = 177 scoped_refptr<media::VideoRendererBase> video_renderer =
178 new media::VideoRendererBase( 178 new media::VideoRendererBase(
179 pipeline_message_loop,
179 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_), 180 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_),
180 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque), 181 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
181 true); 182 true);
182 filter_collection_->AddVideoRenderer(video_renderer); 183 filter_collection_->AddVideoRenderer(video_renderer);
183 proxy_->set_frame_provider(video_renderer); 184 proxy_->set_frame_provider(video_renderer);
184 185
185 // Create default audio renderer. 186 // Create default audio renderer.
186 filter_collection_->AddAudioRenderer( 187 filter_collection_->AddAudioRenderer(
187 new media::AudioRendererImpl(new media::NullAudioSink())); 188 new media::AudioRendererImpl(new media::NullAudioSink()));
188 189
(...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 return audio_source_provider_; 1201 return audio_source_provider_;
1201 } 1202 }
1202 1203
1203 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { 1204 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
1204 DCHECK_EQ(main_loop_, MessageLoop::current()); 1205 DCHECK_EQ(main_loop_, MessageLoop::current());
1205 incremented_externally_allocated_memory_ = true; 1206 incremented_externally_allocated_memory_ = true;
1206 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); 1207 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
1207 } 1208 }
1208 1209
1209 } // namespace webkit_media 1210 } // namespace webkit_media
OLDNEW
« media/filters/decrypting_video_decoder.cc ('K') | « media/tools/player_x11/player_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698