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

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

Issue 1128383003: Implementation of MediaCodecPlayer stage 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments, better Listener callbacks, removed unused includes Created 5 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_CODEC_PLAYER_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_
7 7
8 #include "base/android/scoped_java_ref.h" 8 #include "base/android/scoped_java_ref.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #include "base/time/default_tick_clock.h"
12 #include "media/base/android/demuxer_android.h" 13 #include "media/base/android/demuxer_android.h"
13 #include "media/base/android/media_player_android.h" 14 #include "media/base/android/media_player_android.h"
15 #include "media/base/demuxer_stream.h"
14 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
17 #include "media/base/time_delta_interpolator.h"
15 #include "ui/gl/android/scoped_java_surface.h" 18 #include "ui/gl/android/scoped_java_surface.h"
16 19
17 namespace media { 20 namespace media {
18 21
19 class BrowserCdm; 22 class BrowserCdm;
23 class MediaCodecPlayerState;
24 class MediaCodecAudioDecoder;
25 class MediaCodecVideoDecoder;
20 26
21 // Returns the task runner for the media thread 27 // Returns the task runner for the media thread
22 MEDIA_EXPORT scoped_refptr<base::SingleThreadTaskRunner> GetMediaTaskRunner(); 28 MEDIA_EXPORT scoped_refptr<base::SingleThreadTaskRunner> GetMediaTaskRunner();
23 29
24 30
25 // This class implements the media player using Android's MediaCodec. 31 // This class implements the media player using Android's MediaCodec.
26 // It differs from MediaSourcePlayer in that it removes most 32 // It differs from MediaSourcePlayer in that it removes most
27 // processing away from UI thread: it uses a dedicated Media thread 33 // processing away from UI thread: it uses a dedicated Media thread
28 // to receive the data and to handle commands. 34 // to receive the data and to handle commands.
29 class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid, 35 class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,
30 public DemuxerAndroidClient { 36 public DemuxerAndroidClient {
31 public: 37 public:
38
39 // Typedefs for the notification callbacks
40 typedef base::Callback<
41 void (base::TimeDelta duration, int width, int height, bool success)>
42 MetadataChangedCallback;
43
44 typedef base::Callback<
45 void (base::TimeDelta current_timestamp, base::TimeTicks current_ticks)>
46 TimeUpdateCallback;
47
32 // Constructs a player with the given ID and demuxer. |manager| must outlive 48 // Constructs a player with the given ID and demuxer. |manager| must outlive
33 // the lifetime of this object. 49 // the lifetime of this object.
34 MediaCodecPlayer(int player_id, 50 MediaCodecPlayer(int player_id,
35 MediaPlayerManager* manager, 51 base::WeakPtr<MediaPlayerManager> manager,
36 const RequestMediaResourcesCB& request_media_resources_cb, 52 const RequestMediaResourcesCB& request_media_resources_cb,
37 scoped_ptr<DemuxerAndroid> demuxer, 53 scoped_ptr<DemuxerAndroid> demuxer,
38 const GURL& frame_url); 54 const GURL& frame_url);
39 ~MediaCodecPlayer() override; 55 ~MediaCodecPlayer() override;
40 56
41 // MediaPlayerAndroid implementation. 57 // MediaPlayerAndroid implementation.
42 void DeleteOnCorrectThread() override; 58 void DeleteOnCorrectThread() override;
43 void SetVideoSurface(gfx::ScopedJavaSurface surface) override; 59 void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
44 void Start() override; 60 void Start() override;
45 void Pause(bool is_media_related_action) override; 61 void Pause(bool is_media_related_action) override;
(...skipping 12 matching lines...) Expand all
58 void SetCdm(BrowserCdm* cdm) override; 74 void SetCdm(BrowserCdm* cdm) override;
59 75
60 // DemuxerAndroidClient implementation. 76 // DemuxerAndroidClient implementation.
61 void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override; 77 void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;
62 void OnDemuxerDataAvailable(const DemuxerData& params) override; 78 void OnDemuxerDataAvailable(const DemuxerData& params) override;
63 void OnDemuxerSeekDone(base::TimeDelta actual_browser_seek_time) override; 79 void OnDemuxerSeekDone(base::TimeDelta actual_browser_seek_time) override;
64 void OnDemuxerDurationChanged(base::TimeDelta duration) override; 80 void OnDemuxerDurationChanged(base::TimeDelta duration) override;
65 81
66 // Helper methods 82 // Helper methods
67 void Initialize(); 83 void Initialize();
68 void DestroySelf(); 84
85 base::WeakPtr<MediaCodecPlayer> weak_ptr() const { return weak_this_; }
69 86
70 private: 87 private:
88 // The state machine states can access the player.
89 friend class MediaCodecPlayerState;
90 friend class StateWaitingForConfig;
91 friend class StateWaitingForSurface;
92 friend class StatePaused;
93 friend class StatePrefetching;
94 friend class StatePlaying;
95 friend class StateStopping;
96 friend class StateWaitingForSeek;
97 friend class StateError;
98
99 // Callbacks from decoders
100 void RequestDemuxerData(DemuxerStream::Type stream_type);
101 void OnPrefetchDone();
102 void OnStarvation();
103 void OnStopDone();
104 void OnError();
105 void OnTimeIntervalUpdate(base::TimeDelta now_playing,
106 base::TimeDelta last_buffered);
107
108 // Operations called from the state machine.
109 void SetState(MediaCodecPlayerState* new_state);
110 void SetPendingSurface(gfx::ScopedJavaSurface surface);
111 bool HasPendingSurface();
112 void SetPendingStart(bool need_to_start);
113 bool HasPendingStart();
114 bool HasVideo();
115 bool HasAudio();
116 void SetDemuxerConfigs(const DemuxerConfigs& configs);
117 void StartPrefetchDecoders();
118 void StartPlaybackDecoders();
119 void StopDecoders();
120 void RequestToStopDecoders();
121 void ReleaseDecoderResources();
122
123 // Helper methods.
124 void CreateDecoders();
125 bool AudioFinished();
126 bool VideoFinished();
127
128 // Data.
129
71 // Object for posting tasks on UI thread. 130 // Object for posting tasks on UI thread.
72 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; 131 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
73 132
133 // Major components: demuxer, audio and video decoders.
74 scoped_ptr<DemuxerAndroid> demuxer_; 134 scoped_ptr<DemuxerAndroid> demuxer_;
135 scoped_ptr<MediaCodecAudioDecoder> audio_decoder_;
136 scoped_ptr<MediaCodecVideoDecoder> video_decoder_;
137
138 // The state of the state machine.
139 MediaCodecPlayerState* state_;
140
141 // Notification callbacks, they call MediaPlayerManager.
142 base::Closure request_resources_cb_;
143 MetadataChangedCallback metadata_changed_cb_;
144 TimeUpdateCallback time_update_cb_;
145 base::Closure completion_cb_;
146
147 // We call the MediaPlayerListener(request and release audio focus)
148 // on UI thread with these callbacks.
149 base::Closure attach_listener_cb_;
150 base::Closure detach_listener_cb_;
151
152 // Error callback might be posted internally
153 base::Closure error_cb_;
154
155 // Total duration reported by demuxer.
156 base::TimeDelta duration_;
157
158 // base::TickClock used by |interpolator_|.
159 base::DefaultTickClock default_tick_clock_;
160
161 // Tracks the most recent media time update and provides interpolated values
162 // as playback progresses.
163 TimeDeltaInterpolator interpolator_;
164
165 // |interpolator_| will be accessed from the UI and decoder threads
166 base::Lock interpolator_lock_;
167
168 // Pendng data to be picked up by the upcoming state.
169 gfx::ScopedJavaSurface pending_surface_;
170 bool pending_start_;
75 171
76 base::WeakPtr<MediaCodecPlayer> weak_this_; 172 base::WeakPtr<MediaCodecPlayer> weak_this_;
77 // NOTE: Weak pointers must be invalidated before all other member variables. 173 // NOTE: Weak pointers must be invalidated before all other member variables.
78 base::WeakPtrFactory<MediaCodecPlayer> weak_factory_; 174 base::WeakPtrFactory<MediaCodecPlayer> weak_factory_;
79 175
80 DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayer); 176 DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayer);
81 }; 177 };
82 178
83 } // namespace media 179 } // namespace media
84 180
85 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_ 181 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698