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

Side by Side Diff: talk/session/media/channel.cc

Issue 1398823003: Remove MediaChannel::SetRemoteRenderer(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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/session/media/channel.h ('k') | no next file » | 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 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 Deinit(); 1289 Deinit();
1290 } 1290 }
1291 1291
1292 bool VoiceChannel::Init() { 1292 bool VoiceChannel::Init() {
1293 if (!BaseChannel::Init()) { 1293 if (!BaseChannel::Init()) {
1294 return false; 1294 return false;
1295 } 1295 }
1296 return true; 1296 return true;
1297 } 1297 }
1298 1298
1299 bool VoiceChannel::SetRemoteRenderer(uint32_t ssrc, AudioRenderer* renderer) {
1300 return InvokeOnWorker(Bind(&VoiceMediaChannel::SetRemoteRenderer,
1301 media_channel(), ssrc, renderer));
1302 }
1303
1304 bool VoiceChannel::SetAudioSend(uint32_t ssrc, 1299 bool VoiceChannel::SetAudioSend(uint32_t ssrc,
1305 bool enable, 1300 bool enable,
1306 const AudioOptions* options, 1301 const AudioOptions* options,
1307 AudioRenderer* renderer) { 1302 AudioRenderer* renderer) {
1308 return InvokeOnWorker(Bind(&VoiceMediaChannel::SetAudioSend, media_channel(), 1303 return InvokeOnWorker(Bind(&VoiceMediaChannel::SetAudioSend, media_channel(),
1309 ssrc, enable, options, renderer)); 1304 ssrc, enable, options, renderer));
1310 } 1305 }
1311 1306
1312 // TODO(juberti): Handle early media the right way. We should get an explicit 1307 // TODO(juberti): Handle early media the right way. We should get an explicit
1313 // ringing message telling us to start playing local ringback, which we cancel 1308 // ringing message telling us to start playing local ringback, which we cancel
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after
2292 return (data_channel_type_ == DCT_RTP); 2287 return (data_channel_type_ == DCT_RTP);
2293 } 2288 }
2294 2289
2295 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2290 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2296 rtc::TypedMessageData<uint32_t>* message = 2291 rtc::TypedMessageData<uint32_t>* message =
2297 new rtc::TypedMessageData<uint32_t>(sid); 2292 new rtc::TypedMessageData<uint32_t>(sid);
2298 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2293 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2299 } 2294 }
2300 2295
2301 } // namespace cricket 2296 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/session/media/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698