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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/common/media/media_stream_messages.h

Issue 2296393004: Revert of Add groupid for media devices. Group audio devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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
« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/public/common/media_stream_request.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // IPC messages for the media streaming. 5 // IPC messages for the media streaming.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 25 matching lines...) Expand all
36 IPC_STRUCT_TRAITS_BEGIN(content::StreamControls) 36 IPC_STRUCT_TRAITS_BEGIN(content::StreamControls)
37 IPC_STRUCT_TRAITS_MEMBER(audio) 37 IPC_STRUCT_TRAITS_MEMBER(audio)
38 IPC_STRUCT_TRAITS_MEMBER(video) 38 IPC_STRUCT_TRAITS_MEMBER(video)
39 IPC_STRUCT_TRAITS_MEMBER(hotword_enabled) 39 IPC_STRUCT_TRAITS_MEMBER(hotword_enabled)
40 IPC_STRUCT_TRAITS_END() 40 IPC_STRUCT_TRAITS_END()
41 41
42 IPC_STRUCT_TRAITS_BEGIN(content::StreamDeviceInfo) 42 IPC_STRUCT_TRAITS_BEGIN(content::StreamDeviceInfo)
43 IPC_STRUCT_TRAITS_MEMBER(device.type) 43 IPC_STRUCT_TRAITS_MEMBER(device.type)
44 IPC_STRUCT_TRAITS_MEMBER(device.name) 44 IPC_STRUCT_TRAITS_MEMBER(device.name)
45 IPC_STRUCT_TRAITS_MEMBER(device.id) 45 IPC_STRUCT_TRAITS_MEMBER(device.id)
46 IPC_STRUCT_TRAITS_MEMBER(device.group_id)
47 IPC_STRUCT_TRAITS_MEMBER(device.video_facing) 46 IPC_STRUCT_TRAITS_MEMBER(device.video_facing)
48 IPC_STRUCT_TRAITS_MEMBER(device.matched_output_device_id) 47 IPC_STRUCT_TRAITS_MEMBER(device.matched_output_device_id)
49 IPC_STRUCT_TRAITS_MEMBER(device.input.sample_rate) 48 IPC_STRUCT_TRAITS_MEMBER(device.input.sample_rate)
50 IPC_STRUCT_TRAITS_MEMBER(device.input.channel_layout) 49 IPC_STRUCT_TRAITS_MEMBER(device.input.channel_layout)
51 IPC_STRUCT_TRAITS_MEMBER(device.input.frames_per_buffer) 50 IPC_STRUCT_TRAITS_MEMBER(device.input.frames_per_buffer)
52 IPC_STRUCT_TRAITS_MEMBER(device.input.effects) 51 IPC_STRUCT_TRAITS_MEMBER(device.input.effects)
53 IPC_STRUCT_TRAITS_MEMBER(device.input.mic_positions) 52 IPC_STRUCT_TRAITS_MEMBER(device.input.mic_positions)
54 IPC_STRUCT_TRAITS_MEMBER(device.matched_output.sample_rate) 53 IPC_STRUCT_TRAITS_MEMBER(device.matched_output.sample_rate)
55 IPC_STRUCT_TRAITS_MEMBER(device.matched_output.channel_layout) 54 IPC_STRUCT_TRAITS_MEMBER(device.matched_output.channel_layout)
56 IPC_STRUCT_TRAITS_MEMBER(device.matched_output.frames_per_buffer) 55 IPC_STRUCT_TRAITS_MEMBER(device.matched_output.frames_per_buffer)
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // connected video sinks meet the requirement of output protection.). 157 // connected video sinks meet the requirement of output protection.).
159 // Note: the browser process only trusts the |is_sucure| value in this IPC 158 // Note: the browser process only trusts the |is_sucure| value in this IPC
160 // message if it's comimg from a trusted, whitelisted extension. Extensions run 159 // message if it's comimg from a trusted, whitelisted extension. Extensions run
161 // in separate render processes. So it shouldn't be possible, for example, for 160 // in separate render processes. So it shouldn't be possible, for example, for
162 // a user's visit to a malicious web page to compromise a render process running 161 // a user's visit to a malicious web page to compromise a render process running
163 // a trusted extension to make it report falsehood in this IPC message. 162 // a trusted extension to make it report falsehood in this IPC message.
164 IPC_MESSAGE_CONTROL3(MediaStreamHostMsg_SetCapturingLinkSecured, 163 IPC_MESSAGE_CONTROL3(MediaStreamHostMsg_SetCapturingLinkSecured,
165 int, /* session_id */ 164 int, /* session_id */
166 content::MediaStreamType, /* type */ 165 content::MediaStreamType, /* type */
167 bool /* is_secure */) 166 bool /* is_secure */)
OLDNEW
« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/public/common/media_stream_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698