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

Remove webrtc::ProtoString.

Browse Source 
Bug: None
Change-Id: If99a977532eda41eada25f57ff0ff6fe17085986
Reviewed-on: https://webrtc-review.googlesource.com/c/122581
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26726}
This commit is contained in:
Mirko Bonadei
2019-02-16 09:59:29 +01:00
committed by Commit Bot
parent eaf6a8cbc8
commit e45c688e67
11 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/audio_coding/codecs/opus/audio_encoder_opus.cc
View File

@ -12,6 +12,7 @@
#include <algorithm>
#include <iterator>
#include <string>
#include <utility>
#include "absl/memory/memory.h"
@ -25,7 +26,6 @@
#include "rtc_base/numerics/exp_filter.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/safe_minmax.h"
#include "rtc_base/protobuf_utils.h"
#include "rtc_base/string_to_number.h"
#include "rtc_base/time_utils.h"
#include "system_wrappers/include/field_trial.h"
@ -443,7 +443,7 @@ AudioEncoderOpusImpl::AudioEncoderOpusImpl(const AudioEncoderOpusConfig& config,
: AudioEncoderOpusImpl(
config,
payload_type,
[this](const ProtoString& config_string, RtcEventLog* event_log) {
[this](const std::string& config_string, RtcEventLog* event_log) {
return DefaultAudioNetworkAdaptorCreator(config_string, event_log);
},
// We choose 5sec as initial time constant due to empirical data.
@ -870,7 +870,7 @@ void AudioEncoderOpusImpl::ApplyAudioNetworkAdaptor() {
std::unique_ptr<AudioNetworkAdaptor>
AudioEncoderOpusImpl::DefaultAudioNetworkAdaptorCreator(
const ProtoString& config_string,
const std::string& config_string,
RtcEventLog* event_log) const {
AudioNetworkAdaptorImpl::Config config;
config.event_log = event_log;

3
modules/audio_coding/codecs/opus/audio_encoder_opus.h
View File

@ -24,7 +24,6 @@
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "modules/audio_coding/codecs/opus/opus_interface.h"
#include "rtc_base/constructor_magic.h"
#include "rtc_base/protobuf_utils.h"
namespace webrtc {
@ -171,7 +170,7 @@ class AudioEncoderOpusImpl final : public AudioEncoder {
void ApplyAudioNetworkAdaptor();
std::unique_ptr<AudioNetworkAdaptor> DefaultAudioNetworkAdaptorCreator(
const ProtoString& config_string,
const std::string& config_string,
RtcEventLog* event_log) const;
void MaybeUpdateUplinkBandwidth();