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

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

Issue 1397773002: Change SetOutputScaling to set a single level, not left/right levels. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase+rename 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') | talk/session/media/channel_unittest.cc » ('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 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 } 1340 }
1341 1341
1342 bool VoiceChannel::InsertDtmf(uint32_t ssrc, 1342 bool VoiceChannel::InsertDtmf(uint32_t ssrc,
1343 int event_code, 1343 int event_code,
1344 int duration, 1344 int duration,
1345 int flags) { 1345 int flags) {
1346 return InvokeOnWorker(Bind(&VoiceChannel::InsertDtmf_w, this, 1346 return InvokeOnWorker(Bind(&VoiceChannel::InsertDtmf_w, this,
1347 ssrc, event_code, duration, flags)); 1347 ssrc, event_code, duration, flags));
1348 } 1348 }
1349 1349
1350 bool VoiceChannel::SetOutputScaling(uint32_t ssrc, double left, double right) { 1350 bool VoiceChannel::SetOutputVolume(uint32_t ssrc, double volume) {
1351 return InvokeOnWorker(Bind(&VoiceMediaChannel::SetOutputScaling, 1351 return InvokeOnWorker(Bind(&VoiceMediaChannel::SetOutputVolume,
1352 media_channel(), ssrc, left, right)); 1352 media_channel(), ssrc, volume));
1353 } 1353 }
1354 1354
1355 bool VoiceChannel::GetStats(VoiceMediaInfo* stats) { 1355 bool VoiceChannel::GetStats(VoiceMediaInfo* stats) {
1356 return InvokeOnWorker(Bind(&VoiceMediaChannel::GetStats, 1356 return InvokeOnWorker(Bind(&VoiceMediaChannel::GetStats,
1357 media_channel(), stats)); 1357 media_channel(), stats));
1358 } 1358 }
1359 1359
1360 void VoiceChannel::StartMediaMonitor(int cms) { 1360 void VoiceChannel::StartMediaMonitor(int cms) {
1361 media_monitor_.reset(new VoiceMediaMonitor(media_channel(), worker_thread(), 1361 media_monitor_.reset(new VoiceMediaMonitor(media_channel(), worker_thread(),
1362 rtc::Thread::Current())); 1362 rtc::Thread::Current()));
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
2292 return (data_channel_type_ == DCT_RTP); 2292 return (data_channel_type_ == DCT_RTP);
2293 } 2293 }
2294 2294
2295 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2295 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2296 rtc::TypedMessageData<uint32_t>* message = 2296 rtc::TypedMessageData<uint32_t>* message =
2297 new rtc::TypedMessageData<uint32_t>(sid); 2297 new rtc::TypedMessageData<uint32_t>(sid);
2298 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2298 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2299 } 2299 }
2300 2300
2301 } // namespace cricket 2301 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/session/media/channel.h ('k') | talk/session/media/channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698