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

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

Issue 1570043002: Implement MediaSession on top of the WebMediaPlayerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session
Patch Set: Address comments. Created 4 years, 11 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 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 <string> 10 #include <string>
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 void OnPipelineError(PipelineStatus error); 187 void OnPipelineError(PipelineStatus error);
188 void OnPipelineMetadata(PipelineMetadata metadata); 188 void OnPipelineMetadata(PipelineMetadata metadata);
189 void OnPipelineBufferingStateChanged(BufferingState buffering_state); 189 void OnPipelineBufferingStateChanged(BufferingState buffering_state);
190 void OnDemuxerOpened(); 190 void OnDemuxerOpened();
191 void OnAddTextTrack(const TextTrackConfig& config, 191 void OnAddTextTrack(const TextTrackConfig& config,
192 const AddTextTrackDoneCB& done_cb); 192 const AddTextTrackDoneCB& done_cb);
193 193
194 // WebMediaPlayerDelegate::Observer implementation. 194 // WebMediaPlayerDelegate::Observer implementation.
195 void OnHidden() override; 195 void OnHidden() override;
196 void OnShown() override; 196 void OnShown() override;
197 void OnPlay() override;
198 void OnPause() override;
199 void OnVolumeMultiplierUpdate(double multiplier) override;
197 200
198 #if defined(OS_ANDROID) // WMPI_CAST 201 #if defined(OS_ANDROID) // WMPI_CAST
199 bool isRemote() const override; 202 bool isRemote() const override;
200 void requestRemotePlayback() override; 203 void requestRemotePlayback() override;
201 void requestRemotePlaybackControl() override; 204 void requestRemotePlaybackControl() override;
202 205
203 void SetMediaPlayerManager( 206 void SetMediaPlayerManager(
204 RendererMediaPlayerManagerInterface* media_player_manager); 207 RendererMediaPlayerManagerInterface* media_player_manager);
205 void OnRemotePlaybackEnded(); 208 void OnRemotePlaybackEnded();
206 void OnDisconnectedFromRemoteDevice(double t); 209 void OnDisconnectedFromRemoteDevice(double t);
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 base::TimeDelta pending_seek_time_; 382 base::TimeDelta pending_seek_time_;
380 383
381 // Tracks whether to issue time changed notifications during buffering state 384 // Tracks whether to issue time changed notifications during buffering state
382 // changes. 385 // changes.
383 bool should_notify_time_changed_; 386 bool should_notify_time_changed_;
384 387
385 blink::WebMediaPlayerClient* client_; 388 blink::WebMediaPlayerClient* client_;
386 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client_; 389 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client_;
387 390
388 base::WeakPtr<WebMediaPlayerDelegate> delegate_; 391 base::WeakPtr<WebMediaPlayerDelegate> delegate_;
392 int delegate_id_;
sandersd (OOO until July 31) 2016/01/25 19:10:59 Nit: Document |delegate_id_|.
DaleCurtis 2016/01/25 21:49:47 Done.
389 393
390 WebMediaPlayerParams::DeferLoadCB defer_load_cb_; 394 WebMediaPlayerParams::DeferLoadCB defer_load_cb_;
391 WebMediaPlayerParams::Context3DCB context_3d_cb_; 395 WebMediaPlayerParams::Context3DCB context_3d_cb_;
392 396
393 // Members for notifying upstream clients about internal memory usage. The 397 // Members for notifying upstream clients about internal memory usage. The
394 // |adjust_allocated_memory_cb_| must only be called on |main_task_runner_|. 398 // |adjust_allocated_memory_cb_| must only be called on |main_task_runner_|.
395 base::RepeatingTimer memory_usage_reporting_timer_; 399 base::RepeatingTimer memory_usage_reporting_timer_;
396 WebMediaPlayerParams::AdjustAllocatedMemoryCB adjust_allocated_memory_cb_; 400 WebMediaPlayerParams::AdjustAllocatedMemoryCB adjust_allocated_memory_cb_;
397 int64_t last_reported_memory_usage_; 401 int64_t last_reported_memory_usage_;
398 402
(...skipping 28 matching lines...) Expand all
427 431
428 scoped_ptr<blink::WebContentDecryptionModuleResult> set_cdm_result_; 432 scoped_ptr<blink::WebContentDecryptionModuleResult> set_cdm_result_;
429 433
430 // Whether a CDM has been successfully attached. 434 // Whether a CDM has been successfully attached.
431 bool is_cdm_attached_; 435 bool is_cdm_attached_;
432 436
433 #if defined(OS_ANDROID) // WMPI_CAST 437 #if defined(OS_ANDROID) // WMPI_CAST
434 WebMediaPlayerCast cast_impl_; 438 WebMediaPlayerCast cast_impl_;
435 #endif 439 #endif
436 440
441 double volume_;
442 double volume_multiplier_;
sandersd (OOO until July 31) 2016/01/25 19:10:59 Nit: Document |volume_multiplier_|, it's not obvio
DaleCurtis 2016/01/25 21:49:47 Done.
443
437 scoped_ptr<RendererFactory> renderer_factory_; 444 scoped_ptr<RendererFactory> renderer_factory_;
438 445
439 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 446 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
440 }; 447 };
441 448
442 } // namespace media 449 } // namespace media
443 450
444 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 451 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698