From faa0ab85d74a57d94d393864d6ca5ec1ec592118 Mon Sep 17 00:00:00 2001 From: "tina.legrand@webrtc.org" Date: Wed, 18 Apr 2012 17:59:53 +0000 Subject: [PATCH] NetEQ stereo sync This CL allows NetEQ to do expand at startup, to make master and slave always go in sync. Before it could happen that master did merge, while slave performed an expand, leading to sync-problems between the channels. Updating DEPS for new reference files for unittest. BUG=410 TEST=neteq_unittests Review URL: https://webrtc-codereview.appspot.com/487005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2055 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- src/modules/audio_coding/neteq/signal_mcu.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index d2284aeedc..cf24a2c6b6 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { # External resources like video and audio files used for testing purposes. # Downloaded on demand when needed. - "webrtc_resources_revision": "8", + "webrtc_resources_revision": "9", } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/src/modules/audio_coding/neteq/signal_mcu.c b/src/modules/audio_coding/neteq/signal_mcu.c index 0180f38240..28dcf00dba 100644 --- a/src/modules/audio_coding/neteq/signal_mcu.c +++ b/src/modules/audio_coding/neteq/signal_mcu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -290,8 +290,7 @@ int WebRtcNetEQ_SignalMcu(MCUInst_t *inst) } /* New codec or big change in packet number? */ - if (((inst->new_codec) || (uw16_instr == BUFSTAT_REINIT)) && (uw16_instr - != BUFSTATS_DO_EXPAND)) + if ((inst->new_codec) || (uw16_instr == BUFSTAT_REINIT)) { CodecFuncInst_t cinst;