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

Introduce NetEq::Config::ToString and use it in NetEq's constructor

Browse Source 
R=minyue@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/54559004

Cr-Commit-Position: refs/heads/master@{#9279}
This commit is contained in:
Henrik Lundin
2015-05-25 16:58:41 +02:00
parent e982a70ae3
commit 905495cfaa
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/audio_coding/neteq/interface/neteq.h
View File

@ -13,6 +13,7 @@
#include <string.h> // Provide access to size_t. #include <string.h> // Provide access to size_t.
#include <string>
#include <vector> #include <vector>
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
@ -81,6 +82,8 @@ class NetEq {
background_noise_mode(kBgnOff), background_noise_mode(kBgnOff),
playout_mode(kPlayoutOn) {} playout_mode(kPlayoutOn) {}
std::string ToString() const;
int sample_rate_hz; // Initial value. Will change with input data. int sample_rate_hz; // Initial value. Will change with input data.
bool enable_audio_classifier; bool enable_audio_classifier;
int max_packets_in_buffer; int max_packets_in_buffer;

12
webrtc/modules/audio_coding/neteq/neteq.cc
View File

@ -10,6 +10,8 @@
#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
#include <sstream>
#include "webrtc/modules/audio_coding/neteq/accelerate.h" #include "webrtc/modules/audio_coding/neteq/accelerate.h"
#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
#include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
@ -26,6 +28,16 @@
namespace webrtc { namespace webrtc {
std::string NetEq::Config::ToString() const {
std::stringstream ss;
ss << "sample_rate_hz=" << sample_rate_hz << ", enable_audio_classifier="
<< (enable_audio_classifier ? "true" : "false")
<< ", max_packets_in_buffer=" << max_packets_in_buffer
<< ", background_noise_mode=" << background_noise_mode
<< ", playout_mode=" << playout_mode;
return ss.str();
}
// Creates all classes needed and inject them into a new NetEqImpl object. // Creates all classes needed and inject them into a new NetEqImpl object.
// Return the new object. // Return the new object.
NetEq* NetEq::Create(const NetEq::Config& config) { NetEq* NetEq::Create(const NetEq::Config& config) {

1
webrtc/modules/audio_coding/neteq/neteq_impl.cc
View File

@ -94,6 +94,7 @@ NetEqImpl::NetEqImpl(const NetEq::Config& config,
playout_mode_(config.playout_mode), playout_mode_(config.playout_mode),
decoded_packet_sequence_number_(-1), decoded_packet_sequence_number_(-1),
decoded_packet_timestamp_(0) { decoded_packet_timestamp_(0) {
LOG(LS_INFO) << "NetEq config: " << config.ToString();
int fs = config.sample_rate_hz; int fs = config.sample_rate_hz;
if (fs != 8000 && fs != 16000 && fs != 32000 && fs != 48000) { if (fs != 8000 && fs != 16000 && fs != 32000 && fs != 48000) {
LOG(LS_ERROR) << "Sample rate " << fs << " Hz not supported. " << LOG(LS_ERROR) << "Sample rate " << fs << " Hz not supported. " <<