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

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

Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix after review from Chris Created 7 years, 11 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 | Annotate | Revision Log
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 11 matching lines...) Expand all
22 IPC_STRUCT_TRAITS_MEMBER(audio_type) 22 IPC_STRUCT_TRAITS_MEMBER(audio_type)
23 IPC_STRUCT_TRAITS_MEMBER(audio_device_id) 23 IPC_STRUCT_TRAITS_MEMBER(audio_device_id)
24 IPC_STRUCT_TRAITS_MEMBER(video_type) 24 IPC_STRUCT_TRAITS_MEMBER(video_type)
25 IPC_STRUCT_TRAITS_MEMBER(video_device_id) 25 IPC_STRUCT_TRAITS_MEMBER(video_device_id)
26 IPC_STRUCT_TRAITS_END() 26 IPC_STRUCT_TRAITS_END()
27 27
28 IPC_STRUCT_TRAITS_BEGIN(content::StreamDeviceInfo) 28 IPC_STRUCT_TRAITS_BEGIN(content::StreamDeviceInfo)
29 IPC_STRUCT_TRAITS_MEMBER(device.type) 29 IPC_STRUCT_TRAITS_MEMBER(device.type)
30 IPC_STRUCT_TRAITS_MEMBER(device.name) 30 IPC_STRUCT_TRAITS_MEMBER(device.name)
31 IPC_STRUCT_TRAITS_MEMBER(device.id) 31 IPC_STRUCT_TRAITS_MEMBER(device.id)
32 IPC_STRUCT_TRAITS_MEMBER(device.sample_rate)
33 IPC_STRUCT_TRAITS_MEMBER(device.channel_layout)
32 IPC_STRUCT_TRAITS_MEMBER(in_use) 34 IPC_STRUCT_TRAITS_MEMBER(in_use)
33 IPC_STRUCT_TRAITS_MEMBER(session_id) 35 IPC_STRUCT_TRAITS_MEMBER(session_id)
34 IPC_STRUCT_TRAITS_END() 36 IPC_STRUCT_TRAITS_END()
35 37
36 // Message sent from the browser to the renderer 38 // Message sent from the browser to the renderer
37 39
38 // The browser has generated a stream successfully. 40 // The browser has generated a stream successfully.
39 IPC_MESSAGE_ROUTED4(MediaStreamMsg_StreamGenerated, 41 IPC_MESSAGE_ROUTED4(MediaStreamMsg_StreamGenerated,
40 int /* request id */, 42 int /* request id */,
41 std::string /* label */, 43 std::string /* label */,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 content::MediaStreamType /* type */, 96 content::MediaStreamType /* type */,
95 GURL /* security origin */) 97 GURL /* security origin */)
96 98
97 // Request to open the device. 99 // Request to open the device.
98 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, 100 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,
99 int /* render view id */, 101 int /* render view id */,
100 int /* request id */, 102 int /* request id */,
101 std::string /* device_id */, 103 std::string /* device_id */,
102 content::MediaStreamType /* type */, 104 content::MediaStreamType /* type */,
103 GURL /* security origin */) 105 GURL /* security origin */)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698