Unify FrameType and VideoFrameType.

webrtc/modules/audio_coding/main/test/TestStereo.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.
  */
 
@@ skipping 40 matching lines @@
                                  const size_t payload_size,
                                  const RTPFragmentationHeader* fragmentation) {
   WebRtcRTPHeader rtp_info;
   int32_t status = 0;
 
   rtp_info.header.markerBit = false;
   rtp_info.header.ssrc = 0;
   rtp_info.header.sequenceNumber = seq_no_++;
   rtp_info.header.payloadType = payload_type;
   rtp_info.header.timestamp = timestamp;
-  if (frame_type == kFrameEmpty) {
+  if (frame_type == kEmptyFrame) {
     // Skip this frame
     return 0;
   }
 
   if (lost_packet_ == false) {
     if (frame_type != kAudioFrameCN) {
       rtp_info.type.Audio.isCNG = false;
       rtp_info.type.Audio.channel = static_cast<int>(codec_mode_);
     } else {
       rtp_info.type.Audio.isCNG = true;
@@ skipping 756 matching lines @@
   if (test_mode_ != 0) {
     printf("%s -> ", my_codec_param.plname);
   }
   acm_b_->ReceiveCodec(&my_codec_param);
   if (test_mode_ != 0) {
     printf("%s\n", my_codec_param.plname);
   }
 }
 
 }  // namespace webrtc