Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/main/source/session_info.cc

Index: webrtc/modules/video_coding/main/source/session_info.cc
diff --git a/webrtc/modules/video_coding/main/source/session_info.cc b/webrtc/modules/video_coding/main/source/session_info.cc
index bf6bcb3c00e0f7176ebf7aa49870d6ed0eb5a45a..5cc619957ae4ed631325ea7d2719d7c620b9b34d 100644
--- a/webrtc/modules/video_coding/main/source/session_info.cc
+++ b/webrtc/modules/video_coding/main/source/session_info.cc
@@ -464,7 +464,7 @@ int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
                                  uint8_t* frame_buffer,
                                  VCMDecodeErrorMode decode_error_mode,
                                  const FrameData& frame_data) {
-  if (packet.frameType == kFrameEmpty) {
+  if (packet.frameType == kSkipFrame) {
     // Update sequence number of an empty packet.
     // Only media packets are inserted into the packet list.
     InformOfEmptyPacket(packet.seqNum);
@@ -516,7 +516,7 @@ int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
       LOG(LS_WARNING) << "Received packet with a sequence number which is out "
                          "of frame boundaries";
       return -3;
-    } else if (frame_type_ == kFrameEmpty && packet.frameType != kFrameEmpty) {
+    } else if (frame_type_ == kSkipFrame && packet.frameType != kSkipFrame) {

[stefan-webrtc, 2015/10/01 09:21:20]

I don't really like the name kSkipFrame here... Maybe it's better to call it
kEmptyFrame?

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

Done.

       // Update the frame type with the type of the first media packet.
       // TODO(mikhal): Can this trigger?
       frame_type_ = packet.frameType;