Unify FrameType and VideoFrameType.

webrtc/modules/audio_coding/main/test/TestAllCodecs.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 56 matching lines @@
   rtp_info.header.markerBit = false;
   rtp_info.header.ssrc = 0;
   rtp_info.header.sequenceNumber = sequence_number_++;
   rtp_info.header.payloadType = payload_type;
   rtp_info.header.timestamp = timestamp;
   if (frame_type == kAudioFrameCN) {
     rtp_info.type.Audio.isCNG = true;
   } else {
     rtp_info.type.Audio.isCNG = false;
   }
-  if (frame_type == kFrameEmpty) {
+  if (frame_type == kEmptyFrame) {
     // Skip this frame.
     return 0;
   }
 
   // Only run mono for all test cases.
   rtp_info.type.Audio.channel = 1;
   memcpy(payload_data_, payload_data, payload_size);
 
   status = receiver_acm_->IncomingPacket(payload_data_, payload_size, rtp_info);
 
@@ skipping 389 matching lines @@
 
 void TestAllCodecs::DisplaySendReceiveCodec() {
   CodecInst my_codec_param;
   acm_a_->SendCodec(&my_codec_param);
   printf("%s -> ", my_codec_param.plname);
   acm_b_->ReceiveCodec(&my_codec_param);
   printf("%s\n", my_codec_param.plname);
 }
 
 }  // namespace webrtc