Delete RawVideoType enum, use the VideoType enum instead.

webrtc/modules/video_capture/windows/device_info_ds.cc

Index: webrtc/modules/video_capture/windows/device_info_ds.cc
diff --git a/webrtc/modules/video_capture/windows/device_info_ds.cc b/webrtc/modules/video_capture/windows/device_info_ds.cc
index fb2094c3f47b3792b9ebab69d6391011d7ef768f..745e4c9c070b8b978da6e89e15963694bafa634f 100644
--- a/webrtc/modules/video_capture/windows/device_info_ds.cc
+++ b/webrtc/modules/video_capture/windows/device_info_ds.cc
@@ -589,44 +589,45 @@ int32_t DeviceInfoDS::CreateCapabilityMap(
             // can't switch MEDIATYPE :~(
             if (pmt->subtype == MEDIASUBTYPE_I420)
             {
-                capability.rawType = kVideoI420;
+              capability.videoType = VideoType::kI420;
             }
             else if (pmt->subtype == MEDIASUBTYPE_IYUV)
             {
-                capability.rawType = kVideoIYUV;
+              capability.videoType = VideoType::kIYUV;
             }
             else if (pmt->subtype == MEDIASUBTYPE_RGB24)
             {
-                capability.rawType = kVideoRGB24;
+              capability.videoType = VideoType::kRGB24;
             }
             else if (pmt->subtype == MEDIASUBTYPE_YUY2)
             {
-                capability.rawType = kVideoYUY2;
+              capability.videoType = VideoType::kYUY2;
             }
             else if (pmt->subtype == MEDIASUBTYPE_RGB565)
             {
-                capability.rawType = kVideoRGB565;
+              capability.videoType = VideoType::kRGB565;
             }
             else if (pmt->subtype == MEDIASUBTYPE_MJPG)
             {
-                capability.rawType = kVideoMJPEG;
+              capability.videoType = VideoType::kMJPEG;
             }
             else if (pmt->subtype == MEDIASUBTYPE_dvsl
                     || pmt->subtype == MEDIASUBTYPE_dvsd
                     || pmt->subtype == MEDIASUBTYPE_dvhd) // If this is an external DV camera
             {
-                capability.rawType = kVideoYUY2;// MS DV filter seems to create this type
+              capability.videoType =
+                  VideoType::kYUY2;  // MS DV filter seems to create this type
             }
             else if (pmt->subtype == MEDIASUBTYPE_UYVY) // Seen used by Declink capture cards
             {
-                capability.rawType = kVideoUYVY;
+              capability.videoType = VideoType::kUYVY;
             }
             else if (pmt->subtype == MEDIASUBTYPE_HDYC) // Seen used by Declink capture cards. Uses BT. 709 color. Not entiry correct to use UYVY. http://en.wikipedia.org/wiki/YCbCr
             {
                 WEBRTC_TRACE(webrtc::kTraceWarning,
                              webrtc::kTraceVideoCapture, 0,
                              "Device support HDYC.");
-                capability.rawType = kVideoUYVY;
+                capability.videoType = VideoType::kUYVY;
             }
             else
             {
@@ -641,10 +642,11 @@ int32_t DeviceInfoDS::CreateCapabilityMap(
 
             _captureCapabilities.push_back(capability);
             _captureCapabilitiesWindows.push_back(capability);
-            WEBRTC_TRACE( webrtc::kTraceInfo, webrtc::kTraceVideoCapture, 0,
+            WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, 0,
                          "Camera capability, width:%d height:%d type:%d fps:%d",
                          capability.width, capability.height,
-                         capability.rawType, capability.maxFPS);
+                         static_cast<int>(capability.videoType),
+                         capability.maxFPS);
         }
         DeleteMediaType(pmt);
         pmt = NULL;