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

Side by Side Diff: webrtc/voice_engine/channel_proxy.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) 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
11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
13 13
14 #include "webrtc/api/audio/audio_mixer.h" 14 #include "webrtc/api/audio/audio_mixer.h"
15 #include "webrtc/base/annotations.h"
15 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
16 #include "webrtc/base/race_checker.h" 17 #include "webrtc/base/race_checker.h"
17 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
18 #include "webrtc/voice_engine/channel_manager.h" 19 #include "webrtc/voice_engine/channel_manager.h"
19 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 20 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
20 21
21 #include <memory> 22 #include <memory>
22 #include <string> 23 #include <string>
23 #include <vector> 24 #include <vector>
24 25
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 virtual AudioDecodingCallStats GetDecodingCallStatistics() const; 76 virtual AudioDecodingCallStats GetDecodingCallStatistics() const;
76 virtual int GetSpeechOutputLevel() const; 77 virtual int GetSpeechOutputLevel() const;
77 virtual int GetSpeechOutputLevelFullRange() const; 78 virtual int GetSpeechOutputLevelFullRange() const;
78 virtual uint32_t GetDelayEstimate() const; 79 virtual uint32_t GetDelayEstimate() const;
79 virtual bool SetSendTelephoneEventPayloadType(int payload_type, 80 virtual bool SetSendTelephoneEventPayloadType(int payload_type,
80 int payload_frequency); 81 int payload_frequency);
81 virtual bool SendTelephoneEventOutband(int event, int duration_ms); 82 virtual bool SendTelephoneEventOutband(int event, int duration_ms);
82 virtual void SetBitrate(int bitrate_bps, int64_t probing_interval_ms); 83 virtual void SetBitrate(int bitrate_bps, int64_t probing_interval_ms);
83 virtual void SetRecPayloadType(int payload_type, 84 virtual void SetRecPayloadType(int payload_type,
84 const SdpAudioFormat& format); 85 const SdpAudioFormat& format);
86 virtual RTC_WARN_UNUSED_RESULT(bool)
87 SetReceiveCodecs(const std::map<int, SdpAudioFormat>& codecs);
85 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink); 88 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink);
86 virtual void SetInputMute(bool muted); 89 virtual void SetInputMute(bool muted);
87 virtual void RegisterExternalTransport(Transport* transport); 90 virtual void RegisterExternalTransport(Transport* transport);
88 virtual void DeRegisterExternalTransport(); 91 virtual void DeRegisterExternalTransport();
89 virtual void OnRtpPacket(const RtpPacketReceived& packet); 92 virtual void OnRtpPacket(const RtpPacketReceived& packet);
90 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length); 93 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length);
91 virtual const rtc::scoped_refptr<AudioDecoderFactory>& 94 virtual const rtc::scoped_refptr<AudioDecoderFactory>&
92 GetAudioDecoderFactory() const; 95 GetAudioDecoderFactory() const;
93 virtual void SetChannelOutputVolumeScaling(float scaling); 96 virtual void SetChannelOutputVolumeScaling(float scaling);
94 virtual void SetRtcEventLog(RtcEventLog* event_log); 97 virtual void SetRtcEventLog(RtcEventLog* event_log);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 rtc::RaceChecker audio_thread_race_checker_; 136 rtc::RaceChecker audio_thread_race_checker_;
134 rtc::RaceChecker video_capture_thread_race_checker_; 137 rtc::RaceChecker video_capture_thread_race_checker_;
135 ChannelOwner channel_owner_; 138 ChannelOwner channel_owner_;
136 139
137 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); 140 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
138 }; 141 };
139 } // namespace voe 142 } // namespace voe
140 } // namespace webrtc 143 } // namespace webrtc
141 144
142 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 145 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698