Unify FrameType and VideoFrameType.

webrtc/modules/audio_coding/main/test/TestVADDTX.h

 /*
  *  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 11 matching lines @@
 namespace webrtc {
 
 class ActivityMonitor : public ACMVADCallback {
  public:
   ActivityMonitor();
   int32_t InFrameType(FrameType frame_type);
   void PrintStatistics();
   void ResetStatistics();
   void GetStatistics(uint32_t* stats);
  private:
-  // 0 - kFrameEmpty
+  // 0 - kEmptyFrame
   // 1 - kAudioFrameSpeech
   // 2 - kAudioFrameCN
   // 3 - kVideoFrameKey (not used by audio)
   // 4 - kVideoFrameDelta (not used by audio)
   uint32_t counter_[5];
 };
 
 
 // TestVadDtx is to verify that VAD/DTX perform as they should. It runs through
 // an audio file and check if the occurrence of various packet types follows
@@ skipping 10 matching lines @@
  protected:
   void RegisterCodec(CodecInst codec_param);
 
   // Encoding a file and see if the numbers that various packets occur follow
   // the expectation. Saves result to a file.
   // expects[x] means
   // -1 : do not care,
   // 0  : there have been no packets of type |x|,
   // 1  : there have been packets of type |x|,
   // with |x| indicates the following packet types
-  // 0 - kFrameEmpty
+  // 0 - kEmptyFrame
   // 1 - kAudioFrameSpeech
   // 2 - kAudioFrameCN
   // 3 - kVideoFrameKey (not used by audio)
   // 4 - kVideoFrameDelta (not used by audio)
   void Run(std::string in_filename, int frequency, int channels,
            std::string out_filename, bool append, const int* expects);
 
   rtc::scoped_ptr<AudioCodingModule> acm_send_;
   rtc::scoped_ptr<AudioCodingModule> acm_receive_;
   rtc::scoped_ptr<Channel> channel_;
@@ skipping 19 matching lines @@
 
 // TestOpusDtx is to verify that the Opus DTX performs as it should.
 class TestOpusDtx final : public TestVadDtx {
  public:
   void Perform() override;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_TESTVADDTX_H_