Unify FrameType and VideoFrameType.

webrtc/common_types.h

Index: webrtc/common_types.h
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index 9b730a13cbbea99b163a86681345339b62e56bac..641aba9f49de7d440a59d50a4248254288a08ead 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -156,14 +156,21 @@ enum ProcessingTypes
     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 {