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

Side by Side Diff: webkit/renderer/media/android/webmediaplayer_android.cc

Issue 16098014: Handle config changes for MSE on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments Created 7 years, 6 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 #include "webkit/renderer/media/android/webmediaplayer_android.h" 5 #include "webkit/renderer/media/android/webmediaplayer_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 void WebMediaPlayerAndroid::OnMediaPlayerPlay() { 520 void WebMediaPlayerAndroid::OnMediaPlayerPlay() {
521 UpdatePlayingState(true); 521 UpdatePlayingState(true);
522 client_->playbackStateChanged(); 522 client_->playbackStateChanged();
523 } 523 }
524 524
525 void WebMediaPlayerAndroid::OnMediaPlayerPause() { 525 void WebMediaPlayerAndroid::OnMediaPlayerPause() {
526 UpdatePlayingState(false); 526 UpdatePlayingState(false);
527 client_->playbackStateChanged(); 527 client_->playbackStateChanged();
528 } 528 }
529 529
530 void WebMediaPlayerAndroid::OnMediaSeekRequest(base::TimeDelta time_to_seek, 530 void WebMediaPlayerAndroid::OnMediaSeekRequest(base::TimeDelta time_to_seek) {
531 bool request_texture_peer) {
532 if (!media_source_delegate_) 531 if (!media_source_delegate_)
533 return; 532 return;
534 533
535 if (!seeking_) 534 if (!seeking_)
536 media_source_delegate_->CancelPendingSeek(); 535 media_source_delegate_->CancelPendingSeek();
537 media_source_delegate_->Seek(time_to_seek); 536 media_source_delegate_->Seek(time_to_seek);
538 OnTimeUpdate(time_to_seek); 537 OnTimeUpdate(time_to_seek);
539 if (request_texture_peer) 538 }
540 EstablishSurfaceTexturePeer(); 539
540 void WebMediaPlayerAndroid::OnMediaConfigRequest() {
541 if (!media_source_delegate_)
542 return;
543
544 media_source_delegate_->OnMediaConfigRequest();
541 } 545 }
542 546
543 void WebMediaPlayerAndroid::UpdateNetworkState( 547 void WebMediaPlayerAndroid::UpdateNetworkState(
544 WebMediaPlayer::NetworkState state) { 548 WebMediaPlayer::NetworkState state) {
545 if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing && 549 if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing &&
546 (state == WebMediaPlayer::NetworkStateNetworkError || 550 (state == WebMediaPlayer::NetworkStateNetworkError ||
547 state == WebMediaPlayer::NetworkStateDecodeError)) { 551 state == WebMediaPlayer::NetworkStateDecodeError)) {
548 // Any error that occurs before reaching ReadyStateHaveMetadata should 552 // Any error that occurs before reaching ReadyStateHaveMetadata should
549 // be considered a format error. 553 // be considered a format error.
550 network_state_ = WebMediaPlayer::NetworkStateFormatError; 554 network_state_ = WebMediaPlayer::NetworkStateFormatError;
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 void WebMediaPlayerAndroid::exitFullscreen() { 964 void WebMediaPlayerAndroid::exitFullscreen() {
961 if (proxy_) 965 if (proxy_)
962 proxy_->ExitFullscreen(player_id_); 966 proxy_->ExitFullscreen(player_id_);
963 } 967 }
964 968
965 bool WebMediaPlayerAndroid::canEnterFullscreen() const { 969 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
966 return manager_->CanEnterFullscreen(frame_); 970 return manager_->CanEnterFullscreen(frame_);
967 } 971 }
968 972
969 } // namespace webkit_media 973 } // namespace webkit_media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698