generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improving error message from neteq_rtpplay

Browse Source 
If a packet with unknown RTP payload type is inserted, this CL
will make sure that the error message is a little more detailed
and gives a better understadning of what to do.

BUG=2692
R=tina.legrand@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7603 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2014-11-04 08:53:10 +00:00
parent a663d90ae3
commit b0f4b3da05
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,7 +248,7 @@ class NetEq {
// Returns the error code for the last occurred error. If no error has // Returns the error code for the last occurred error. If no error has
// occurred, 0 is returned. // occurred, 0 is returned.
virtual int LastError() = 0; virtual int LastError() const = 0;
// Returns the error code last returned by a decoder (audio or comfort noise). // Returns the error code last returned by a decoder (audio or comfort noise).
// When LastError() returns kDecoderErrorCode or kComfortNoiseErrorCode, check // When LastError() returns kDecoderErrorCode or kComfortNoiseErrorCode, check

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

@ -352,7 +352,7 @@ bool NetEqImpl::GetPlayoutTimestamp(uint32_t* timestamp) {
return true; return true;
} }
int NetEqImpl::LastError() { int NetEqImpl::LastError() const {
CriticalSectionScoped lock(crit_sect_.get()); CriticalSectionScoped lock(crit_sect_.get());
return error_code_; return error_code_;
} }

2
webrtc/modules/audio_coding/neteq/neteq_impl.h
View File

@ -178,7 +178,7 @@ class NetEqImpl : public webrtc::NetEq {
// Returns the error code for the last occurred error. If no error has // Returns the error code for the last occurred error. If no error has
// occurred, 0 is returned. // occurred, 0 is returned.
virtual int LastError() OVERRIDE; virtual int LastError() const OVERRIDE;
// Returns the error code last returned by a decoder (audio or comfort noise). // Returns the error code last returned by a decoder (audio or comfort noise).
// When LastError() returns kDecoderErrorCode or kComfortNoiseErrorCode, check // When LastError() returns kDecoderErrorCode or kComfortNoiseErrorCode, check

20
webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
View File

@ -289,8 +289,24 @@ int main(int argc, char* argv[]) {
static_cast<int>(payload_len), static_cast<int>(payload_len),
packet->time_ms() * sample_rate_hz / 1000); packet->time_ms() * sample_rate_hz / 1000);
if (error != NetEq::kOK) { if (error != NetEq::kOK) {
std::cerr << "InsertPacket returned error code " << neteq->LastError() if (neteq->LastError() == NetEq::kUnknownRtpPayloadType) {
<< std::endl; std::cerr << "RTP Payload type "
<< static_cast<int>(rtp_header.header.payloadType)
<< " is unknown." << std::endl;
std::cerr << "Use --codec_map to view default mapping." << std::endl;
std::cerr << "Use --helpshort for information on how to make custom "
"mappings." << std::endl;
} else {
std::cerr << "InsertPacket returned error code " << neteq->LastError()
<< std::endl;
std::cerr << "Header data:" << std::endl;
std::cerr << " PT = "
<< static_cast<int>(rtp_header.header.payloadType)
<< std::endl;
std::cerr << " SN = " << rtp_header.header.sequenceNumber
<< std::endl;
std::cerr << " TS = " << rtp_header.header.timestamp << std::endl;
}
} }
// Get next packet from file. // Get next packet from file.