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

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

Issue 23072043: Change NeedKeyCB to use std::vector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
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 // 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 void OnDemuxerOpened(); 189 void OnDemuxerOpened();
190 void OnKeyAdded(const std::string& session_id); 190 void OnKeyAdded(const std::string& session_id);
191 void OnKeyError(const std::string& session_id, 191 void OnKeyError(const std::string& session_id,
192 media::MediaKeys::KeyError error_code, 192 media::MediaKeys::KeyError error_code,
193 int system_code); 193 int system_code);
194 void OnKeyMessage(const std::string& session_id, 194 void OnKeyMessage(const std::string& session_id,
195 const std::vector<uint8>& message, 195 const std::vector<uint8>& message,
196 const std::string& default_url); 196 const std::string& default_url);
197 void OnNeedKey(const std::string& type, 197 void OnNeedKey(const std::string& type,
198 const std::string& session_id, 198 const std::string& session_id,
199 scoped_ptr<uint8[]> init_data, 199 const std::vector<uint8>& init_data);
200 int init_data_size);
201 scoped_ptr<media::TextTrack> OnTextTrack(media::TextKind kind, 200 scoped_ptr<media::TextTrack> OnTextTrack(media::TextKind kind,
202 const std::string& label, 201 const std::string& label,
203 const std::string& language); 202 const std::string& language);
204 void SetOpaque(bool); 203 void SetOpaque(bool);
205 204
206 private: 205 private:
207 // Called after |defer_load_cb_| has decided to allow the load. If 206 // Called after |defer_load_cb_| has decided to allow the load. If
208 // |defer_load_cb_| is null this is called immediately. 207 // |defer_load_cb_| is null this is called immediately.
209 void DoLoad(LoadType load_type, 208 void DoLoad(LoadType load_type,
210 const WebKit::WebURL& url, 209 const WebKit::WebURL& url,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 366
368 // Text track objects get a unique index value when they're created. 367 // Text track objects get a unique index value when they're created.
369 int text_track_index_; 368 int text_track_index_;
370 369
371 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 370 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
372 }; 371 };
373 372
374 } // namespace content 373 } // namespace content
375 374
376 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 375 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698