| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "webkit/media/android/media_source_delegate.h" | 5 #include "webkit/media/android/media_source_delegate.h" |
| 6 | 6 |
| 7 #include "base/message_loop_proxy.h" | 7 #include "base/message_loop_proxy.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "media/base/android/demuxer_stream_player_params.h" | 9 #include "media/base/android/demuxer_stream_player_params.h" |
| 10 #include "media/base/bind_to_loop.h" | 10 #include "media/base/bind_to_loop.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 int player_id, | 66 int player_id, |
| 67 media::MediaLog* media_log) | 67 media::MediaLog* media_log) |
| 68 : weak_this_(this), | 68 : weak_this_(this), |
| 69 client_(client), | 69 client_(client), |
| 70 proxy_(proxy), | 70 proxy_(proxy), |
| 71 player_id_(player_id), | 71 player_id_(player_id), |
| 72 media_log_(media_log), | 72 media_log_(media_log), |
| 73 audio_params_(new MediaPlayerHostMsg_ReadFromDemuxerAck_Params), | 73 audio_params_(new MediaPlayerHostMsg_ReadFromDemuxerAck_Params), |
| 74 video_params_(new MediaPlayerHostMsg_ReadFromDemuxerAck_Params), | 74 video_params_(new MediaPlayerHostMsg_ReadFromDemuxerAck_Params), |
| 75 seeking_(false) { | 75 seeking_(false) { |
| 76 if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) { | 76 if (WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) { |
| 77 decryptor_.reset(new ProxyDecryptor( | 77 decryptor_.reset(new ProxyDecryptor( |
| 78 client, | 78 client, |
| 79 frame, | 79 frame, |
| 80 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnKeyAdded), | 80 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnKeyAdded), |
| 81 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnKeyError), | 81 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnKeyError), |
| 82 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnKeyMessage), | 82 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnKeyMessage), |
| 83 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnNeedKey))); | 83 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnNeedKey))); |
| 84 decryptor_->SetDecryptorReadyCB( | 84 decryptor_->SetDecryptorReadyCB( |
| 85 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDecryptorReady)); | 85 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDecryptorReady)); |
| 86 } | 86 } |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 | 439 |
| 440 client_->keyNeeded(WebString::fromUTF8(key_system), | 440 client_->keyNeeded(WebString::fromUTF8(key_system), |
| 441 WebString::fromUTF8(session_id), | 441 WebString::fromUTF8(session_id), |
| 442 init_data.get(), | 442 init_data.get(), |
| 443 init_data_size); | 443 init_data_size); |
| 444 } | 444 } |
| 445 | 445 |
| 446 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {} | 446 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {} |
| 447 | 447 |
| 448 } // namespace webkit_media | 448 } // namespace webkit_media |
| OLD | NEW |