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

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

Issue 1640123004: Propagate media session id into MediaPlayerAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-media-session-id-over-ipc
Patch Set: Fix stray kDefaultMediaSessionID Created 4 years, 9 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 (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 27 matching lines...) Expand all
38 class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid, 38 class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
39 public DemuxerAndroidClient { 39 public DemuxerAndroidClient {
40 public: 40 public:
41 // Constructs a player with the given ID and demuxer. |manager| must outlive 41 // Constructs a player with the given ID and demuxer. |manager| must outlive
42 // the lifetime of this object. 42 // the lifetime of this object.
43 MediaSourcePlayer( 43 MediaSourcePlayer(
44 int player_id, 44 int player_id,
45 MediaPlayerManager* manager, 45 MediaPlayerManager* manager,
46 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, 46 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
47 scoped_ptr<DemuxerAndroid> demuxer, 47 scoped_ptr<DemuxerAndroid> demuxer,
48 const GURL& frame_url); 48 const GURL& frame_url,
49 int media_session_id);
49 ~MediaSourcePlayer() override; 50 ~MediaSourcePlayer() override;
50 51
51 // MediaPlayerAndroid implementation. 52 // MediaPlayerAndroid implementation.
52 void SetVideoSurface(gfx::ScopedJavaSurface surface) override; 53 void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
53 void Start() override; 54 void Start() override;
54 void Pause(bool is_media_related_action) override; 55 void Pause(bool is_media_related_action) override;
55 void SeekTo(base::TimeDelta timestamp) override; 56 void SeekTo(base::TimeDelta timestamp) override;
56 void Release() override; 57 void Release() override;
57 bool HasVideo() const override; 58 bool HasVideo() const override;
58 bool HasAudio() const override; 59 bool HasAudio() const override;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 base::WeakPtr<MediaSourcePlayer> weak_this_; 280 base::WeakPtr<MediaSourcePlayer> weak_this_;
280 // NOTE: Weak pointers must be invalidated before all other member variables. 281 // NOTE: Weak pointers must be invalidated before all other member variables.
281 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_; 282 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
282 283
283 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer); 284 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
284 }; 285 };
285 286
286 } // namespace media 287 } // namespace media
287 288
288 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 289 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
OLDNEW
« no previous file with comments | « media/base/android/media_player_bridge_unittest.cc ('k') | media/base/android/media_source_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698