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 #include "media/base/android/media_player_android.h" | 5 #include "media/base/android/media_player_android.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/android/context_utils.h" | 9 #include "base/android/context_utils.h" |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 } // namespace | 23 } // namespace |
24 | 24 |
25 namespace media { | 25 namespace media { |
26 | 26 |
27 const double MediaPlayerAndroid::kDefaultVolumeMultiplier = 1.0; | 27 const double MediaPlayerAndroid::kDefaultVolumeMultiplier = 1.0; |
28 | 28 |
29 MediaPlayerAndroid::MediaPlayerAndroid( | 29 MediaPlayerAndroid::MediaPlayerAndroid( |
30 int player_id, | 30 int player_id, |
31 MediaPlayerManager* manager, | 31 MediaPlayerManager* manager, |
32 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, | 32 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, |
33 const GURL& frame_url, | 33 const GURL& frame_url) |
34 int media_session_id) | |
35 : on_decoder_resources_released_cb_(on_decoder_resources_released_cb), | 34 : on_decoder_resources_released_cb_(on_decoder_resources_released_cb), |
36 player_id_(player_id), | 35 player_id_(player_id), |
37 volume_(kDefaultVolume), | 36 volume_(kDefaultVolume), |
38 volume_multiplier_(kDefaultVolumeMultiplier), | 37 volume_multiplier_(kDefaultVolumeMultiplier), |
39 manager_(manager), | 38 manager_(manager), |
40 frame_url_(frame_url), | 39 frame_url_(frame_url), |
41 media_session_id_(media_session_id), | |
42 weak_factory_(this) { | 40 weak_factory_(this) { |
43 listener_.reset(new MediaPlayerListener(base::ThreadTaskRunnerHandle::Get(), | 41 listener_.reset(new MediaPlayerListener(base::ThreadTaskRunnerHandle::Get(), |
44 weak_factory_.GetWeakPtr())); | 42 weak_factory_.GetWeakPtr())); |
45 } | 43 } |
46 | 44 |
47 MediaPlayerAndroid::~MediaPlayerAndroid() {} | 45 MediaPlayerAndroid::~MediaPlayerAndroid() {} |
48 | 46 |
49 void MediaPlayerAndroid::SetVolume(double volume) { | 47 void MediaPlayerAndroid::SetVolume(double volume) { |
50 volume_ = std::max(0.0, std::min(volume, 1.0)); | 48 volume_ = std::max(0.0, std::min(volume, 1.0)); |
51 UpdateEffectiveVolume(); | 49 UpdateEffectiveVolume(); |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 void MediaPlayerAndroid::DestroyListenerOnUIThread() { | 120 void MediaPlayerAndroid::DestroyListenerOnUIThread() { |
123 weak_factory_.InvalidateWeakPtrs(); | 121 weak_factory_.InvalidateWeakPtrs(); |
124 listener_.reset(); | 122 listener_.reset(); |
125 } | 123 } |
126 | 124 |
127 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { | 125 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { |
128 return weak_factory_.GetWeakPtr(); | 126 return weak_factory_.GetWeakPtr(); |
129 } | 127 } |
130 | 128 |
131 } // namespace media | 129 } // namespace media |
OLD | NEW |