| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/user_media_client_impl.h" | 5 #include "content/renderer/media/user_media_client_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 985 return *existing_source; | 985 return *existing_source; |
| 986 } | 986 } |
| 987 | 987 |
| 988 blink::WebMediaStreamSource::Type type = | 988 blink::WebMediaStreamSource::Type type = |
| 989 IsAudioInputMediaType(device.device.type) | 989 IsAudioInputMediaType(device.device.type) |
| 990 ? blink::WebMediaStreamSource::TypeAudio | 990 ? blink::WebMediaStreamSource::TypeAudio |
| 991 : blink::WebMediaStreamSource::TypeVideo; | 991 : blink::WebMediaStreamSource::TypeVideo; |
| 992 | 992 |
| 993 blink::WebMediaStreamSource source; | 993 blink::WebMediaStreamSource source; |
| 994 source.initialize(blink::WebString::fromUTF8(device.device.id), type, | 994 source.initialize(blink::WebString::fromUTF8(device.device.id), type, |
| 995 blink::WebString::fromUTF8(device.device.name), | 995 blink::WebString::fromUTF8(device.device.name)); |
| 996 false /* remote */); | |
| 997 | 996 |
| 998 DVLOG(1) << "Initialize source object :" | 997 DVLOG(1) << "Initialize source object :" |
| 999 << "id = " << source.id().utf8() | 998 << "id = " << source.id().utf8() |
| 1000 << ", name = " << source.name().utf8(); | 999 << ", name = " << source.name().utf8(); |
| 1001 return source; | 1000 return source; |
| 1002 } | 1001 } |
| 1003 | 1002 |
| 1004 bool UserMediaClientImpl::RemoveLocalSource( | 1003 bool UserMediaClientImpl::RemoveLocalSource( |
| 1005 const blink::WebMediaStreamSource& source) { | 1004 const blink::WebMediaStreamSource& source) { |
| 1006 DCHECK(CalledOnValidThread()); | 1005 DCHECK(CalledOnValidThread()); |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1243 sources_waiting_for_callback_.end(), source); | 1242 sources_waiting_for_callback_.end(), source); |
| 1244 if (found != sources_waiting_for_callback_.end()) | 1243 if (found != sources_waiting_for_callback_.end()) |
| 1245 OnTrackStarted(source, result, result_name); | 1244 OnTrackStarted(source, result, result_name); |
| 1246 } | 1245 } |
| 1247 | 1246 |
| 1248 void UserMediaClientImpl::OnDestruct() { | 1247 void UserMediaClientImpl::OnDestruct() { |
| 1249 delete this; | 1248 delete this; |
| 1250 } | 1249 } |
| 1251 | 1250 |
| 1252 } // namespace content | 1251 } // namespace content |
| OLD | NEW |