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

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

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Change when we fire callbacks for external media Created 5 years 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
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 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1315 if (!voice_channel_) { 1315 if (!voice_channel_) {
1316 LOG(LS_ERROR) << "SetAudioPlayoutVolume: No audio channel exists."; 1316 LOG(LS_ERROR) << "SetAudioPlayoutVolume: No audio channel exists.";
1317 return; 1317 return;
1318 } 1318 }
1319 1319
1320 if (!voice_channel_->SetOutputVolume(ssrc, volume)) { 1320 if (!voice_channel_->SetOutputVolume(ssrc, volume)) {
1321 ASSERT(false); 1321 ASSERT(false);
1322 } 1322 }
1323 } 1323 }
1324 1324
1325 void WebRtcSession::SetRawAudioSink(uint32_t ssrc,
1326 cricket::AudioRenderer::Sink* sink) {
1327 ASSERT(signaling_thread()->IsCurrent());
1328 if (!voice_channel_)
1329 return;
1330
1331 voice_channel_->SetRawAudioSink(ssrc, sink);
1332 }
1333
1325 bool WebRtcSession::SetCaptureDevice(uint32_t ssrc, 1334 bool WebRtcSession::SetCaptureDevice(uint32_t ssrc,
1326 cricket::VideoCapturer* camera) { 1335 cricket::VideoCapturer* camera) {
1327 ASSERT(signaling_thread()->IsCurrent()); 1336 ASSERT(signaling_thread()->IsCurrent());
1328 1337
1329 if (!video_channel_) { 1338 if (!video_channel_) {
1330 // |video_channel_| doesnt't exist. Probably because the remote end doesnt't 1339 // |video_channel_| doesnt't exist. Probably because the remote end doesnt't
1331 // support video. 1340 // support video.
1332 LOG(LS_WARNING) << "Video not used in this call."; 1341 LOG(LS_WARNING) << "Video not used in this call.";
1333 return false; 1342 return false;
1334 } 1343 }
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
2189 } 2198 }
2190 } 2199 }
2191 2200
2192 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2201 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2193 const rtc::SentPacket& sent_packet) { 2202 const rtc::SentPacket& sent_packet) {
2194 RTC_DCHECK(worker_thread()->IsCurrent()); 2203 RTC_DCHECK(worker_thread()->IsCurrent());
2195 media_controller_->call_w()->OnSentPacket(sent_packet); 2204 media_controller_->call_w()->OnSentPacket(sent_packet);
2196 } 2205 }
2197 2206
2198 } // namespace webrtc 2207 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698