Remove VideoFrameType aliases for FrameType.

webrtc/modules/video_coding/codecs/test/stats.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 14 matching lines @@
       decoding_successful(false),
       encode_return_code(0),
       decode_return_code(0),
       encode_time_in_us(0),
       decode_time_in_us(0),
       frame_number(0),
       packets_dropped(0),
       total_packets(0),
       bit_rate_in_kbps(0),
       encoded_frame_length_in_bytes(0),
-      frame_type(kDeltaFrame) {}
+      frame_type(kVideoFrameDelta) {}
 
 Stats::Stats() {}
 
 Stats::~Stats() {}
 
 bool LessForEncodeTime(const FrameStatistic& s1, const FrameStatistic& s2) {
     return s1.encode_time_in_us < s2.encode_time_in_us;
 }
 
 bool LessForDecodeTime(const FrameStatistic& s1, const FrameStatistic& s2) {
@@ skipping 30 matching lines @@
   size_t total_encoded_key_frames_lengths = 0;
   size_t total_encoded_nonkey_frames_lengths = 0;
   size_t nbr_keyframes = 0;
   size_t nbr_nonkeyframes = 0;
 
   for (FrameStatisticsIterator it = stats_.begin();
       it != stats_.end(); ++it) {
     total_encoding_time_in_us += it->encode_time_in_us;
     total_decoding_time_in_us += it->decode_time_in_us;
     total_encoded_frames_lengths += it->encoded_frame_length_in_bytes;
-    if (it->frame_type == webrtc::kKeyFrame) {
+    if (it->frame_type == webrtc::kVideoFrameKey) {
       total_encoded_key_frames_lengths += it->encoded_frame_length_in_bytes;
       nbr_keyframes++;
     } else {
       total_encoded_nonkey_frames_lengths += it->encoded_frame_length_in_bytes;
       nbr_nonkeyframes++;
     }
   }
 
   FrameStatisticsIterator frame;
 
@@ skipping 84 matching lines @@
   printf("Total encoding time  : %7d ms.\n",
          total_encoding_time_in_us / 1000);
   printf("Total decoding time  : %7d ms.\n",
          total_decoding_time_in_us / 1000);
   printf("Total processing time: %7d ms.\n",
          (total_encoding_time_in_us + total_decoding_time_in_us) / 1000);
 }
 
 }  // namespace test
 }  // namespace webrtc