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

Side by Side Diff: media/blink/webmediaplayer_cast_android.cc

Issue 2440563004: Switch to using an explicit ended signal instead of time comparison. (Closed)
Patch Set: Fix ended event in ARI. Created 4 years, 2 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/blink/webmediaplayer_cast_android.h" 5 #include "media/blink/webmediaplayer_cast_android.h"
6 6
7 #include "gpu/GLES2/gl2extchromium.h" 7 #include "gpu/GLES2/gl2extchromium.h"
8 #include "gpu/command_buffer/client/gles2_interface.h" 8 #include "gpu/command_buffer/client/gles2_interface.h"
9 #include "gpu/command_buffer/common/sync_token.h" 9 #include "gpu/command_buffer/common/sync_token.h"
10 #include "media/base/android/media_common_android.h" 10 #include "media/base/android/media_common_android.h"
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 void WebMediaPlayerCast::OnMediaPlayerPlay() { 305 void WebMediaPlayerCast::OnMediaPlayerPlay() {
306 DVLOG(1) << __FUNCTION__ << " is_remote_ = " << is_remote_; 306 DVLOG(1) << __FUNCTION__ << " is_remote_ = " << is_remote_;
307 initializing_ = false; 307 initializing_ = false;
308 if (is_remote_ && paused_) { 308 if (is_remote_ && paused_) {
309 paused_ = false; 309 paused_ = false;
310 remote_time_at_ = base::TimeTicks::Now(); 310 remote_time_at_ = base::TimeTicks::Now();
311 client_->playbackStateChanged(); 311 client_->playbackStateChanged();
312 } 312 }
313 // Blink expects a timeChanged() in response to a seek(). 313 // Blink expects a timeChanged() in response to a seek().
314 if (should_notify_time_changed_) 314 if (should_notify_time_changed_)
315 client_->timeChanged(); 315 client_->timeChanged(false);
316 } 316 }
317 317
318 void WebMediaPlayerCast::OnMediaPlayerPause() { 318 void WebMediaPlayerCast::OnMediaPlayerPause() {
319 DVLOG(1) << __FUNCTION__ << " is_remote_ = " << is_remote_; 319 DVLOG(1) << __FUNCTION__ << " is_remote_ = " << is_remote_;
320 if (is_remote_ && !paused_) { 320 if (is_remote_ && !paused_) {
321 paused_ = true; 321 paused_ = true;
322 client_->playbackStateChanged(); 322 client_->playbackStateChanged();
323 } 323 }
324 } 324 }
325 325
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 return MakeTextFrameForCast(remote_playback_message_, canvas_size, 365 return MakeTextFrameForCast(remote_playback_message_, canvas_size,
366 webmediaplayer_->naturalSize(), 366 webmediaplayer_->naturalSize(),
367 base::Bind(&GLCBShim, context_3d_cb_)); 367 base::Bind(&GLCBShim, context_3d_cb_));
368 } 368 }
369 369
370 void WebMediaPlayerCast::setPoster(const blink::WebURL& poster) { 370 void WebMediaPlayerCast::setPoster(const blink::WebURL& poster) {
371 player_manager_->SetPoster(player_id_, poster); 371 player_manager_->SetPoster(player_id_, poster);
372 } 372 }
373 373
374 } // namespace media 374 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698