Remove last mentions of speex from webrtc/modules

webrtc/modules/audio_coding/neteq/test/RTPencode.cc

 /*
  *  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.
  */
 
-// TODO(hlundin): Reformat file to meet style guide.
+// TODO(henrik.lundin): Refactor or replace all of this application.
 
 /* header includes */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef WIN32
 #include <winsock2.h>
 #endif
 #ifdef WEBRTC_LINUX
 #include <netinet/in.h>
@@ skipping 167 matching lines @@
 #include "G726Interface.h"
 #endif
 #ifdef CODEC_GSMFR
 #include "GSMFRInterface.h"
 #include "GSMFRCreation.h"
 #endif
 #if (defined(CODEC_CNGCODEC8) || defined(CODEC_CNGCODEC16) || \
      defined(CODEC_CNGCODEC32) || defined(CODEC_CNGCODEC48))
 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
 #endif
-#if ((defined CODEC_SPEEX_8) || (defined CODEC_SPEEX_16))
-#include "SpeexInterface.h"
-#endif
 #ifdef CODEC_OPUS
 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
 #endif
 
 /***********************************/
 /* Global codec instance variables */
 /***********************************/
 
 WebRtcVadInst* VAD_inst[2];
 
@@ skipping 48 matching lines @@
 #ifdef CODEC_ISAC_SWB
 ISACStruct* ISACSWB_inst[2];
 #endif
 #ifdef CODEC_GSMFR
 GSMFR_encinst_t* GSMFRenc_inst[2];
 #endif
 #if (defined(CODEC_CNGCODEC8) || defined(CODEC_CNGCODEC16) || \
      defined(CODEC_CNGCODEC32) || defined(CODEC_CNGCODEC48))
 webrtc::ComfortNoiseEncoder *CNG_encoder[2];
 #endif
-#ifdef CODEC_SPEEX_8
-SPEEX_encinst_t* SPEEX8enc_inst[2];
-#endif
-#ifdef CODEC_SPEEX_16
-SPEEX_encinst_t* SPEEX16enc_inst[2];
-#endif
 #ifdef CODEC_OPUS
 OpusEncInst* opus_inst[2];
 #endif
 
 int main(int argc, char* argv[]) {
   size_t packet_size;
   int fs;
   webrtc::NetEqDecoder usedCodec;
   int payloadType;
   int bitrate = 0;
@@ skipping 134 matching lines @@
     printf("             : isacswb       iSAC SWB (32kHz and 32.0-52.0 kbps). "
            "To set rate specify a rate parameter as last parameter\n");
 #endif
 #ifdef CODEC_GSMFR
     printf("             : gsmfr        GSM FR codec (8kHz and 13kbps)\n");
 #endif
 #ifdef CODEC_G722
     printf("             : g722         g722 coder (16kHz) (the 64kbps "
            "version)\n");
 #endif
-#ifdef CODEC_SPEEX_8
-    printf("             : speex8       speex coder (8 kHz)\n");
-#endif
-#ifdef CODEC_SPEEX_16
-    printf("             : speex16      speex coder (16 kHz)\n");
-#endif
 #ifdef CODEC_RED
 #ifdef CODEC_G711
     printf("             : red_pcm      Redundancy RTP packet with 2*G711A "
            "frames\n");
 #endif
 #ifdef CODEC_ISAC
     printf("             : red_isac     Redundancy RTP packet with 2*iSAC "
            "frames\n");
 #endif
 #endif  // CODEC_RED
@@ skipping 559 matching lines @@
             exit(0);
           }
           WebRtcG7291_EncoderInit(G729_1_inst[k], bitrate, 0 /* flag8kHz*/,
                                   0 /*flagG729mode*/);
         } else {
           printf("\nError - G.729.1 input is always 16 kHz \n");
           exit(0);
         }
         break;
 #endif
-#ifdef CODEC_SPEEX_8
-      case webrtc::kDecoderSPEEX_8:
-        if (sampfreq == 8000) {
-          if ((enc_frameSize == 160) || (enc_frameSize == 320) ||
-              (enc_frameSize == 480)) {
-            ok = WebRtcSpeex_CreateEnc(&SPEEX8enc_inst[k], sampfreq);
-            if (ok != 0) {
-              printf("Error: Couldn't allocate memory for Speex encoding "
-                     "instance\n");
-              exit(0);
-            }
-          } else {
-            printf("\nError: Speex only supports 20, 40, and 60 ms!!\n\n");
-            exit(0);
-          }
-          if ((vad == 1) && (enc_frameSize != 160)) {
-            printf("\nError - This simulation only supports VAD for Speex at "
-                   "20ms packets (not %" PRIuS "ms)\n",
-                (enc_frameSize >> 3));
-            vad = 0;
-          }
-          ok = WebRtcSpeex_EncoderInit(SPEEX8enc_inst[k], 0 /*vbr*/,
-                                       3 /*complexity*/, vad);
-          if (ok != 0)
-            exit(0);
-        } else {
-          printf("\nError - Speex8 called with sample frequency other than 8 "
-                 "kHz.\n\n");
-        }
-        break;
-#endif
-#ifdef CODEC_SPEEX_16
-      case webrtc::kDecoderSPEEX_16:
-        if (sampfreq == 16000) {
-          if ((enc_frameSize == 320) || (enc_frameSize == 640) ||
-              (enc_frameSize == 960)) {
-            ok = WebRtcSpeex_CreateEnc(&SPEEX16enc_inst[k], sampfreq);
-            if (ok != 0) {
-              printf("Error: Couldn't allocate memory for Speex encoding "
-                     "instance\n");
-              exit(0);
-            }
-          } else {
-            printf("\nError: Speex only supports 20, 40, and 60 ms!!\n\n");
-            exit(0);
-          }
-          if ((vad == 1) && (enc_frameSize != 320)) {
-            printf("\nError - This simulation only supports VAD for Speex at "
-                   "20ms packets (not %" PRIuS "ms)\n",
-                (enc_frameSize >> 4));
-            vad = 0;
-          }
-          ok = WebRtcSpeex_EncoderInit(SPEEX16enc_inst[k], 0 /*vbr*/,
-                                       3 /*complexity*/, vad);
-          if (ok != 0)
-            exit(0);
-        } else {
-          printf("\nError - Speex16 called with sample frequency other than 16 "
-                 "kHz.\n\n");
-        }
-        break;
-#endif
 
 #ifdef CODEC_G722_1_16
       case webrtc::kDecoderG722_1_16:
         if (sampfreq == 16000) {
           ok = WebRtcG7221_CreateEnc16(&G722_1_16enc_inst[k]);
           if (ok != 0) {
             printf("Error: Couldn't allocate memory for G.722.1 instance\n");
             exit(0);
           }
           if (enc_frameSize == 320) {
@@ skipping 391 matching lines @@
 #ifdef CODEC_G729
       case webrtc::NetEqDecoder::kDecoderG729:
         WebRtcG729_FreeEnc(G729enc_inst[k]);
         break;
 #endif
 #ifdef CODEC_G729_1
       case webrtc::NetEqDecoder::kDecoderG729_1:
         WebRtcG7291_Free(G729_1_inst[k]);
         break;
 #endif
-#ifdef CODEC_SPEEX_8
-      case webrtc::NetEqDecoder::kDecoderSPEEX_8:
-        WebRtcSpeex_FreeEnc(SPEEX8enc_inst[k]);
-        break;
-#endif
-#ifdef CODEC_SPEEX_16
-      case webrtc::NetEqDecoder::kDecoderSPEEX_16:
-        WebRtcSpeex_FreeEnc(SPEEX16enc_inst[k]);
-        break;
-#endif
 
 #ifdef CODEC_G722_1_16
       case webrtc::NetEqDecoder::kDecoderG722_1_16:
         WebRtcG7221_FreeEnc16(G722_1_16enc_inst[k]);
         break;
 #endif
 #ifdef CODEC_G722_1_24
       case webrtc::NetEqDecoder::kDecoderG722_1_24:
         WebRtcG7221_FreeEnc24(G722_1_24enc_inst[k]);
         break;
@@ skipping 368 matching lines @@
     memmove(ptrL + stride, ptrL, ptrR - ptrL);
 
     // copy from temp to left pointer
     memcpy(ptrL, temp, stride);
 
     // advance pointers
     ptrL += stride * 2;
     ptrR += stride;
   }
 }