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

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

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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_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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 173
174 void OnPipelineSeek(media::PipelineStatus status); 174 void OnPipelineSeek(media::PipelineStatus status);
175 void OnPipelineEnded(); 175 void OnPipelineEnded();
176 void OnPipelineError(media::PipelineStatus error); 176 void OnPipelineError(media::PipelineStatus error);
177 void OnPipelineBufferingState( 177 void OnPipelineBufferingState(
178 media::Pipeline::BufferingState buffering_state); 178 media::Pipeline::BufferingState buffering_state);
179 void OnDemuxerOpened(); 179 void OnDemuxerOpened();
180 void OnKeyAdded(const std::string& session_id); 180 void OnKeyAdded(const std::string& session_id);
181 void OnKeyError(const std::string& session_id, 181 void OnKeyError(const std::string& session_id,
182 media::MediaKeys::KeyError error_code, 182 media::MediaKeys::KeyError error_code,
183 int system_code); 183 uint32 system_code);
184 void OnKeyMessage(const std::string& session_id, 184 void OnKeyMessage(const std::string& session_id,
185 const std::vector<uint8>& message, 185 const std::vector<uint8>& message,
186 const std::string& default_url); 186 const std::string& default_url);
187 void OnNeedKey(const std::string& type, 187 void OnNeedKey(const std::string& type,
188 const std::vector<uint8>& init_data); 188 const std::vector<uint8>& init_data);
189 void OnAddTextTrack(const media::TextTrackConfig& config, 189 void OnAddTextTrack(const media::TextTrackConfig& config,
190 const media::AddTextTrackDoneCB& done_cb); 190 const media::AddTextTrackDoneCB& done_cb);
191 void SetOpaque(bool); 191 void SetOpaque(bool);
192 192
193 private: 193 private:
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 WebContentDecryptionModuleImpl* web_cdm_; 352 WebContentDecryptionModuleImpl* web_cdm_;
353 353
354 media::DecryptorReadyCB decryptor_ready_cb_; 354 media::DecryptorReadyCB decryptor_ready_cb_;
355 355
356 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 356 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
357 }; 357 };
358 358
359 } // namespace content 359 } // namespace content
360 360
361 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 361 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698