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

Side by Side Diff: webrtc/voice_engine/channel.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/test/mock_voice_engine.h ('k') | webrtc/voice_engine/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 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 virtual ~Channel(); 144 virtual ~Channel();
145 static int32_t CreateChannel( 145 static int32_t CreateChannel(
146 Channel*& channel, 146 Channel*& channel,
147 int32_t channelId, 147 int32_t channelId,
148 uint32_t instanceId, 148 uint32_t instanceId,
149 const VoEBase::ChannelConfig& config); 149 const VoEBase::ChannelConfig& config);
150 Channel(int32_t channelId, 150 Channel(int32_t channelId,
151 uint32_t instanceId, 151 uint32_t instanceId,
152 const VoEBase::ChannelConfig& config); 152 const VoEBase::ChannelConfig& config);
153 int32_t Init(); 153 int32_t Init();
154 void RegisterLegacyCodecs();
154 void Terminate(); 155 void Terminate();
155 int32_t SetEngineInformation(Statistics& engineStatistics, 156 int32_t SetEngineInformation(Statistics& engineStatistics,
156 OutputMixer& outputMixer, 157 OutputMixer& outputMixer,
157 ProcessThread& moduleProcessThread, 158 ProcessThread& moduleProcessThread,
158 AudioDeviceModule& audioDeviceModule, 159 AudioDeviceModule& audioDeviceModule,
159 VoiceEngineObserver* voiceEngineObserver, 160 VoiceEngineObserver* voiceEngineObserver,
160 rtc::CriticalSection* callbackCritSect); 161 rtc::CriticalSection* callbackCritSect);
161 int32_t UpdateLocalTimeStamp(); 162 int32_t UpdateLocalTimeStamp();
162 163
163 void SetSink(std::unique_ptr<AudioSinkInterface> sink); 164 void SetSink(std::unique_ptr<AudioSinkInterface> sink);
164 165
165 // TODO(ossu): Don't use! It's only here to confirm that the decoder factory 166 // TODO(ossu): Don't use! It's only here to confirm that the decoder factory
166 // passed into AudioReceiveStream is the same as the one set when creating the 167 // passed into AudioReceiveStream is the same as the one set when creating the
167 // ADM. Once Channel creation is moved into Audio{Send,Receive}Stream this can 168 // ADM. Once Channel creation is moved into Audio{Send,Receive}Stream this can
168 // go. 169 // go.
169 const rtc::scoped_refptr<AudioDecoderFactory>& GetAudioDecoderFactory() const; 170 const rtc::scoped_refptr<AudioDecoderFactory>& GetAudioDecoderFactory() const;
170 171
172 void SetReceiveCodecs(const std::map<int, SdpAudioFormat>& codecs);
173
171 // API methods 174 // API methods
172 175
173 // VoEBase 176 // VoEBase
174 int32_t StartPlayout(); 177 int32_t StartPlayout();
175 int32_t StopPlayout(); 178 int32_t StopPlayout();
176 int32_t StartSend(); 179 int32_t StartSend();
177 int32_t StopSend(); 180 int32_t StopSend();
178 int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer); 181 int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer);
179 int32_t DeRegisterVoiceEngineObserver(); 182 int32_t DeRegisterVoiceEngineObserver();
180 183
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 519
517 rtc::ThreadChecker construction_thread_; 520 rtc::ThreadChecker construction_thread_;
518 521
519 const bool use_twcc_plr_for_ana_; 522 const bool use_twcc_plr_for_ana_;
520 }; 523 };
521 524
522 } // namespace voe 525 } // namespace voe
523 } // namespace webrtc 526 } // namespace webrtc
524 527
525 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 528 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/test/mock_voice_engine.h ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698