Unify FrameType and VideoFrameType.

webrtc/common_types.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 138 matching lines @@
 
 enum ProcessingTypes
 {
     kPlaybackPerChannel = 0,
     kPlaybackAllChannelsMixed,
     kRecordingPerChannel,
     kRecordingAllChannelsMixed,
     kRecordingPreprocessing
 };
 
-enum FrameType
-{
-    kFrameEmpty            = 0,
-    kAudioFrameSpeech      = 1,
-    kAudioFrameCN          = 2,
-    kVideoFrameKey         = 3,    // independent frame
-    kVideoFrameDelta       = 4,    // depends on the previus frame
+enum FrameType {

[the sun, 2015/09/30 17:21:10]

enum class again?

[pbos-webrtc, 2015/10/06 15:42:45]

Nope, since I don't want to complicate rolling into Chromium. :(

+  kSkipFrame = 0,
+  kAudioFrameSpeech = 1,
+  kAudioFrameCN = 2,
+  kVideoFrameKey = 3,
+  kVideoFrameDelta = 4,
+  // TODO(pbos): Remove below aliases (non-kVideo prefixed) as soon as no
+  // VideoEncoder implementation in Chromium uses them.
+  kKeyFrame = kVideoFrameKey,
+  kDeltaFrame = kVideoFrameDelta,
 };
 
+// TODO(pbos): Remove VideoFrameType when VideoEncoder implementations no longer
+// depend on it.
+typedef FrameType VideoFrameType;

[hlundin-webrtc, 2015/10/01 08:54:04]

I prefer C++11 "using VideoFrameType = FrameType;" but that's totally optional.

[pbos-webrtc, 2015/10/06 15:42:45]

Done.

+
 // Statistics for an RTCP channel
 struct RtcpStatistics {
   RtcpStatistics()
     : fraction_lost(0),
       cumulative_lost(0),
       extended_max_sequence_number(0),
       jitter(0) {}
 
   uint8_t fraction_lost;
   uint32_t cumulative_lost;
@@ skipping 711 matching lines @@
 class StreamDataCountersCallback {
  public:
   virtual ~StreamDataCountersCallback() {}
 
   virtual void DataCountersUpdated(const StreamDataCounters& counters,
                                    uint32_t ssrc) = 0;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_