Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/main/source/test/stream_generator.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 @@
   uint32_t timestamp = 90 * (time_ms - start_time_);
   for (int i = 0; i < num_media_packets; ++i) {
     const int packet_size =
         (kFrameSize + num_media_packets / 2) / num_media_packets;
     bool marker_bit = (i == num_media_packets - 1);
     packets_.push_back(GeneratePacket(
         sequence_number_, timestamp, packet_size, (i == 0), marker_bit, type));
     ++sequence_number_;
   }
   for (int i = 0; i < num_empty_packets; ++i) {
-    packets_.push_back(GeneratePacket(
-        sequence_number_, timestamp, 0, false, false, kFrameEmpty));
+    packets_.push_back(GeneratePacket(sequence_number_, timestamp, 0, false,
+                                      false, kEmptyFrame));
     ++sequence_number_;
   }
 }
 
 VCMPacket StreamGenerator::GeneratePacket(uint16_t sequence_number,
                                           uint32_t timestamp,
                                           unsigned int size,
                                           bool first_packet,
                                           bool marker_bit,
                                           FrameType type) {
@@ skipping 57 matching lines @@
   std::list<VCMPacket>::iterator it = packets_.begin();
   for (int i = 0; i < index; ++i) {
     ++it;
     if (it == packets_.end())
       break;
   }
   return it;
 }
 
 }  // namespace webrtc