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

Relax VoE's max packet length threshold.

Browse Source 
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
This commit is contained in:
andrew@webrtc.org
2013-05-02 15:28:02 +00:00
parent 258f55efc0
commit 8c845cb623
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/voice_engine/voe_network_impl.cc
View File

@@ -8,13 +8,14 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#include "voe_errors.h" #include "webrtc/voice_engine/channel.h"
#include "voice_engine_impl.h" #include "webrtc/voice_engine/include/voe_errors.h"
#include "webrtc/voice_engine/voice_engine_impl.h"
namespace webrtc namespace webrtc
{ {
@@ -95,10 +96,11 @@ int VoENetworkImpl::ReceivedRTPPacket(int channel,
_shared->SetLastError(VE_NOT_INITED, kTraceError); _shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1; 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, _shared->SetLastError(VE_INVALID_PACKET);
"ReceivedRTPPacket() invalid packet length"); LOG(LS_ERROR) << "Invalid packet length: " << length;
return -1; return -1;
} }
if (NULL == data) if (NULL == data)