Unify FrameType and VideoFrameType.

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

 /*
  *  Copyright (c) 2014 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 74 matching lines @@
 
  private:
   int samples_per_packet_;
   uint8_t payload_type_;
 };
 
 class PacketizationCallbackStubOldApi : public AudioPacketizationCallback {
  public:
   PacketizationCallbackStubOldApi()
       : num_calls_(0),
-        last_frame_type_(kFrameEmpty),
+        last_frame_type_(kSkipFrame),
         last_payload_type_(-1),
         last_timestamp_(0),
         crit_sect_(CriticalSectionWrapper::CreateCriticalSection()) {}
 
   int32_t 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 {
@@ skipping 295 matching lines @@
 
   void DoTest(int blocks_per_packet, int cng_pt) {
     const int kLoops = 40;
     // This array defines the expected frame types, and when they should arrive.
     // We expect a frame to arrive each time the speech encoder would have
     // produced a packet, and once every 100 ms the frame should be non-empty,
     // that is contain comfort noise.
     const struct {
       int ix;
       FrameType type;
-    } expectation[] = {{2, kAudioFrameCN},
-                       {5, kFrameEmpty},
-                       {8, kFrameEmpty},
-                       {11, kAudioFrameCN},
-                       {14, kFrameEmpty},
-                       {17, kFrameEmpty},
-                       {20, kAudioFrameCN},
-                       {23, kFrameEmpty},
-                       {26, kFrameEmpty},
-                       {29, kFrameEmpty},
-                       {32, kAudioFrameCN},
-                       {35, kFrameEmpty},
-                       {38, kFrameEmpty}};
+    } expectation[] = {

[hlundin-webrtc, 2015/10/01 08:54:04]

I'd rather you didn't reformat this.

[pbos-webrtc, 2015/10/06 15:42:45]

Done. But clang-format is awesome. :(

+        {2, kAudioFrameCN},  {5, kSkipFrame},     {8, kSkipFrame},
+        {11, kAudioFrameCN}, {14, kSkipFrame},    {17, kSkipFrame},
+        {20, kAudioFrameCN}, {23, kSkipFrame},    {26, kSkipFrame},
+        {29, kSkipFrame},    {32, kAudioFrameCN}, {35, kSkipFrame},
+        {38, kSkipFrame}};
     for (int i = 0; i < kLoops; ++i) {
       int num_calls_before = packet_cb_.num_calls();
       EXPECT_EQ(i / blocks_per_packet, num_calls_before);
       InsertAudioAndVerifyEncoding();
       int num_calls = packet_cb_.num_calls();
       if (num_calls == num_calls_before + 1) {
         EXPECT_EQ(expectation[num_calls - 1].ix, i);
         EXPECT_EQ(expectation[num_calls - 1].type, packet_cb_.last_frame_type())
             << "Wrong frame type for lap " << i;
         EXPECT_EQ(cng_pt, packet_cb_.last_payload_type());
       } else {
         EXPECT_EQ(num_calls, num_calls_before);
       }
     }
   }
 };
 
 // Checks that the transport callback is invoked once per frame period of the
 // underlying speech encoder, even when comfort noise is produced.
-// Also checks that the frame type is kAudioFrameCN or kFrameEmpty.
+// Also checks that the frame type is kAudioFrameCN or kSkipFrame.
 // This test and the next check the same thing, but differ in the order of
 // speech codec and CNG registration.
 TEST_F(AudioCodingModuleTestWithComfortNoiseOldApi,
        TransportCallbackTestForComfortNoiseRegisterCngLast) {
   const int k10MsBlocksPerPacket = 3;
   codec_.pacsize = k10MsBlocksPerPacket * kSampleRateHz / 100;
   RegisterCodec();
   const int kCngPayloadType = 105;
   RegisterCngCodec(kCngPayloadType);
   ASSERT_EQ(0, acm_->SetVAD(true, true));
@@ skipping 1294 matching lines @@
   Run(16000, 8000, 1000);
 }
 
 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) {
   Run(8000, 16000, 1000);
 }
 
 #endif
 
 }  // namespace webrtc