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

Side by Side Diff: webrtc/voice_engine/channel_proxy.h

Issue 2686043006: WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType (Closed)
Patch Set: rebase Created 3 years, 9 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 | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_proxy.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 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 virtual AudioDecodingCallStats GetDecodingCallStatistics() const; 75 virtual AudioDecodingCallStats GetDecodingCallStatistics() const;
76 virtual int GetSpeechOutputLevel() const; 76 virtual int GetSpeechOutputLevel() const;
77 virtual int GetSpeechOutputLevelFullRange() const; 77 virtual int GetSpeechOutputLevelFullRange() const;
78 virtual uint32_t GetDelayEstimate() const; 78 virtual uint32_t GetDelayEstimate() const;
79 virtual bool SetSendTelephoneEventPayloadType(int payload_type, 79 virtual bool SetSendTelephoneEventPayloadType(int payload_type,
80 int payload_frequency); 80 int payload_frequency);
81 virtual bool SendTelephoneEventOutband(int event, int duration_ms); 81 virtual bool SendTelephoneEventOutband(int event, int duration_ms);
82 virtual void SetBitrate(int bitrate_bps, int64_t probing_interval_ms); 82 virtual void SetBitrate(int bitrate_bps, int64_t probing_interval_ms);
83 virtual void SetRecPayloadType(int payload_type, 83 virtual void SetRecPayloadType(int payload_type,
84 const SdpAudioFormat& format); 84 const SdpAudioFormat& format);
85 virtual void SetReceiveCodecs(const std::map<int, SdpAudioFormat>& codecs);
85 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink); 86 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink);
86 virtual void SetInputMute(bool muted); 87 virtual void SetInputMute(bool muted);
87 virtual void RegisterExternalTransport(Transport* transport); 88 virtual void RegisterExternalTransport(Transport* transport);
88 virtual void DeRegisterExternalTransport(); 89 virtual void DeRegisterExternalTransport();
89 virtual void OnRtpPacket(const RtpPacketReceived& packet); 90 virtual void OnRtpPacket(const RtpPacketReceived& packet);
90 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length); 91 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length);
91 virtual const rtc::scoped_refptr<AudioDecoderFactory>& 92 virtual const rtc::scoped_refptr<AudioDecoderFactory>&
92 GetAudioDecoderFactory() const; 93 GetAudioDecoderFactory() const;
93 virtual void SetChannelOutputVolumeScaling(float scaling); 94 virtual void SetChannelOutputVolumeScaling(float scaling);
94 virtual void SetRtcEventLog(RtcEventLog* event_log); 95 virtual void SetRtcEventLog(RtcEventLog* event_log);
(...skipping 17 matching lines...) Expand all
112 virtual bool GetSendCodec(CodecInst* codec_inst) const; 113 virtual bool GetSendCodec(CodecInst* codec_inst) const;
113 virtual bool SetVADStatus(bool enable); 114 virtual bool SetVADStatus(bool enable);
114 virtual bool SetCodecFECStatus(bool enable); 115 virtual bool SetCodecFECStatus(bool enable);
115 virtual bool SetOpusDtx(bool enable); 116 virtual bool SetOpusDtx(bool enable);
116 virtual bool SetOpusMaxPlaybackRate(int frequency_hz); 117 virtual bool SetOpusMaxPlaybackRate(int frequency_hz);
117 virtual bool SetSendCodec(const CodecInst& codec_inst); 118 virtual bool SetSendCodec(const CodecInst& codec_inst);
118 virtual bool SetSendCNPayloadType(int type, PayloadFrequencies frequency); 119 virtual bool SetSendCNPayloadType(int type, PayloadFrequencies frequency);
119 virtual void OnTwccBasedUplinkPacketLossRate(float packet_loss_rate); 120 virtual void OnTwccBasedUplinkPacketLossRate(float packet_loss_rate);
120 virtual void OnRecoverableUplinkPacketLossRate( 121 virtual void OnRecoverableUplinkPacketLossRate(
121 float recoverable_packet_loss_rate); 122 float recoverable_packet_loss_rate);
123 virtual void RegisterLegacyCodecs();
122 124
123 private: 125 private:
124 Channel* channel() const; 126 Channel* channel() const;
125 127
126 // Thread checkers document and lock usage of some methods on voe::Channel to 128 // Thread checkers document and lock usage of some methods on voe::Channel to
127 // specific threads we know about. The goal is to eventually split up 129 // specific threads we know about. The goal is to eventually split up
128 // voe::Channel into parts with single-threaded semantics, and thereby reduce 130 // voe::Channel into parts with single-threaded semantics, and thereby reduce
129 // the need for locks. 131 // the need for locks.
130 rtc::ThreadChecker worker_thread_checker_; 132 rtc::ThreadChecker worker_thread_checker_;
131 rtc::ThreadChecker module_process_thread_checker_; 133 rtc::ThreadChecker module_process_thread_checker_;
132 // Methods accessed from audio and video threads are checked for sequential- 134 // Methods accessed from audio and video threads are checked for sequential-
133 // only access. We don't necessarily own and control these threads, so thread 135 // only access. We don't necessarily own and control these threads, so thread
134 // checkers cannot be used. E.g. Chromium may transfer "ownership" from one 136 // checkers cannot be used. E.g. Chromium may transfer "ownership" from one
135 // audio thread to another, but access is still sequential. 137 // audio thread to another, but access is still sequential.
136 rtc::RaceChecker audio_thread_race_checker_; 138 rtc::RaceChecker audio_thread_race_checker_;
137 rtc::RaceChecker video_capture_thread_race_checker_; 139 rtc::RaceChecker video_capture_thread_race_checker_;
138 ChannelOwner channel_owner_; 140 ChannelOwner channel_owner_;
139 141
140 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); 142 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
141 }; 143 };
142 } // namespace voe 144 } // namespace voe
143 } // namespace webrtc 145 } // namespace webrtc
144 146
145 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 147 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698