zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some media/ --> pc/ test dependencies

Browse Source 
pc/ depends on media/, so the media/ tests should not have circular
dependencies on pc/.

Bug: None
Change-Id: I849cefecd91e9cd11415bbd93465a98dead735d9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139361
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28115}
This commit is contained in:
Steve Anton
2019-05-29 18:40:55 -07:00
committed by Commit Bot
parent 57dc02a5c2
commit 220f4bec16
5 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/engine/webrtc_voice_engine.cc
View File

@ -609,10 +609,10 @@ webrtc::AudioState* WebRtcVoiceEngine::audio_state() {
return audio_state_.get();
}
AudioCodecs WebRtcVoiceEngine::CollectCodecs(
std::vector<AudioCodec> WebRtcVoiceEngine::CollectCodecs(
const std::vector<webrtc::AudioCodecSpec>& specs) const {
PayloadTypeMapper mapper;
AudioCodecs out;
std::vector<AudioCodec> out;
// Only generate CN payload types for these clockrates:
std::map<int, bool, std::greater<int>> generate_cn = {
@ -622,7 +622,7 @@ AudioCodecs WebRtcVoiceEngine::CollectCodecs(
{8000, false}, {16000, false}, {32000, false}, {48000, false}};
auto map_format = [&mapper](const webrtc::SdpAudioFormat& format,
AudioCodecs* out) {
std::vector<AudioCodec>* out) {
absl::optional<AudioCodec> opt_codec = mapper.ToAudioCodec(format);
if (opt_codec) {
if (out) {