diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn index 4c2602ba49..1867d93970 100644 --- a/webrtc/modules/audio_coding/BUILD.gn +++ b/webrtc/modules/audio_coding/BUILD.gn @@ -1111,6 +1111,7 @@ rtc_source_set("neteq_tools_minimal") { "neteq/tools/audio_sink.h", "neteq/tools/encode_neteq_input.cc", "neteq/tools/encode_neteq_input.h", + "neteq/tools/neteq_input.cc", "neteq/tools/neteq_input.h", "neteq/tools/neteq_test.cc", "neteq/tools/neteq_test.h", diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_input.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_input.cc new file mode 100644 index 0000000000..752bb29a33 --- /dev/null +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_input.cc @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" + +#include + +namespace webrtc { +namespace test { + +std::string NetEqInput::PacketData::ToString() const { + std::stringstream ss; + ss << "{" + << "time_ms: " << static_cast(time_ms) << ", " + << "header: {" + << "pt: " << static_cast(header.payloadType) << ", " + << "sn: " << header.sequenceNumber << ", " + << "ts: " << header.timestamp << ", " + << "ssrc: " << header.ssrc << "}, " + << "payload bytes: " << payload.size() << "}"; + return ss.str(); +} + +} // namespace test +} // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_input.h b/webrtc/modules/audio_coding/neteq/tools/neteq_input.h index 3bb64a6ca0..a1e51a3045 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_input.h +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_input.h @@ -13,6 +13,7 @@ #include #include +#include #include "webrtc/base/buffer.h" #include "webrtc/base/optional.h" @@ -27,6 +28,8 @@ namespace test { class NetEqInput { public: struct PacketData { + std::string ToString() const; + RTPHeader header; rtc::Buffer payload; double time_ms; diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc index fb000252bc..7cca0fed8a 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc @@ -26,12 +26,8 @@ void DefaultNetEqTestErrorCallback::OnInsertPacketError( << std::endl; } else { std::cerr << "InsertPacket returned error code " << error_code << std::endl; - std::cerr << "Header data:" << std::endl; - std::cerr << " PT = " << static_cast(packet.header.payloadType) - << std::endl; - std::cerr << " SN = " << packet.header.sequenceNumber << std::endl; - std::cerr << " TS = " << packet.header.timestamp << std::endl; } + std::cerr << "Packet data: " << packet.ToString() << std::endl; FATAL(); }