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

Side by Side Diff: media/blink/webmediaplayer_impl.h

Issue 2439543003: Do not use overlays when VR shell is enabled. (Closed)
Patch Set: Pulled out both feature checks from WMPI, inverted logic to enable instead of disable Created 4 years 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 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 MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 200
201 void SetMediaPlayerManager( 201 void SetMediaPlayerManager(
202 RendererMediaPlayerManagerInterface* media_player_manager); 202 RendererMediaPlayerManagerInterface* media_player_manager);
203 void OnRemotePlaybackEnded(); 203 void OnRemotePlaybackEnded();
204 void OnDisconnectedFromRemoteDevice(double t); 204 void OnDisconnectedFromRemoteDevice(double t);
205 void SuspendForRemote(); 205 void SuspendForRemote();
206 void DisplayCastFrameAfterSuspend(const scoped_refptr<VideoFrame>& new_frame, 206 void DisplayCastFrameAfterSuspend(const scoped_refptr<VideoFrame>& new_frame,
207 PipelineStatus status); 207 PipelineStatus status);
208 gfx::Size GetCanvasSize() const; 208 gfx::Size GetCanvasSize() const;
209 void SetDeviceScaleFactor(float scale_factor); 209 void SetDeviceScaleFactor(float scale_factor);
210 void SetEnableFullscreenOverlays(bool disable_overlays);
mthiesse 2016/12/14 16:08:19 Does it makes sense to have a function for this? L
amp 2016/12/14 18:15:04 After the inversion and pulling out the other feat
liberato (no reviews please) 2016/12/14 19:39:07 i find adding booleans in the constructor to be er
amp 2016/12/14 22:02:09 Done. Going with a setter in latest patch.
210 void setPoster(const blink::WebURL& poster) override; 211 void setPoster(const blink::WebURL& poster) override;
211 void SetUseFallbackPath(bool use_fallback_path); 212 void SetUseFallbackPath(bool use_fallback_path);
212 #endif 213 #endif
213 214
214 // Called from WebMediaPlayerCast. 215 // Called from WebMediaPlayerCast.
215 // TODO(hubbe): WMPI_CAST make private. 216 // TODO(hubbe): WMPI_CAST make private.
216 void OnPipelineSeeked(bool time_updated); 217 void OnPipelineSeeked(bool time_updated);
217 218
218 // Restart the player/pipeline as soon as possible. This will destroy the 219 // Restart the player/pipeline as soon as possible. This will destroy the
219 // current renderer, if any, and create a new one via the RendererFactory; and 220 // current renderer, if any, and create a new one via the RendererFactory; and
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 529
529 // If a surface is requested before it's finished being created, the request 530 // If a surface is requested before it's finished being created, the request
530 // is saved and satisfied once the surface is available. If the decoder does 531 // is saved and satisfied once the surface is available. If the decoder does
531 // not require restart to change surfaces, this is callback is kept until 532 // not require restart to change surfaces, this is callback is kept until
532 // cleared by the decoder. 533 // cleared by the decoder.
533 SurfaceCreatedCB set_surface_cb_; 534 SurfaceCreatedCB set_surface_cb_;
534 535
535 // Force to use SurfaceView instead of SurfaceTexture on Android. 536 // Force to use SurfaceView instead of SurfaceTexture on Android.
536 bool force_video_overlays_; 537 bool force_video_overlays_;
537 538
538 // Prevent use of SurfaceView on Android. (Ignored when 539 // Allow use of SurfaceView on Android. (Ignored when
539 // |force_video_overlays_| is true.) 540 // |force_video_overlays_| is true.)
540 bool disable_fullscreen_video_overlays_; 541 bool enable_fullscreen_video_overlays_;
541 542
542 // Suppresses calls to OnPipelineError() after destruction / shutdown has been 543 // Suppresses calls to OnPipelineError() after destruction / shutdown has been
543 // started; prevents us from spuriously logging errors that are transient or 544 // started; prevents us from spuriously logging errors that are transient or
544 // unimportant. 545 // unimportant.
545 bool suppress_destruction_errors_; 546 bool suppress_destruction_errors_;
546 547
547 // State indicating if it's okay to suspend or not. Updated on the first time 548 // State indicating if it's okay to suspend or not. Updated on the first time
548 // OnSuspendRequested() is called. If the state is UNKNOWN, the current frame 549 // OnSuspendRequested() is called. If the state is UNKNOWN, the current frame
549 // from the compositor will be queried to see if suspend is supported; the 550 // from the compositor will be queried to see if suspend is supported; the
550 // state will be set to YES or NO respectively if a frame is available. 551 // state will be set to YES or NO respectively if a frame is available.
(...skipping 27 matching lines...) Expand all
578 579
579 // Whether the player is currently in autoplay muted state. 580 // Whether the player is currently in autoplay muted state.
580 bool autoplay_muted_ = false; 581 bool autoplay_muted_ = false;
581 582
582 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 583 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
583 }; 584 };
584 585
585 } // namespace media 586 } // namespace media
586 587
587 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 588 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698