From 8c845cb6233e5d9c3a0e510d8553057470be3ee1 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Thu, 2 May 2013 15:28:02 +0000 Subject: [PATCH] Relax VoE's max packet length threshold. The earlier threshold would cause packets from a currently available codec (L16, 32 kHz, stereo) to be discarded. TESTED=voe_cmd_test using L16, 32 kHz, stereo now works properly. R=henrika@webrtc.org, turaj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1305008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3936 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/voice_engine/voe_network_impl.cc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/webrtc/voice_engine/voe_network_impl.cc b/webrtc/voice_engine/voe_network_impl.cc index 11e268067a..6b4b97734b 100644 --- a/webrtc/voice_engine/voe_network_impl.cc +++ b/webrtc/voice_engine/voe_network_impl.cc @@ -8,13 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_network_impl.h" +#include "webrtc/voice_engine/voe_network_impl.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "trace.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { @@ -95,10 +96,11 @@ int VoENetworkImpl::ReceivedRTPPacket(int channel, _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; } - if ((length < 12) || (length > 807)) + // L16 at 32 kHz, stereo, 10 ms frames (+12 byte RTP header) -> 1292 bytes + if ((length < 12) || (length > 1292)) { - _shared->SetLastError(VE_INVALID_PACKET, kTraceError, - "ReceivedRTPPacket() invalid packet length"); + _shared->SetLastError(VE_INVALID_PACKET); + LOG(LS_ERROR) << "Invalid packet length: " << length; return -1; } if (NULL == data)