OLD | NEW |
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 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" | 5 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "content/common/media/media_player_delegate_messages.h" | 10 #include "content/common/media/media_player_delegate_messages.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { | 27 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { |
28 return id_map_.Add(observer); | 28 return id_map_.Add(observer); |
29 } | 29 } |
30 | 30 |
31 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { | 31 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { |
32 DCHECK(id_map_.Lookup(delegate_id)); | 32 DCHECK(id_map_.Lookup(delegate_id)); |
33 id_map_.Remove(delegate_id); | 33 id_map_.Remove(delegate_id); |
34 RemoveIdleDelegate(delegate_id); | 34 RemoveIdleDelegate(delegate_id); |
35 } | 35 } |
36 | 36 |
37 void RendererWebMediaPlayerDelegate::DidPlay(int delegate_id, | 37 void RendererWebMediaPlayerDelegate::DidPlay( |
38 bool has_video, | 38 int delegate_id, |
39 bool has_audio, | 39 bool has_video, |
40 bool is_remote, | 40 bool has_audio, |
41 base::TimeDelta duration) { | 41 bool is_remote, |
| 42 MediaContentType media_content_type) { |
42 DCHECK(id_map_.Lookup(delegate_id)); | 43 DCHECK(id_map_.Lookup(delegate_id)); |
43 has_played_media_ = true; | 44 has_played_media_ = true; |
44 RemoveIdleDelegate(delegate_id); | 45 RemoveIdleDelegate(delegate_id); |
45 Send(new MediaPlayerDelegateHostMsg_OnMediaPlaying( | 46 Send(new MediaPlayerDelegateHostMsg_OnMediaPlaying( |
46 routing_id(), delegate_id, has_video, has_audio, is_remote, duration)); | 47 routing_id(), |
| 48 delegate_id, has_video, has_audio, is_remote, media_content_type)); |
47 } | 49 } |
48 | 50 |
49 void RendererWebMediaPlayerDelegate::DidPause(int delegate_id, | 51 void RendererWebMediaPlayerDelegate::DidPause(int delegate_id, |
50 bool reached_end_of_stream) { | 52 bool reached_end_of_stream) { |
51 DCHECK(id_map_.Lookup(delegate_id)); | 53 DCHECK(id_map_.Lookup(delegate_id)); |
52 AddIdleDelegate(delegate_id); | 54 AddIdleDelegate(delegate_id); |
53 Send(new MediaPlayerDelegateHostMsg_OnMediaPaused(routing_id(), delegate_id, | 55 Send(new MediaPlayerDelegateHostMsg_OnMediaPaused(routing_id(), delegate_id, |
54 reached_end_of_stream)); | 56 reached_end_of_stream)); |
55 } | 57 } |
56 | 58 |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 // Shutdown the timer if no delegates are left. | 174 // Shutdown the timer if no delegates are left. |
173 if (idle_delegate_map_.empty()) | 175 if (idle_delegate_map_.empty()) |
174 idle_cleanup_timer_.Stop(); | 176 idle_cleanup_timer_.Stop(); |
175 } | 177 } |
176 | 178 |
177 void RendererWebMediaPlayerDelegate::OnDestruct() { | 179 void RendererWebMediaPlayerDelegate::OnDestruct() { |
178 delete this; | 180 delete this; |
179 } | 181 } |
180 | 182 |
181 } // namespace media | 183 } // namespace media |
OLD | NEW |