Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/main/source/decoding_state_unittest.cc

 /*
  *  Copyright (c) 2011 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 163 matching lines @@
   dec_state.SetState(&frame);
   EXPECT_EQ(dec_state.sequence_num(), 1);
   // Insert an empty packet that does not belong to the same frame.
   // => Sequence num should be the same.
   packet.timestamp = 2;
   dec_state.UpdateOldPacket(&packet);
   EXPECT_EQ(dec_state.sequence_num(), 1);
   // Now insert empty packet belonging to the same frame.
   packet.timestamp = 1;
   packet.seqNum = 2;
-  packet.frameType = kFrameEmpty;
+  packet.frameType = kEmptyFrame;
   packet.sizeBytes = 0;
   dec_state.UpdateOldPacket(&packet);
   EXPECT_EQ(dec_state.sequence_num(), 2);
   // Now insert delta packet belonging to the same frame.
   packet.timestamp = 1;
   packet.seqNum = 3;
   packet.frameType = kVideoFrameDelta;
   packet.sizeBytes = 1400;
   dec_state.UpdateOldPacket(&packet);
   EXPECT_EQ(dec_state.sequence_num(), 3);
   // Insert a packet belonging to an older timestamp - should not update the
   // sequence number.
   packet.timestamp = 0;
   packet.seqNum = 4;
-  packet.frameType = kFrameEmpty;
+  packet.frameType = kEmptyFrame;
   packet.sizeBytes = 0;
   dec_state.UpdateOldPacket(&packet);
   EXPECT_EQ(dec_state.sequence_num(), 3);
 }
 
 TEST(TestDecodingState, MultiLayerBehavior) {
   // Identify sync/non-sync when more than one layer.
   VCMDecodingState dec_state;
   // Identify packets belonging to old frames/packets.
   // Set state for current frames.
@@ skipping 230 matching lines @@
   frame.Reset();
   // Testing only gap in tl0PicIdx when tl0PicIdx in continuous.
   packet.codecSpecificHeader.codecHeader.VP8.tl0PicIdx += 3;
   packet.codecSpecificHeader.codecHeader.VP8.temporalIdx++;
   packet.codecSpecificHeader.codecHeader.VP8.tl0PicIdx = 1;
   EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
   EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
 }
 
 }  // namespace webrtc