zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve AV-sync when initial delay is set and NetEq has long buffer.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/1324006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3883 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org
2013-04-22 18:53:35 +00:00
parent 1b427719dc
commit 28d54ab18f
17 changed files with 522 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
webrtc/modules/audio_coding/neteq/webrtc_neteq.c
View File

@ -440,6 +440,9 @@ int WebRtcNetEQ_Init(void *inst, uint16_t fs)
NetEqMainInst->MCUinst.NoOfExpandCalls = 0;
NetEqMainInst->MCUinst.fs = fs;
/* Not in AV-sync by default. */
NetEqMainInst->MCUinst.av_sync = 0;
#ifdef NETEQ_ATEVENT_DECODE
/* init DTMF decoder */
ok = WebRtcNetEQ_DtmfDecoderInit(&(NetEqMainInst->MCUinst.DTMF_inst),fs,560);
@ -806,7 +809,7 @@ int WebRtcNetEQ_RecOut(void *inst, int16_t *pw16_outData, int16_t *pw16_len)
#endif
ok = WebRtcNetEQ_RecOutInternal(&NetEqMainInst->DSPinst, pw16_outData,
pw16_len, 0 /* not BGN only */);
pw16_len, 0 /* not BGN only */, NetEqMainInst->MCUinst.av_sync);
if (ok != 0)
{
NetEqMainInst->ErrorCode = -ok;
@ -887,7 +890,7 @@ int WebRtcNetEQ_RecOutMasterSlave(void *inst, int16_t *pw16_outData,
}
ok = WebRtcNetEQ_RecOutInternal(&NetEqMainInst->DSPinst, pw16_outData,
pw16_len, 0 /* not BGN only */);
pw16_len, 0 /* not BGN only */, NetEqMainInst->MCUinst.av_sync);
if (ok != 0)
{
NetEqMainInst->ErrorCode = -ok;
@ -958,7 +961,7 @@ int WebRtcNetEQ_RecOutNoDecode(void *inst, int16_t *pw16_outData,
#endif
ok = WebRtcNetEQ_RecOutInternal(&NetEqMainInst->DSPinst, pw16_outData,
pw16_len, 1 /* BGN only */);
pw16_len, 1 /* BGN only */, NetEqMainInst->MCUinst.av_sync);
if (ok != 0)
{
NetEqMainInst->ErrorCode = -ok;
@ -1186,7 +1189,8 @@ int WebRtcNetEQ_GetNetworkStatistics(void *inst, WebRtcNetEQ_NetworkStatistics *
/* Query packet buffer for number of samples. */
temp32 = WebRtcNetEQ_PacketBufferGetSize(
&NetEqMainInst->MCUinst.PacketBuffer_inst,
&NetEqMainInst->MCUinst.codec_DB_inst);
&NetEqMainInst->MCUinst.codec_DB_inst,
NetEqMainInst->MCUinst.av_sync);
/* Divide by sample rate.
* Calculate temp32 * 1000 / fs to get result in ms. */
@ -1671,3 +1675,21 @@ void WebRtcNetEQ_GetProcessingActivity(void *inst,
WebRtcNetEQ_ClearActivityStats(&NetEqMainInst->DSPinst);
}
void WebRtcNetEQ_EnableAVSync(void* inst, int enable) {
MainInst_t *NetEqMainInst = (MainInst_t*) inst;
NetEqMainInst->MCUinst.av_sync = (enable != 0) ? 1 : 0;
}
int WebRtcNetEQ_RecInSyncRTP(void* inst, WebRtcNetEQ_RTPInfo* rtp_info,
uint32_t receive_timestamp) {
MainInst_t *NetEqMainInst = (MainInst_t*) inst;
if (NetEqMainInst->MCUinst.av_sync == 0)
return -1;
if (WebRtcNetEQ_RecInRTPStruct(inst, rtp_info, kSyncPayload,
SYNC_PAYLOAD_LEN_BYTES,
receive_timestamp) < 0) {
return -1;
}
return SYNC_PAYLOAD_LEN_BYTES;
}