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

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

Issue 10854151: Allow transitioning to HAVE_METADATA before pipeline initialization completes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments and fix tests. Created 8 years, 4 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 | 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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 const WebKit::WebString& session_id); 219 const WebKit::WebString& session_id);
220 220
221 // As we are closing the tab or even the browser, |main_loop_| is destroyed 221 // As we are closing the tab or even the browser, |main_loop_| is destroyed
222 // even before this object gets destructed, so we need to know when 222 // even before this object gets destructed, so we need to know when
223 // |main_loop_| is being destroyed and we can stop posting repaint task 223 // |main_loop_| is being destroyed and we can stop posting repaint task
224 // to it. 224 // to it.
225 virtual void WillDestroyCurrentMessageLoop() OVERRIDE; 225 virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
226 226
227 void Repaint(); 227 void Repaint();
228 228
229 void OnPipelineInitialize(media::PipelineStatus status);
230 void OnPipelineSeek(media::PipelineStatus status); 229 void OnPipelineSeek(media::PipelineStatus status);
231 void OnPipelineEnded(media::PipelineStatus status); 230 void OnPipelineEnded(media::PipelineStatus status);
232 void OnPipelineError(media::PipelineStatus error); 231 void OnPipelineError(media::PipelineStatus error);
232 void OnPipelineReadyState(media::Pipeline::ReadyState readyState);
scherkus (not reviewing) 2012/08/15 23:43:16 unix_hacker
acolwell GONE FROM CHROMIUM 2012/08/16 00:54:18 Done.
233 void OnDemuxerOpened(); 233 void OnDemuxerOpened();
234 void OnKeyAdded(const std::string& key_system, const std::string& session_id); 234 void OnKeyAdded(const std::string& key_system, const std::string& session_id);
235 void OnKeyError(const std::string& key_system, 235 void OnKeyError(const std::string& key_system,
236 const std::string& session_id, 236 const std::string& session_id,
237 media::Decryptor::KeyError error_code, 237 media::Decryptor::KeyError error_code,
238 int system_code); 238 int system_code);
239 void OnKeyMessage(const std::string& key_system, 239 void OnKeyMessage(const std::string& key_system,
240 const std::string& session_id, 240 const std::string& session_id,
241 scoped_array<uint8> message, 241 scoped_array<uint8> message,
242 int message_length, 242 int message_length,
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 WebKit::WebAudioSourceProvider* audio_source_provider_; 334 WebKit::WebAudioSourceProvider* audio_source_provider_;
335 335
336 scoped_refptr<media::AudioRendererSink> audio_renderer_sink_; 336 scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
337 337
338 bool is_local_source_; 338 bool is_local_source_;
339 bool supports_save_; 339 bool supports_save_;
340 340
341 // The decryptor that manages decryption keys and decrypts encrypted frames. 341 // The decryptor that manages decryption keys and decrypts encrypted frames.
342 ProxyDecryptor decryptor_; 342 ProxyDecryptor decryptor_;
343 343
344 bool starting_;
345
344 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 346 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
345 }; 347 };
346 348
347 } // namespace webkit_media 349 } // namespace webkit_media
348 350
349 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 351 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698