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

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

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/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | talk/session/media/channel.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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 // TODO(ronghuawu): Replace PressDTMF with InsertDtmf. 358 // TODO(ronghuawu): Replace PressDTMF with InsertDtmf.
359 bool PressDTMF(int digit, bool playout); 359 bool PressDTMF(int digit, bool playout);
360 // Returns if the telephone-event has been negotiated. 360 // Returns if the telephone-event has been negotiated.
361 bool CanInsertDtmf(); 361 bool CanInsertDtmf();
362 // Send and/or play a DTMF |event| according to the |flags|. 362 // Send and/or play a DTMF |event| according to the |flags|.
363 // The DTMF out-of-band signal will be used on sending. 363 // The DTMF out-of-band signal will be used on sending.
364 // The |ssrc| should be either 0 or a valid send stream ssrc. 364 // The |ssrc| should be either 0 or a valid send stream ssrc.
365 // The valid value for the |event| are 0 which corresponding to DTMF 365 // The valid value for the |event| are 0 which corresponding to DTMF
366 // event 0-9, *, #, A-D. 366 // event 0-9, *, #, A-D.
367 bool InsertDtmf(uint32_t ssrc, int event_code, int duration, int flags); 367 bool InsertDtmf(uint32_t ssrc, int event_code, int duration, int flags);
368 bool SetOutputScaling(uint32_t ssrc, double left, double right); 368 bool SetOutputVolume(uint32_t ssrc, double volume);
369 // Get statistics about the current media session. 369 // Get statistics about the current media session.
370 bool GetStats(VoiceMediaInfo* stats); 370 bool GetStats(VoiceMediaInfo* stats);
371 371
372 // Monitoring functions 372 // Monitoring functions
373 sigslot::signal2<VoiceChannel*, const std::vector<ConnectionInfo>&> 373 sigslot::signal2<VoiceChannel*, const std::vector<ConnectionInfo>&>
374 SignalConnectionMonitor; 374 SignalConnectionMonitor;
375 375
376 void StartMediaMonitor(int cms); 376 void StartMediaMonitor(int cms);
377 void StopMediaMonitor(); 377 void StopMediaMonitor();
378 sigslot::signal2<VoiceChannel*, const VoiceMediaInfo&> SignalMediaMonitor; 378 sigslot::signal2<VoiceChannel*, const VoiceMediaInfo&> SignalMediaMonitor;
(...skipping 16 matching lines...) Expand all
395 virtual void ChangeState(); 395 virtual void ChangeState();
396 virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc); 396 virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc);
397 virtual bool SetLocalContent_w(const MediaContentDescription* content, 397 virtual bool SetLocalContent_w(const MediaContentDescription* content,
398 ContentAction action, 398 ContentAction action,
399 std::string* error_desc); 399 std::string* error_desc);
400 virtual bool SetRemoteContent_w(const MediaContentDescription* content, 400 virtual bool SetRemoteContent_w(const MediaContentDescription* content,
401 ContentAction action, 401 ContentAction action,
402 std::string* error_desc); 402 std::string* error_desc);
403 void HandleEarlyMediaTimeout(); 403 void HandleEarlyMediaTimeout();
404 bool InsertDtmf_w(uint32_t ssrc, int event, int duration, int flags); 404 bool InsertDtmf_w(uint32_t ssrc, int event, int duration, int flags);
405 bool SetOutputScaling_w(uint32_t ssrc, double left, double right); 405 bool SetOutputVolume_w(uint32_t ssrc, double volume);
406 bool GetStats_w(VoiceMediaInfo* stats); 406 bool GetStats_w(VoiceMediaInfo* stats);
407 407
408 virtual void OnMessage(rtc::Message* pmsg); 408 virtual void OnMessage(rtc::Message* pmsg);
409 virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const; 409 virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;
410 virtual void OnConnectionMonitorUpdate( 410 virtual void OnConnectionMonitorUpdate(
411 ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos); 411 ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);
412 virtual void OnMediaMonitorUpdate( 412 virtual void OnMediaMonitorUpdate(
413 VoiceMediaChannel* media_channel, const VoiceMediaInfo& info); 413 VoiceMediaChannel* media_channel, const VoiceMediaInfo& info);
414 void OnAudioMonitorUpdate(AudioMonitor* monitor, const AudioInfo& info); 414 void OnAudioMonitorUpdate(AudioMonitor* monitor, const AudioInfo& info);
415 415
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 // SetSendParameters. 637 // SetSendParameters.
638 DataSendParameters last_send_params_; 638 DataSendParameters last_send_params_;
639 // Last DataRecvParameters sent down to the media_channel() via 639 // Last DataRecvParameters sent down to the media_channel() via
640 // SetRecvParameters. 640 // SetRecvParameters.
641 DataRecvParameters last_recv_params_; 641 DataRecvParameters last_recv_params_;
642 }; 642 };
643 643
644 } // namespace cricket 644 } // namespace cricket
645 645
646 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 646 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | talk/session/media/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698