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

Side by Side Diff: talk/media/webrtc/webrtcvoiceengine.h

Issue 1486123002: Return a copy of the supported RTP header extensions instead of a reference. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge Created 5 years 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 * 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 const AudioOptions& options); 73 const AudioOptions& options);
74 74
75 AudioOptions GetOptions() const { return options_; } 75 AudioOptions GetOptions() const { return options_; }
76 bool SetOptions(const AudioOptions& options); 76 bool SetOptions(const AudioOptions& options);
77 bool SetDevices(const Device* in_device, const Device* out_device); 77 bool SetDevices(const Device* in_device, const Device* out_device);
78 bool GetOutputVolume(int* level); 78 bool GetOutputVolume(int* level);
79 bool SetOutputVolume(int level); 79 bool SetOutputVolume(int level);
80 int GetInputLevel(); 80 int GetInputLevel();
81 81
82 const std::vector<AudioCodec>& codecs(); 82 const std::vector<AudioCodec>& codecs();
83 const std::vector<RtpHeaderExtension>& rtp_header_extensions() const; 83 RtpCapabilities GetCapabilities() const;
84 84
85 // For tracking WebRtc channels. Needed because we have to pause them 85 // For tracking WebRtc channels. Needed because we have to pause them
86 // all when switching devices. 86 // all when switching devices.
87 // May only be called by WebRtcVoiceMediaChannel. 87 // May only be called by WebRtcVoiceMediaChannel.
88 void RegisterChannel(WebRtcVoiceMediaChannel* channel); 88 void RegisterChannel(WebRtcVoiceMediaChannel* channel);
89 void UnregisterChannel(WebRtcVoiceMediaChannel* channel); 89 void UnregisterChannel(WebRtcVoiceMediaChannel* channel);
90 90
91 // Called by WebRtcVoiceMediaChannel to set a gain offset from 91 // Called by WebRtcVoiceMediaChannel to set a gain offset from
92 // the default AGC target level. 92 // the default AGC target level.
93 bool AdjustAgcLevel(int delta); 93 bool AdjustAgcLevel(int delta);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 rtc::ThreadChecker signal_thread_checker_; 133 rtc::ThreadChecker signal_thread_checker_;
134 rtc::ThreadChecker worker_thread_checker_; 134 rtc::ThreadChecker worker_thread_checker_;
135 135
136 // The primary instance of WebRtc VoiceEngine. 136 // The primary instance of WebRtc VoiceEngine.
137 rtc::scoped_ptr<VoEWrapper> voe_wrapper_; 137 rtc::scoped_ptr<VoEWrapper> voe_wrapper_;
138 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 138 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
139 // The external audio device manager 139 // The external audio device manager
140 webrtc::AudioDeviceModule* adm_ = nullptr; 140 webrtc::AudioDeviceModule* adm_ = nullptr;
141 bool is_dumping_aec_ = false; 141 bool is_dumping_aec_ = false;
142 std::vector<AudioCodec> codecs_; 142 std::vector<AudioCodec> codecs_;
143 std::vector<RtpHeaderExtension> rtp_header_extensions_;
144 std::vector<WebRtcVoiceMediaChannel*> channels_; 143 std::vector<WebRtcVoiceMediaChannel*> channels_;
145 webrtc::AgcConfig default_agc_config_; 144 webrtc::AgcConfig default_agc_config_;
146 145
147 webrtc::Config voe_config_; 146 webrtc::Config voe_config_;
148 147
149 bool initialized_ = false; 148 bool initialized_ = false;
150 AudioOptions options_; 149 AudioOptions options_;
151 150
152 // Cache received extended_filter_aec, delay_agnostic_aec and experimental_ns 151 // Cache received extended_filter_aec, delay_agnostic_aec and experimental_ns
153 // values, and apply them in case they are missing in the audio options. We 152 // values, and apply them in case they are missing in the audio options. We
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 287
289 class WebRtcAudioReceiveStream; 288 class WebRtcAudioReceiveStream;
290 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_; 289 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_;
291 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 290 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
292 291
293 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); 292 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel);
294 }; 293 };
295 } // namespace cricket 294 } // namespace cricket
296 295
297 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 296 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698