commit dd787cc3fd63d4a6b15db76ad051f886e987f366
author henrik.lundin@webrtc.org <henrik.lundin@webrtc.org> Fri Mar 06 07:50:34 2015
committer henrik.lundin@webrtc.org <henrik.lundin@webrtc.org> Fri Mar 06 07:51:21 2015
tree f4fb81a4a3872915af6e5b046a39ba6ec3ac199f
parent 235b9abc9d9897d0957e030029f6fa67b280ff4e

Remove WebRtcACMEncodingType

The parameter was not needed; it was sufficient with a bool indicating
speech or not speech. This change propagates to the InFrameType
callback function. Some tests are updated too.

COAUTHOR=kwiberg@webrtc.org
R=minyue@webrtc.org
TBR=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42209004

Cr-Original-Commit-Position: refs/heads/master@{#8626}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: e9217b4bdbf9a8fd8b4882b2f995665927f28ad2

modules/audio_coding/main/test/utility.cc

diff --git a/modules/audio_coding/main/test/utility.cc b/modules/audio_coding/main/test/utility.cc
index 0848954..e4e6dd4 100644
--- a/modules/audio_coding/main/test/utility.cc
+++ b/modules/audio_coding/main/test/utility.cc
@@ -13,6 +13,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/common.h"
@@ -305,28 +306,23 @@
 }
 
 void VADCallback::Reset() {
-  for (int n = 0; n < 6; n++) {
-    _numFrameTypes[n] = 0;
-  }
+  memset(_numFrameTypes, 0, sizeof(_numFrameTypes));
 }
 
 VADCallback::VADCallback() {
-  for (int n = 0; n < 6; n++) {
-    _numFrameTypes[n] = 0;
-  }
+  memset(_numFrameTypes, 0, sizeof(_numFrameTypes));
 }
 
 void VADCallback::PrintFrameTypes() {
-  fprintf(stdout, "No encoding.................. %d\n", _numFrameTypes[0]);
-  fprintf(stdout, "Active normal encoded........ %d\n", _numFrameTypes[1]);
-  fprintf(stdout, "Passive normal encoded....... %d\n", _numFrameTypes[2]);
-  fprintf(stdout, "Passive DTX wideband......... %d\n", _numFrameTypes[3]);
-  fprintf(stdout, "Passive DTX narrowband....... %d\n", _numFrameTypes[4]);
-  fprintf(stdout, "Passive DTX super-wideband... %d\n", _numFrameTypes[5]);
+  printf("kFrameEmpty......... %d\n", _numFrameTypes[kFrameEmpty]);
+  printf("kAudioFrameSpeech... %d\n", _numFrameTypes[kAudioFrameSpeech]);
+  printf("kAudioFrameCN....... %d\n", _numFrameTypes[kAudioFrameCN]);
+  printf("kVideoFrameKey...... %d\n", _numFrameTypes[kVideoFrameKey]);
+  printf("kVideoFrameDelta.... %d\n", _numFrameTypes[kVideoFrameDelta]);
 }
 
-int32_t VADCallback::InFrameType(int16_t frameType) {
-  _numFrameTypes[frameType]++;
+int32_t VADCallback::InFrameType(FrameType frame_type) {
+  _numFrameTypes[frame_type]++;
   return 0;
 }