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

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

Issue 784493002: Encrypted Media: Rename NeedKey to EncryptedMediaInitData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 6 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
« no previous file with comments | « media/base/stream_parser.h ('k') | media/blink/webmediaplayer_impl.cc » ('j') | 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 MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 203
204 // Called by VideoRendererImpl on its internal thread with the new frame to be 204 // Called by VideoRendererImpl on its internal thread with the new frame to be
205 // painted. 205 // painted.
206 void FrameReady(const scoped_refptr<VideoFrame>& frame); 206 void FrameReady(const scoped_refptr<VideoFrame>& frame);
207 207
208 // Returns the current video frame from |compositor_|. Blocks until the 208 // Returns the current video frame from |compositor_|. Blocks until the
209 // compositor can return the frame. 209 // compositor can return the frame.
210 scoped_refptr<VideoFrame> GetCurrentFrameFromCompositor(); 210 scoped_refptr<VideoFrame> GetCurrentFrameFromCompositor();
211 211
212 // Called when the demuxer encounters encrypted streams. 212 // Called when the demuxer encounters encrypted streams.
213 void OnNeedKey(const std::string& init_data_type, 213 void OnEncryptedMediaInitData(const std::string& init_data_type,
214 const std::vector<uint8>& init_data); 214 const std::vector<uint8>& init_data);
215 215
216 void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb); 216 void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb);
217 217
218 // Called when a CDM has been attached to the |pipeline_|. 218 // Called when a CDM has been attached to the |pipeline_|.
219 void OnCdmAttached(blink::WebContentDecryptionModuleResult result, 219 void OnCdmAttached(blink::WebContentDecryptionModuleResult result,
220 bool success); 220 bool success);
221 221
222 blink::WebLocalFrame* frame_; 222 blink::WebLocalFrame* frame_;
223 223
224 // TODO(hclam): get rid of these members and read from the pipeline directly. 224 // TODO(hclam): get rid of these members and read from the pipeline directly.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 const AudioHardwareConfig& audio_hardware_config_; 318 const AudioHardwareConfig& audio_hardware_config_;
319 319
320 scoped_ptr<Renderer> renderer_; 320 scoped_ptr<Renderer> renderer_;
321 321
322 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 322 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
323 }; 323 };
324 324
325 } // namespace media 325 } // namespace media
326 326
327 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 327 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « media/base/stream_parser.h ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698