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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

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, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 6fae70c638a96797f6cfcea9cdde41146766cdce..35421ed914b90cbe81142998ab389ba8d77b08f4 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -1332,15 +1332,22 @@ void WebMediaPlayerAndroid::OnKeyAdded(const std::string& session_id) {
void WebMediaPlayerAndroid::OnKeyError(const std::string& session_id,
media::MediaKeys::KeyError error_code,
- int system_code) {
+ uint32 system_code) {
EmeUMAHistogramEnumeration(current_key_system_, "KeyError",
error_code, media::MediaKeys::kMaxKeyError);
+ unsigned short short_system_code = 0;
+ if (system_code > std::numeric_limits<unsigned short>::max()) {
+ LOG(WARNING) << "system_code exceeds unsigned short limit.";
ddorwin 2014/03/01 06:18:09 Should we make it 0xffff or something?
xhwang 2014/03/03 19:06:36 Done.
+ } else {
+ short_system_code = static_cast<unsigned short>(system_code);
+ }
+
client_->keyError(
WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
WebString::fromUTF8(session_id),
static_cast<blink::WebMediaPlayerClient::MediaKeyErrorCode>(error_code),
- system_code);
+ short_system_code);
}
void WebMediaPlayerAndroid::OnKeyMessage(const std::string& session_id,

Powered by Google App Engine
This is Rietveld 408576698