Unify FrameType and VideoFrameType.

webrtc/modules/audio_coding/main/test/utility.cc

 /*
  *  Copyright (c) 2011 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 270 matching lines @@
 
 void VADCallback::Reset() {
   memset(_numFrameTypes, 0, sizeof(_numFrameTypes));
 }
 
 VADCallback::VADCallback() {
   memset(_numFrameTypes, 0, sizeof(_numFrameTypes));
 }
 
 void VADCallback::PrintFrameTypes() {
-  printf("kFrameEmpty......... %d\n", _numFrameTypes[kFrameEmpty]);
+  printf("kEmptyFrame......... %d\n", _numFrameTypes[kEmptyFrame]);
   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(FrameType frame_type) {
   _numFrameTypes[frame_type]++;
   return 0;
 }
 
 }  // namespace webrtc