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

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

Issue 2686043006: WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType (Closed)
Patch Set: Discard packets when updating payload type map 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
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
11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_H_ 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/audio/audio_mixer.h" 16 #include "webrtc/api/audio/audio_mixer.h"
17 #include "webrtc/api/call/audio_sink.h" 17 #include "webrtc/api/call/audio_sink.h"
18 #include "webrtc/base/annotations.h"
18 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/optional.h" 20 #include "webrtc/base/optional.h"
20 #include "webrtc/common_audio/resampler/include/push_resampler.h" 21 #include "webrtc/common_audio/resampler/include/push_resampler.h"
21 #include "webrtc/common_types.h" 22 #include "webrtc/common_types.h"
22 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" 23 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
23 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 24 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
24 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 25 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
25 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 26 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
26 #include "webrtc/modules/audio_processing/rms_level.h" 27 #include "webrtc/modules/audio_processing/rms_level.h"
27 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" 28 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 int32_t UpdateLocalTimeStamp(); 160 int32_t UpdateLocalTimeStamp();
160 161
161 void SetSink(std::unique_ptr<AudioSinkInterface> sink); 162 void SetSink(std::unique_ptr<AudioSinkInterface> sink);
162 163
163 // TODO(ossu): Don't use! It's only here to confirm that the decoder factory 164 // TODO(ossu): Don't use! It's only here to confirm that the decoder factory
164 // passed into AudioReceiveStream is the same as the one set when creating the 165 // passed into AudioReceiveStream is the same as the one set when creating the
165 // ADM. Once Channel creation is moved into Audio{Send,Receive}Stream this can 166 // ADM. Once Channel creation is moved into Audio{Send,Receive}Stream this can
166 // go. 167 // go.
167 const rtc::scoped_refptr<AudioDecoderFactory>& GetAudioDecoderFactory() const; 168 const rtc::scoped_refptr<AudioDecoderFactory>& GetAudioDecoderFactory() const;
168 169
170 RTC_WARN_UNUSED_RESULT(bool)
171 SetReceiveCodecs(const std::map<int, SdpAudioFormat>& codecs);
172
169 // API methods 173 // API methods
170 174
171 // VoEBase 175 // VoEBase
172 int32_t StartPlayout(); 176 int32_t StartPlayout();
173 int32_t StopPlayout(); 177 int32_t StopPlayout();
174 int32_t StartSend(); 178 int32_t StartSend();
175 int32_t StopSend(); 179 int32_t StopSend();
176 int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer); 180 int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer);
177 int32_t DeRegisterVoiceEngineObserver(); 181 int32_t DeRegisterVoiceEngineObserver();
178 182
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 507 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
504 508
505 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 509 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
506 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 510 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
507 }; 511 };
508 512
509 } // namespace voe 513 } // namespace voe
510 } // namespace webrtc 514 } // namespace webrtc
511 515
512 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 516 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698