Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/main/source/video_receiver_unittest.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 70 matching lines @@
 };
 
 TEST_F(TestVideoReceiver, PaddingOnlyFrames) {
   EXPECT_EQ(0, receiver_->SetVideoProtection(kProtectionNack, true));
   EXPECT_EQ(
       0, receiver_->RegisterPacketRequestCallback(&packet_request_callback_));
   const size_t kPaddingSize = 220;
   const uint8_t payload[kPaddingSize] = {0};
   WebRtcRTPHeader header;
   memset(&header, 0, sizeof(header));
-  header.frameType = kFrameEmpty;
+  header.frameType = kEmptyFrame;
   header.header.markerBit = false;
   header.header.paddingLength = kPaddingSize;
   header.header.payloadType = kUnusedPayloadType;
   header.header.ssrc = 1;
   header.header.headerLength = 12;
   header.type.Video.codec = kRtpVideoVp8;
   for (int i = 0; i < 10; ++i) {
     EXPECT_CALL(packet_request_callback_, ResendPackets(_, _)).Times(0);
     InsertAndVerifyPaddingFrame(payload, &header);
     clock_.AdvanceTimeMilliseconds(33);
     header.header.timestamp += 3000;
   }
 }
 
 TEST_F(TestVideoReceiver, PaddingOnlyFramesWithLosses) {
   EXPECT_EQ(0, receiver_->SetVideoProtection(kProtectionNack, true));
   EXPECT_EQ(
       0, receiver_->RegisterPacketRequestCallback(&packet_request_callback_));
   const size_t kFrameSize = 1200;
   const size_t kPaddingSize = 220;
   const uint8_t payload[kFrameSize] = {0};
   WebRtcRTPHeader header;
   memset(&header, 0, sizeof(header));
-  header.frameType = kFrameEmpty;
+  header.frameType = kEmptyFrame;
   header.header.markerBit = false;
   header.header.paddingLength = kPaddingSize;
   header.header.payloadType = kUnusedPayloadType;
   header.header.ssrc = 1;
   header.header.headerLength = 12;
   header.type.Video.codec = kRtpVideoVp8;
   // Insert one video frame to get one frame decoded.
   header.frameType = kVideoFrameKey;
   header.type.Video.isFirstPacket = true;
   header.header.markerBit = true;
   InsertAndVerifyDecodableFrame(payload, kFrameSize, &header);
   clock_.AdvanceTimeMilliseconds(33);
   header.header.timestamp += 3000;
 
-  header.frameType = kFrameEmpty;
+  header.frameType = kEmptyFrame;
   header.type.Video.isFirstPacket = false;
   header.header.markerBit = false;
   // Insert padding frames.
   for (int i = 0; i < 10; ++i) {
     // Lose one packet from the 6th frame.
     if (i == 5) {
       ++header.header.sequenceNumber;
     }
     // Lose the 4th frame.
     if (i == 3) {
@@ skipping 15 matching lines @@
 
 TEST_F(TestVideoReceiver, PaddingOnlyAndVideo) {
   EXPECT_EQ(0, receiver_->SetVideoProtection(kProtectionNack, true));
   EXPECT_EQ(
       0, receiver_->RegisterPacketRequestCallback(&packet_request_callback_));
   const size_t kFrameSize = 1200;
   const size_t kPaddingSize = 220;
   const uint8_t payload[kFrameSize] = {0};
   WebRtcRTPHeader header;
   memset(&header, 0, sizeof(header));
-  header.frameType = kFrameEmpty;
+  header.frameType = kEmptyFrame;
   header.type.Video.isFirstPacket = false;
   header.header.markerBit = false;
   header.header.paddingLength = kPaddingSize;
   header.header.payloadType = kUnusedPayloadType;
   header.header.ssrc = 1;
   header.header.headerLength = 12;
   header.type.Video.codec = kRtpVideoVp8;
   header.type.Video.codecHeader.VP8.pictureId = -1;
   header.type.Video.codecHeader.VP8.tl0PicIdx = -1;
   for (int i = 0; i < 3; ++i) {
     // Insert 2 video frames.
     for (int j = 0; j < 2; ++j) {
       if (i == 0 && j == 0)  // First frame should be a key frame.
         header.frameType = kVideoFrameKey;
       else
         header.frameType = kVideoFrameDelta;
       header.type.Video.isFirstPacket = true;
       header.header.markerBit = true;
       InsertAndVerifyDecodableFrame(payload, kFrameSize, &header);
       clock_.AdvanceTimeMilliseconds(33);
       header.header.timestamp += 3000;
     }
 
     // Insert 2 padding only frames.
-    header.frameType = kFrameEmpty;
+    header.frameType = kEmptyFrame;
     header.type.Video.isFirstPacket = false;
     header.header.markerBit = false;
     for (int j = 0; j < 2; ++j) {
       // InsertAndVerifyPaddingFrame(payload, &header);
       clock_.AdvanceTimeMilliseconds(33);
       header.header.timestamp += 3000;
     }
   }
 }
 
 TEST_F(TestVideoReceiver, ReceiverDelay) {
   EXPECT_EQ(0, receiver_->SetMinReceiverDelay(0));
   EXPECT_EQ(0, receiver_->SetMinReceiverDelay(5000));
   EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(-100));
   EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(10010));
 }
 
 }  // namespace
 }  // namespace vcm
 }  // namespace webrtc