media/base/android/media_source_player.h - Issue 651243003: Remove MediaPlayerAndroid::IsSurfaceInUse() call

Side by Side Diff: media/base/android/media_source_player.h

Issue 651243003: Remove MediaPlayerAndroid::IsSurfaceInUse() call (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

« no previous file with comments | « media/base/android/media_player_bridge.cc ('k') | media/base/android/media_source_player.cc » ('j') | no next file with comments »

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 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_	5 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_

6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_	6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9 #include <map>	9 #include <map>

10 #include <string>	10 #include <string>

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 virtual int GetVideoWidth() override;	55 virtual int GetVideoWidth() override;

56 virtual int GetVideoHeight() override;	56 virtual int GetVideoHeight() override;

57 virtual base::TimeDelta GetCurrentTime() override;	57 virtual base::TimeDelta GetCurrentTime() override;

58 virtual base::TimeDelta GetDuration() override;	58 virtual base::TimeDelta GetDuration() override;

59 virtual bool IsPlaying() override;	59 virtual bool IsPlaying() override;

60 virtual bool CanPause() override;	60 virtual bool CanPause() override;

61 virtual bool CanSeekForward() override;	61 virtual bool CanSeekForward() override;

62 virtual bool CanSeekBackward() override;	62 virtual bool CanSeekBackward() override;

63 virtual bool IsPlayerReady() override;	63 virtual bool IsPlayerReady() override;

64 virtual void SetCdm(BrowserCdm* cdm) override;	64 virtual void SetCdm(BrowserCdm* cdm) override;

65 virtual bool IsSurfaceInUse() const override;

66	65

67 // DemuxerAndroidClient implementation.	66 // DemuxerAndroidClient implementation.

68 virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;	67 virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;

69 virtual void OnDemuxerDataAvailable(const DemuxerData& params) override;	68 virtual void OnDemuxerDataAvailable(const DemuxerData& params) override;

70 virtual void OnDemuxerSeekDone(	69 virtual void OnDemuxerSeekDone(

71 base::TimeDelta actual_browser_seek_time) override;	70 base::TimeDelta actual_browser_seek_time) override;

72 virtual void OnDemuxerDurationChanged(base::TimeDelta duration) override;	71 virtual void OnDemuxerDurationChanged(base::TimeDelta duration) override;

73	72

74 private:	73 private:

75 friend class MediaSourcePlayerTest;	74 friend class MediaSourcePlayerTest;

(...skipping 191 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
267 // NOTE: Weak pointers must be invalidated before all other member variables.	266 // NOTE: Weak pointers must be invalidated before all other member variables.

268 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;	267 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;

269 base::WeakPtr<MediaSourcePlayer> weak_this_;	268 base::WeakPtr<MediaSourcePlayer> weak_this_;

270	269

271 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);	270 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);

272 };	271 };

273	272

274 } // namespace media	273 } // namespace media

275	274

276 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_	275 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_

OLD	NEW