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

Side by Side Diff: content/renderer/media/android/media_source_delegate.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
« no previous file with comments | « no previous file | content/renderer/media/android/media_source_delegate.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 CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 // SendSeekRequestAck() as part of the reset callback chain. 135 // SendSeekRequestAck() as part of the reset callback chain.
136 void ResetVideoDecryptingDemuxerStream(); 136 void ResetVideoDecryptingDemuxerStream();
137 137
138 // Sends SeekRequestAck to the browser. 138 // Sends SeekRequestAck to the browser.
139 void SendSeekRequestAck(); 139 void SendSeekRequestAck();
140 140
141 void OnDemuxerStopDone(); 141 void OnDemuxerStopDone();
142 void OnDemuxerOpened(); 142 void OnDemuxerOpened();
143 void OnNeedKey(const std::string& type, 143 void OnNeedKey(const std::string& type,
144 const std::string& session_id, 144 const std::string& session_id,
145 scoped_ptr<uint8[]> init_data, 145 const std::vector<uint8>& init_data);
146 int init_data_size);
147 scoped_ptr<media::TextTrack> OnAddTextTrack(media::TextKind kind, 146 scoped_ptr<media::TextTrack> OnAddTextTrack(media::TextKind kind,
148 const std::string& label, 147 const std::string& label,
149 const std::string& language); 148 const std::string& language);
150 void NotifyDemuxerReady(); 149 void NotifyDemuxerReady();
151 bool CanNotifyDemuxerReady(); 150 bool CanNotifyDemuxerReady();
152 void SendDemuxerReady( 151 void SendDemuxerReady(
153 scoped_ptr<media::MediaPlayerHostMsg_DemuxerReady_Params> params); 152 scoped_ptr<media::MediaPlayerHostMsg_DemuxerReady_Params> params);
154 153
155 void StopDemuxer(); 154 void StopDemuxer();
156 void InitializeDemuxer(); 155 void InitializeDemuxer();
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 std::string key_system_; 243 std::string key_system_;
245 244
246 size_t access_unit_size_; 245 size_t access_unit_size_;
247 246
248 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate); 247 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
249 }; 248 };
250 249
251 } // namespace content 250 } // namespace content
252 251
253 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 252 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/media_source_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698