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

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

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 #include "media/base/android/media_source_player.h" 5 #include "media/base/android/media_source_player.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <limits> 9 #include <limits>
10 #include <utility> 10 #include <utility>
(...skipping 14 matching lines...) Expand all
25 #include "media/base/bind_to_current_loop.h" 25 #include "media/base/bind_to_current_loop.h"
26 #include "media/base/timestamp_constants.h" 26 #include "media/base/timestamp_constants.h"
27 27
28 namespace media { 28 namespace media {
29 29
30 MediaSourcePlayer::MediaSourcePlayer( 30 MediaSourcePlayer::MediaSourcePlayer(
31 int player_id, 31 int player_id,
32 MediaPlayerManager* manager, 32 MediaPlayerManager* manager,
33 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, 33 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
34 scoped_ptr<DemuxerAndroid> demuxer, 34 scoped_ptr<DemuxerAndroid> demuxer,
35 const GURL& frame_url) 35 const GURL& frame_url,
36 int media_session_id)
36 : MediaPlayerAndroid(player_id, 37 : MediaPlayerAndroid(player_id,
37 manager, 38 manager,
38 on_decoder_resources_released_cb, 39 on_decoder_resources_released_cb,
39 frame_url), 40 frame_url,
41 media_session_id),
40 demuxer_(std::move(demuxer)), 42 demuxer_(std::move(demuxer)),
41 pending_event_(NO_EVENT_PENDING), 43 pending_event_(NO_EVENT_PENDING),
42 playing_(false), 44 playing_(false),
43 interpolator_(&default_tick_clock_), 45 interpolator_(&default_tick_clock_),
44 doing_browser_seek_(false), 46 doing_browser_seek_(false),
45 pending_seek_(false), 47 pending_seek_(false),
46 cdm_registration_id_(0), 48 cdm_registration_id_(0),
47 is_waiting_for_key_(false), 49 is_waiting_for_key_(false),
48 key_added_while_decode_pending_(false), 50 key_added_while_decode_pending_(false),
49 is_waiting_for_audio_decoder_(false), 51 is_waiting_for_audio_decoder_(false),
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 is_waiting_for_key_ = false; 854 is_waiting_for_key_ = false;
853 key_added_while_decode_pending_ = false; 855 key_added_while_decode_pending_ = false;
854 856
855 // StartInternal() will trigger a prefetch, where in most cases we'll just 857 // StartInternal() will trigger a prefetch, where in most cases we'll just
856 // use previously received data. 858 // use previously received data.
857 if (playing_) 859 if (playing_)
858 StartInternal(); 860 StartInternal();
859 } 861 }
860 862
861 } // namespace media 863 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_source_player.h ('k') | media/base/android/media_source_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698