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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1311533009: - Rename VoiceChannel::MuteStream() -> SetAudioSend() (incl. media channel) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@lj_remove_typingmonitor_files
Patch Set: typo in comment Created 5 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
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvoiceengine.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 2014 Google Inc. 3 * Copyright 2014 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 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 } 1088 }
1089 if (send) { 1089 if (send) {
1090 StartAllSendStreams(); 1090 StartAllSendStreams();
1091 } else { 1091 } else {
1092 StopAllSendStreams(); 1092 StopAllSendStreams();
1093 } 1093 }
1094 sending_ = send; 1094 sending_ = send;
1095 return true; 1095 return true;
1096 } 1096 }
1097 1097
1098 bool WebRtcVideoChannel2::SetVideoSend(uint32 ssrc, bool mute,
1099 const VideoOptions* options) {
1100 // TODO(solenberg): The state change should be fully rolled back if any one of
1101 // these calls fail.
1102 if (!MuteStream(ssrc, mute)) {
1103 return false;
1104 }
1105 if (!mute && options) {
1106 return SetOptions(*options);
1107 } else {
1108 return true;
1109 }
1110 }
1111
1098 bool WebRtcVideoChannel2::ValidateSendSsrcAvailability( 1112 bool WebRtcVideoChannel2::ValidateSendSsrcAvailability(
1099 const StreamParams& sp) const { 1113 const StreamParams& sp) const {
1100 for (uint32_t ssrc: sp.ssrcs) { 1114 for (uint32_t ssrc: sp.ssrcs) {
1101 if (send_ssrcs_.find(ssrc) != send_ssrcs_.end()) { 1115 if (send_ssrcs_.find(ssrc) != send_ssrcs_.end()) {
1102 LOG(LS_ERROR) << "Send stream with SSRC '" << ssrc << "' already exists."; 1116 LOG(LS_ERROR) << "Send stream with SSRC '" << ssrc << "' already exists.";
1103 return false; 1117 return false;
1104 } 1118 }
1105 } 1119 }
1106 return true; 1120 return true;
1107 } 1121 }
(...skipping 1666 matching lines...) Expand 10 before | Expand all | Expand 10 after
2774 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2788 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2775 } 2789 }
2776 } 2790 }
2777 2791
2778 return video_codecs; 2792 return video_codecs;
2779 } 2793 }
2780 2794
2781 } // namespace cricket 2795 } // namespace cricket
2782 2796
2783 #endif // HAVE_WEBRTC_VIDEO 2797 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698