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

NetEq4 fails if the first packets inserted in are out-of-band DTMFs.

Browse Source 
I had to take few steps to solve this issue. I have comments on places I made cahanges to clarify why I did the change.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3733 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org
2013-03-27 18:31:42 +00:00
parent e1a7193869
commit 4d06db557a
1 changed files with 79 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
webrtc/modules/audio_coding/neteq4/neteq_impl.cc
View File

@@ -397,6 +397,9 @@ int NetEqImpl::InsertPacketInternal(const WebRtcRTPHeader& rtp_header,
// Store new SSRC. // Store new SSRC.
ssrc_ = main_header.ssrc; ssrc_ = main_header.ssrc;
// Update audio buffer timestamp.
sync_buffer_->IncreaseEndTimestamp(main_header.timestamp - timestamp_);
// Update codecs. // Update codecs.
timestamp_ = main_header.timestamp; timestamp_ = main_header.timestamp;
current_rtp_payload_type_ = main_header.payloadType; current_rtp_payload_type_ = main_header.payloadType;
@@ -830,27 +833,21 @@ int NetEqImpl::GetDecision(Operations* operation,
if (new_codec_ || *operation == kUndefined) { if (new_codec_ || *operation == kUndefined) {
// The only valid reason to get kUndefined is that new_codec_ is set. // The only valid reason to get kUndefined is that new_codec_ is set.
assert(new_codec_); assert(new_codec_);
if (*play_dtmf && !header) {
timestamp_ = dtmf_event->timestamp;
} else {
assert(header); assert(header);
if (!header) { if (!header) {
LOG_F(LS_ERROR) << "Packet missing where it shouldn't."; LOG_F(LS_ERROR) << "Packet missing where it shouldn't.";
return -1; return -1;
} }
timestamp_ = header->timestamp; timestamp_ = header->timestamp;
// Adjust |sync_buffer_| timestamp before setting |end_timestamp| to the
// new value.
sync_buffer_->IncreaseEndTimestamp(timestamp_ - end_timestamp);
end_timestamp = header->timestamp;
new_codec_ = false;
decision_logic_->SoftReset();
buffer_level_filter_->Reset();
delay_manager_->Reset();
stats_.ResetMcu();
if (*operation == kRfc3389CngNoPacket if (*operation == kRfc3389CngNoPacket
#ifndef LEGACY_BITEXACT #ifndef LEGACY_BITEXACT
// Without this check, it can happen that a non-CNG packet is sent to // Without this check, it can happen that a non-CNG packet is sent to
// the CNG decoder as if it was a SID frame. This is clearly a bug, // the CNG decoder as if it was a SID frame. This is clearly a bug,
// but is kept for now to maintain bit-exactness with the test vectors. // but is kept for now to maintain bit-exactness with the test
// vectors.
&& decoder_database_->IsComfortNoise(header->payloadType) && decoder_database_->IsComfortNoise(header->payloadType)
#endif #endif
) { ) {
@@ -861,6 +858,16 @@ int NetEqImpl::GetDecision(Operations* operation,
*operation = kNormal; *operation = kNormal;
} }
} }
// Adjust |sync_buffer_| timestamp before setting |end_timestamp| to the
// new value.
sync_buffer_->IncreaseEndTimestamp(timestamp_ - end_timestamp);
end_timestamp = timestamp_;
new_codec_ = false;
decision_logic_->SoftReset();
buffer_level_filter_->Reset();
delay_manager_->Reset();
stats_.ResetMcu();
}
int required_samples = output_size_samples_; int required_samples = output_size_samples_;
const int samples_10_ms = 80 * fs_mult_; const int samples_10_ms = 80 * fs_mult_;
@@ -1481,13 +1488,22 @@ void NetEqImpl::DoCodecInternalCng(
int NetEqImpl::DoDtmf(const DtmfEvent& dtmf_event, bool* play_dtmf, int NetEqImpl::DoDtmf(const DtmfEvent& dtmf_event, bool* play_dtmf,
AudioMultiVector<int16_t>* algorithm_buffer) { AudioMultiVector<int16_t>* algorithm_buffer) {
bool dtmf_switch = false; // This block of the code and the block further down, handling |dtmf_switch|
if ((last_mode_ != kModeDtmf) && !dtmf_tone_generator_->initialized()) { // are commented out. Otherwise playing out-of-band DTMF would fail in VoE
// Special case; see below. // test, DtmfTest.ManualSuccessfullySendsOutOfBandTelephoneEvents. This is
// We must catch this before calling Generate, since |initialized| is // equivalent to |dtmf_switch| always be false.
// modified in that call. //
dtmf_switch = true; // See http://webrtc-codereview.appspot.com/1195004/ for discussion
} // On this issue. This change might cause some glitches at the point of
// switch from audio to DTMF. Issue 1545 is filed to track this.
//
// bool dtmf_switch = false;
// if ((last_mode_ != kModeDtmf) && dtmf_tone_generator_->initialized()) {
// // Special case; see below.
// // We must catch this before calling Generate, since |initialized| is
// // modified in that call.
// dtmf_switch = true;
// }
int dtmf_return_value = 0; int dtmf_return_value = 0;
if (!dtmf_tone_generator_->initialized()) { if (!dtmf_tone_generator_->initialized()) {
@@ -1495,47 +1511,51 @@ int NetEqImpl::DoDtmf(const DtmfEvent& dtmf_event, bool* play_dtmf,
dtmf_return_value = dtmf_tone_generator_->Init(fs_hz_, dtmf_event.event_no, dtmf_return_value = dtmf_tone_generator_->Init(fs_hz_, dtmf_event.event_no,
dtmf_event.volume); dtmf_event.volume);
} }
if (dtmf_return_value == 0) { if (dtmf_return_value == 0) {
// Generate DTMF signal. // Generate DTMF signal.
dtmf_return_value = dtmf_tone_generator_->Generate(output_size_samples_, dtmf_return_value = dtmf_tone_generator_->Generate(output_size_samples_,
algorithm_buffer); algorithm_buffer);
} }
if (dtmf_return_value < 0) { if (dtmf_return_value < 0) {
algorithm_buffer->Zeros(output_size_samples_); algorithm_buffer->Zeros(output_size_samples_);
return dtmf_return_value; return dtmf_return_value;
} }
if (dtmf_switch) { // if (dtmf_switch) {
// This is the special case where the previous operation was DTMF overdub, // // This is the special case where the previous operation was DTMF
// but the current instruction is "regular" DTMF. We must make sure that the // // overdub, but the current instruction is "regular" DTMF. We must make
// DTMF does not have any discontinuities. The first DTMF sample that we // // sure that the DTMF does not have any discontinuities. The first DTMF
// generate now must be played out immediately, wherefore it must be copied // // sample that we generate now must be played out immediately, therefore
// to the speech buffer. // // it must be copied to the speech buffer.
// TODO(hlundin): This code seems incorrect. (Legacy.) Write test and // // TODO(hlundin): This code seems incorrect. (Legacy.) Write test and
// verify correct operation. // // verify correct operation.
assert(false); // assert(false);
// Must generate enough data to replace all of the |sync_buffer_| "future". // // Must generate enough data to replace all of the |sync_buffer_|
int required_length = sync_buffer_->FutureLength(); // // "future".
assert(dtmf_tone_generator_->initialized()); // int required_length = sync_buffer_->FutureLength();
dtmf_return_value = dtmf_tone_generator_->Generate(required_length, // assert(dtmf_tone_generator_->initialized());
algorithm_buffer); // dtmf_return_value = dtmf_tone_generator_->Generate(required_length,
assert((size_t) required_length == algorithm_buffer->Size()); // algorithm_buffer);
if (dtmf_return_value < 0) { // assert((size_t) required_length == algorithm_buffer->Size());
algorithm_buffer->Zeros(output_size_samples_); // if (dtmf_return_value < 0) {
return dtmf_return_value; // algorithm_buffer->Zeros(output_size_samples_);
} // return dtmf_return_value;
// }
// Overwrite the "future" part of the speech buffer with the new DTMF data. //
// TODO(hlundin): It seems that this overwriting has gone lost. // // Overwrite the "future" part of the speech buffer with the new DTMF
// Not adapted for multi-channel yet. // // data.
assert(algorithm_buffer->Channels() == 1); // // TODO(hlundin): It seems that this overwriting has gone lost.
if (algorithm_buffer->Channels() != 1) { // // Not adapted for multi-channel yet.
LOG(LS_WARNING) << "DTMF not supported for more than one channel"; // assert(algorithm_buffer->Channels() == 1);
return kStereoNotSupported; // if (algorithm_buffer->Channels() != 1) {
} // LOG(LS_WARNING) << "DTMF not supported for more than one channel";
// Shuffle the remaining data to the beginning of algorithm buffer. // return kStereoNotSupported;
algorithm_buffer->PopFront(sync_buffer_->FutureLength()); // }
} // // Shuffle the remaining data to the beginning of algorithm buffer.
// algorithm_buffer->PopFront(sync_buffer_->FutureLength());
// }
sync_buffer_->IncreaseEndTimestamp(output_size_samples_); sync_buffer_->IncreaseEndTimestamp(output_size_samples_);
expand_->Reset(); expand_->Reset();