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

Side by Side Diff: talk/media/base/mediachannel.h

Issue 1325023005: Remove Channel::SetRingbackTone() and Channel::PlayRingbackTone(), and the code beneath it (within … (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 | « talk/media/base/fakemediaengine.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 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 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 // Get the current energy level of the stream sent to the speaker. 1079 // Get the current energy level of the stream sent to the speaker.
1080 virtual int GetOutputLevel() = 0; 1080 virtual int GetOutputLevel() = 0;
1081 // Get the time in milliseconds since last recorded keystroke, or negative. 1081 // Get the time in milliseconds since last recorded keystroke, or negative.
1082 virtual int GetTimeSinceLastTyping() = 0; 1082 virtual int GetTimeSinceLastTyping() = 0;
1083 // Temporarily exposed field for tuning typing detect options. 1083 // Temporarily exposed field for tuning typing detect options.
1084 virtual void SetTypingDetectionParameters(int time_window, 1084 virtual void SetTypingDetectionParameters(int time_window,
1085 int cost_per_typing, int reporting_threshold, int penalty_decay, 1085 int cost_per_typing, int reporting_threshold, int penalty_decay,
1086 int type_event_delay) = 0; 1086 int type_event_delay) = 0;
1087 // Set left and right scale for speaker output volume of the specified ssrc. 1087 // Set left and right scale for speaker output volume of the specified ssrc.
1088 virtual bool SetOutputScaling(uint32 ssrc, double left, double right) = 0; 1088 virtual bool SetOutputScaling(uint32 ssrc, double left, double right) = 0;
1089 // Specifies a ringback tone to be played during call setup.
1090 virtual bool SetRingbackTone(const char *buf, int len) = 0;
1091 // Plays or stops the aforementioned ringback tone
1092 virtual bool PlayRingbackTone(uint32 ssrc, bool play, bool loop) = 0;
1093 // Returns if the telephone-event has been negotiated. 1089 // Returns if the telephone-event has been negotiated.
1094 virtual bool CanInsertDtmf() { return false; } 1090 virtual bool CanInsertDtmf() { return false; }
1095 // Send and/or play a DTMF |event| according to the |flags|. 1091 // Send and/or play a DTMF |event| according to the |flags|.
1096 // The DTMF out-of-band signal will be used on sending. 1092 // The DTMF out-of-band signal will be used on sending.
1097 // The |ssrc| should be either 0 or a valid send stream ssrc. 1093 // The |ssrc| should be either 0 or a valid send stream ssrc.
1098 // The valid value for the |event| are 0 to 15 which corresponding to 1094 // The valid value for the |event| are 0 to 15 which corresponding to
1099 // DTMF event 0-9, *, #, A-D. 1095 // DTMF event 0-9, *, #, A-D.
1100 virtual bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) = 0; 1096 virtual bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) = 0;
1101 // Gets quality stats for the channel. 1097 // Gets quality stats for the channel.
1102 virtual bool GetStats(VoiceMediaInfo* info) = 0; 1098 virtual bool GetStats(VoiceMediaInfo* info) = 0;
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 // Signal when the media channel is ready to send the stream. Arguments are: 1293 // Signal when the media channel is ready to send the stream. Arguments are:
1298 // writable(bool) 1294 // writable(bool)
1299 sigslot::signal1<bool> SignalReadyToSend; 1295 sigslot::signal1<bool> SignalReadyToSend;
1300 // Signal for notifying that the remote side has closed the DataChannel. 1296 // Signal for notifying that the remote side has closed the DataChannel.
1301 sigslot::signal1<uint32> SignalStreamClosedRemotely; 1297 sigslot::signal1<uint32> SignalStreamClosedRemotely;
1302 }; 1298 };
1303 1299
1304 } // namespace cricket 1300 } // namespace cricket
1305 1301
1306 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1302 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « talk/media/base/fakemediaengine.h ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698