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

Side by Side Diff: talk/app/webrtc/webrtcsession.cc

Issue 1331443003: Remove GetOutputScaling from VoiceMediaChannel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 | « no previous file | talk/media/base/fakemediaengine.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 2012 Google Inc. 3 * Copyright 2012 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 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 } 1199 }
1200 1200
1201 void WebRtcSession::SetAudioPlayoutVolume(uint32 ssrc, double volume) { 1201 void WebRtcSession::SetAudioPlayoutVolume(uint32 ssrc, double volume) {
1202 ASSERT(signaling_thread()->IsCurrent()); 1202 ASSERT(signaling_thread()->IsCurrent());
1203 ASSERT(volume >= 0 && volume <= 10); 1203 ASSERT(volume >= 0 && volume <= 10);
1204 if (!voice_channel_) { 1204 if (!voice_channel_) {
1205 LOG(LS_ERROR) << "SetAudioPlayoutVolume: No audio channel exists."; 1205 LOG(LS_ERROR) << "SetAudioPlayoutVolume: No audio channel exists.";
1206 return; 1206 return;
1207 } 1207 }
1208 1208
1209 if (!voice_channel_->SetOutputScaling(ssrc, volume, volume)) 1209 if (!voice_channel_->SetOutputScaling(ssrc, volume, volume)) {
1210 ASSERT(false); 1210 ASSERT(false);
1211 }
1211 } 1212 }
1212 1213
1213 bool WebRtcSession::SetCaptureDevice(uint32 ssrc, 1214 bool WebRtcSession::SetCaptureDevice(uint32 ssrc,
1214 cricket::VideoCapturer* camera) { 1215 cricket::VideoCapturer* camera) {
1215 ASSERT(signaling_thread()->IsCurrent()); 1216 ASSERT(signaling_thread()->IsCurrent());
1216 1217
1217 if (!video_channel_) { 1218 if (!video_channel_) {
1218 // |video_channel_| doesnt't exist. Probably because the remote end doesnt't 1219 // |video_channel_| doesnt't exist. Probably because the remote end doesnt't
1219 // support video. 1220 // support video.
1220 LOG(LS_WARNING) << "Video not used in this call."; 1221 LOG(LS_WARNING) << "Video not used in this call.";
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 2097
2097 if (!srtp_cipher.empty()) { 2098 if (!srtp_cipher.empty()) {
2098 metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher); 2099 metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher);
2099 } 2100 }
2100 if (!ssl_cipher.empty()) { 2101 if (!ssl_cipher.empty()) {
2101 metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher); 2102 metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher);
2102 } 2103 }
2103 } 2104 }
2104 2105
2105 } // namespace webrtc 2106 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | talk/media/base/fakemediaengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698