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

Side by Side Diff: talk/media/base/mediachannel.h

Issue 1647103002: Rebased changes to apply VideoOptions per stream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.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 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 *s = o; 231 *s = o;
232 } 232 }
233 } 233 }
234 }; 234 };
235 235
236 // Options that can be applied to a VideoMediaChannel or a VideoMediaEngine. 236 // Options that can be applied to a VideoMediaChannel or a VideoMediaEngine.
237 // Used to be flags, but that makes it hard to selectively apply options. 237 // Used to be flags, but that makes it hard to selectively apply options.
238 // We are moving all of the setting of options to structs like this, 238 // We are moving all of the setting of options to structs like this,
239 // but some things currently still use flags. 239 // but some things currently still use flags.
240 struct VideoOptions { 240 struct VideoOptions {
241 VideoOptions() {}
241 void SetAll(const VideoOptions& change) { 242 void SetAll(const VideoOptions& change) {
242 SetFrom(&video_noise_reduction, change.video_noise_reduction); 243 SetFrom(&video_noise_reduction, change.video_noise_reduction);
243 SetFrom(&cpu_overuse_detection, change.cpu_overuse_detection); 244 SetFrom(&cpu_overuse_detection, change.cpu_overuse_detection);
244 SetFrom(&conference_mode, change.conference_mode); 245 SetFrom(&conference_mode, change.conference_mode);
245 SetFrom(&dscp, change.dscp); 246 SetFrom(&dscp, change.dscp);
246 SetFrom(&suspend_below_min_bitrate, change.suspend_below_min_bitrate); 247 SetFrom(&suspend_below_min_bitrate, change.suspend_below_min_bitrate);
247 SetFrom(&screencast_min_bitrate_kbps, change.screencast_min_bitrate_kbps); 248 SetFrom(&screencast_min_bitrate_kbps, change.screencast_min_bitrate_kbps);
248 SetFrom(&disable_prerenderer_smoothing, 249 SetFrom(&disable_prerenderer_smoothing,
249 change.disable_prerenderer_smoothing); 250 change.disable_prerenderer_smoothing);
250 } 251 }
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 // Signal when the media channel is ready to send the stream. Arguments are: 1138 // Signal when the media channel is ready to send the stream. Arguments are:
1138 // writable(bool) 1139 // writable(bool)
1139 sigslot::signal1<bool> SignalReadyToSend; 1140 sigslot::signal1<bool> SignalReadyToSend;
1140 // Signal for notifying that the remote side has closed the DataChannel. 1141 // Signal for notifying that the remote side has closed the DataChannel.
1141 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1142 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1142 }; 1143 };
1143 1144
1144 } // namespace cricket 1145 } // namespace cricket
1145 1146
1146 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1147 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698