Lock scheme #5: Applied the render queueing to the agc

webrtc/modules/audio_processing/agc/legacy/analog_agc.c

 /*
  *  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
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 232 matching lines @@
     {
         stt->inQueue = 2;
     }
 
     /* call VAD (use low band only) */
     WebRtcAgc_ProcessVad(&stt->vadMic, in_mic[0], samples);
 
     return 0;
 }
 
-int WebRtcAgc_AddFarend(void *state, const int16_t *in_far, size_t samples)
-{
-  LegacyAgc* stt;
-  stt = (LegacyAgc*)state;
+int WebRtcAgc_AddFarend(void *state, const int16_t *in_far, size_t samples) {
+  LegacyAgc* stt = (LegacyAgc*)state;
 
-    if (stt == NULL)
-    {
-        return -1;
-    }
+    int err =  WebRtcAgc_GetAddFarendError(state, samples);
 
-    if (stt->fs == 8000)
-    {
-        if (samples != 80)
-        {
-            return -1;
-        }
-    } else if (stt->fs == 16000 || stt->fs == 32000 || stt->fs == 48000)
-    {
-        if (samples != 160)
-        {
-            return -1;
-        }
-    } else
-    {
-        return -1;
-    }
+    if (err != 0)
+      return err;
 
     return WebRtcAgc_AddFarendToDigital(&stt->digitalAgc, in_far, samples);
 }
 
+int WebRtcAgc_GetAddFarendError(void *state, size_t samples) {

[hlundin-webrtc, 2015/11/05 13:01:09]

Take a LegacyAgc* as input argument instead, and skip the casting below.

[peah-webrtc, 2015/11/06 07:10:58]

That would be better, but since LegacyAgc is not available in gain_control.h, it
is not possible as this 
function is declared in gain_control.h.

This is not really needed though, since we don't really need to hide the state,
but I'd prefer to keep it as it is as it is in line with the rest of the code in
this file.

Is that ok?

[hlundin-webrtc, 2015/11/06 07:52:33]

Acknowledged.

[peah-webrtc, 2015/11/06 08:10:03]

Acknowledged.

+  LegacyAgc* stt;
+  stt = (LegacyAgc*)state;
+
+  if (stt == NULL)
+    return -1;
+
+  if (stt->fs == 8000) {
+    if (samples != 80)
+      return -1;
+  } else if (stt->fs == 16000 || stt->fs == 32000 || stt->fs == 48000) {
+    if (samples != 160)
+      return -1;
+  } else {
+    return -1;
+  }
+
+  return 0;
+}
+
 int WebRtcAgc_VirtualMic(void *agcInst, int16_t* const* in_near,
                          size_t num_bands, size_t samples, int32_t micLevelIn,
                          int32_t *micLevelOut)
 {
     int32_t tmpFlt, micLevelTmp, gainIdx;
     uint16_t gain;
     size_t ii, j;
     LegacyAgc* stt;
 
     uint32_t nrg;
@@ skipping 1217 matching lines @@
 #endif
         return -1;
     } else
     {
 #ifdef WEBRTC_AGC_DEBUG_DUMP
         fprintf(stt->fpt, "\n");
 #endif
         return 0;
     }
 }