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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 23072043: Change NeedKeyCB to use std::vector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix seek_tester, demuxer_bench, and player_x11 Created 7 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 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_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 media::MediaKeys::KeyError error_code, 217 media::MediaKeys::KeyError error_code,
218 int system_code); 218 int system_code);
219 void OnKeyMessage(const std::string& session_id, 219 void OnKeyMessage(const std::string& session_id,
220 const std::vector<uint8>& message, 220 const std::vector<uint8>& message,
221 const std::string& destination_url); 221 const std::string& destination_url);
222 222
223 void OnMediaSourceOpened(WebKit::WebMediaSourceNew* web_media_source); 223 void OnMediaSourceOpened(WebKit::WebMediaSourceNew* web_media_source);
224 224
225 void OnNeedKey(const std::string& type, 225 void OnNeedKey(const std::string& type,
226 const std::string& session_id, 226 const std::string& session_id,
227 scoped_ptr<uint8[]> init_data, 227 const std::vector<uint8>& init_data);
228 int init_data_size);
229 228
230 #if defined(GOOGLE_TV) 229 #if defined(GOOGLE_TV)
231 bool InjectMediaStream(MediaStreamClient* media_stream_client, 230 bool InjectMediaStream(MediaStreamClient* media_stream_client,
232 media::Demuxer* demuxer, 231 media::Demuxer* demuxer,
233 const base::Closure& destroy_demuxer_cb); 232 const base::Closure& destroy_demuxer_cb);
234 #endif 233 #endif
235 234
236 // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer. 235 // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
237 void OnReadFromDemuxer(media::DemuxerStream::Type type); 236 void OnReadFromDemuxer(media::DemuxerStream::Type type);
238 237
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 424
426 // The decryptor that manages decryption keys and decrypts encrypted frames. 425 // The decryptor that manages decryption keys and decrypts encrypted frames.
427 scoped_ptr<ProxyDecryptor> decryptor_; 426 scoped_ptr<ProxyDecryptor> decryptor_;
428 427
429 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 428 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
430 }; 429 };
431 430
432 } // namespace content 431 } // namespace content
433 432
434 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 433 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698