OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/browser/renderer_host/media/media_devices_dispatcher_host.h" | 5 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 {640, 480}, {640, 360}, {320, 240}, | 42 {640, 480}, {640, 360}, {320, 240}, |
43 {320, 180}}; | 43 {320, 180}}; |
44 | 44 |
45 // Frame rates for sources with no support for capability enumeration. | 45 // Frame rates for sources with no support for capability enumeration. |
46 const int kFallbackVideoFrameRates[] = {30, 60}; | 46 const int kFallbackVideoFrameRates[] = {30, 60}; |
47 | 47 |
48 url::Origin GetOrigin(int process_id, | 48 url::Origin GetOrigin(int process_id, |
49 int frame_id, | 49 int frame_id, |
50 const url::Origin& origin_for_testing) { | 50 const url::Origin& origin_for_testing) { |
51 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 51 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
52 if (!origin_for_testing.unique()) | 52 if (!origin_for_testing.opaque()) |
53 return origin_for_testing; | 53 return origin_for_testing; |
54 | 54 |
55 RenderFrameHost* frame_host = RenderFrameHost::FromID(process_id, frame_id); | 55 RenderFrameHost* frame_host = RenderFrameHost::FromID(process_id, frame_id); |
56 return frame_host ? frame_host->GetLastCommittedOrigin() : url::Origin(); | 56 return frame_host ? frame_host->GetLastCommittedOrigin() : url::Origin(); |
57 } | 57 } |
58 | 58 |
59 MediaDeviceInfo TranslateDeviceInfo(bool has_permission, | 59 MediaDeviceInfo TranslateDeviceInfo(bool has_permission, |
60 const std::string& device_id_salt, | 60 const std::string& device_id_salt, |
61 const std::string& group_id_salt, | 61 const std::string& group_id_salt, |
62 const url::Origin& security_origin, | 62 const url::Origin& security_origin, |
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
562 .Run(ToVectorAudioInputDeviceCapabilitiesPtr( | 562 .Run(ToVectorAudioInputDeviceCapabilitiesPtr( |
563 current_audio_input_capabilities_, request.security_origin, | 563 current_audio_input_capabilities_, request.security_origin, |
564 device_id_salt_)); | 564 device_id_salt_)); |
565 } | 565 } |
566 | 566 |
567 current_audio_input_capabilities_.clear(); | 567 current_audio_input_capabilities_.clear(); |
568 pending_audio_input_capabilities_requests_.clear(); | 568 pending_audio_input_capabilities_requests_.clear(); |
569 } | 569 } |
570 | 570 |
571 } // namespace content | 571 } // namespace content |
OLD | NEW |