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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.h

Issue 537193002: Remove WebMediaPlayerImpl::ContentDecryptionModuleAttached(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « no previous file | 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 // Callbacks from |pipeline_| that are forwarded to |client_|. 206 // Callbacks from |pipeline_| that are forwarded to |client_|.
207 void OnDurationChanged(); 207 void OnDurationChanged();
208 void OnNaturalSizeChanged(gfx::Size size); 208 void OnNaturalSizeChanged(gfx::Size size);
209 void OnOpacityChanged(bool opaque); 209 void OnOpacityChanged(bool opaque);
210 210
211 // Called by VideoRendererImpl on its internal thread with the new frame to be 211 // Called by VideoRendererImpl on its internal thread with the new frame to be
212 // painted. 212 // painted.
213 void FrameReady(const scoped_refptr<media::VideoFrame>& frame); 213 void FrameReady(const scoped_refptr<media::VideoFrame>& frame);
214 214
215 // Called when the ContentDecryptionModule has been attached to the
216 // pipeline/decoders.
217 void ContentDecryptionModuleAttached(
218 blink::WebContentDecryptionModuleResult result,
219 bool success);
220
221 // Returns the current video frame from |compositor_|. Blocks until the 215 // Returns the current video frame from |compositor_|. Blocks until the
222 // compositor can return the frame. 216 // compositor can return the frame.
223 scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor(); 217 scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor();
224 218
225 blink::WebLocalFrame* frame_; 219 blink::WebLocalFrame* frame_;
226 220
227 // TODO(hclam): get rid of these members and read from the pipeline directly. 221 // TODO(hclam): get rid of these members and read from the pipeline directly.
228 blink::WebMediaPlayer::NetworkState network_state_; 222 blink::WebMediaPlayer::NetworkState network_state_;
229 blink::WebMediaPlayer::ReadyState ready_state_; 223 blink::WebMediaPlayer::ReadyState ready_state_;
230 224
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_; 309 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_;
316 310
317 const media::AudioHardwareConfig& audio_hardware_config_; 311 const media::AudioHardwareConfig& audio_hardware_config_;
318 312
319 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 313 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
320 }; 314 };
321 315
322 } // namespace content 316 } // namespace content
323 317
324 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 318 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698