Unify FrameType and VideoFrameType.

webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc

 /*
  *  Copyright (c) 2013 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 28 matching lines @@
 
 }  // namespace
 
 class AcmReceiverTestOldApi : public AudioPacketizationCallback,
                               public ::testing::Test {
  protected:
   AcmReceiverTestOldApi()
       : timestamp_(0),
         packet_sent_(false),
         last_packet_send_timestamp_(timestamp_),
-        last_frame_type_(kFrameEmpty) {
+        last_frame_type_(kEmptyFrame) {
     AudioCodingModule::Config config;
     acm_.reset(new AudioCodingModuleImpl(config));
     receiver_.reset(new AcmReceiver(config));
   }
 
   ~AcmReceiverTestOldApi() {}
 
   void SetUp() override {
     ASSERT_TRUE(receiver_.get() != NULL);
     ASSERT_TRUE(acm_.get() != NULL);
@@ skipping 53 matching lines @@
       ++n;
     }
   }
 
   int SendData(FrameType frame_type,
                uint8_t payload_type,
                uint32_t timestamp,
                const uint8_t* payload_data,
                size_t payload_len_bytes,
                const RTPFragmentationHeader* fragmentation) override {
-    if (frame_type == kFrameEmpty)
+    if (frame_type == kEmptyFrame)
       return 0;
 
     rtp_header_.header.payloadType = payload_type;
     rtp_header_.frameType = frame_type;
     if (frame_type == kAudioFrameSpeech)
       rtp_header_.type.Audio.isCNG = false;
     else
       rtp_header_.type.Audio.isCNG = true;
     rtp_header_.header.timestamp = timestamp;
 
@@ skipping 227 matching lines @@
     EXPECT_EQ(kCodecId[n], receiver_->last_audio_codec_id());
     EXPECT_EQ(0, receiver_->LastAudioCodec(&codec));
     EXPECT_TRUE(CodecsEqual(codecs_[kCodecId[n]], codec));
     ++n;
   }
 }
 
 }  // namespace acm2
 
 }  // namespace webrtc