Unify FrameType and VideoFrameType.

webrtc/video_engine/vie_channel.h

 /*
  *  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 230 matching lines @@
 
   // Implements VCMDecoderTimingCallback.
   virtual void OnDecoderTiming(int decode_ms,
                                int max_decode_ms,
                                int current_delay_ms,
                                int target_delay_ms,
                                int jitter_buffer_ms,
                                int min_playout_delay_ms,
                                int render_delay_ms);
 
-  // Implements VideoFrameTypeCallback.
+  // Implements FrameTypeCallback.
   virtual int32_t RequestKeyFrame();
 
-  // Implements VideoFrameTypeCallback.
+  // Implements FrameTypeCallback.
   virtual int32_t SliceLossIndicationRequest(
       const uint64_t picture_id);
 
   // Implements VideoPacketRequestCallback.
   int32_t ResendPackets(const uint16_t* sequence_numbers,
                         uint16_t length) override;
 
   int32_t SetVoiceChannel(int32_t ve_channel_id,
                           VoEVideoSync* ve_sync_interface);
   int32_t VoiceChannel();
@@ skipping 181 matching lines @@
   size_t num_rtts_ GUARDED_BY(crit_);
 
   // RtpRtcp modules, declared last as they use other members on construction.
   const std::vector<RtpRtcp*> rtp_rtcp_modules_;
   size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_