Delete RawVideoType enum, use the VideoType enum instead.

webrtc/modules/video_capture/windows/device_info_ds.cc

 /*
  *  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 571 matching lines @@
                 if (avgTimePerFrame > 0)
                     capability.maxFPS = static_cast<int> (10000000
                                                            / avgTimePerFrame);
                 else
                     capability.maxFPS = 0;
             }
 
             // 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
             {
                 WCHAR strGuid[39];
                 StringFromGUID2(pmt->subtype, strGuid, 39);
                 WEBRTC_TRACE( webrtc::kTraceWarning,
                              webrtc::kTraceVideoCapture, 0,
                              "Device support unknown media type %ls, width %d, height %d",
                              strGuid);
                 continue;
             }
 
             _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;
     }
     RELEASE_AND_CLEAR(streamConfig);
     RELEASE_AND_CLEAR(videoControlConfig);
     RELEASE_AND_CLEAR(outputCapturePin);
     RELEASE_AND_CLEAR(captureDevice); // Release the capture device
 
     // Store the new used device name
@@ skipping 108 matching lines @@
     // Release memory.
     if (uuid.pElems)
     {
         CoTaskMemFree(uuid.pElems);
     }
     filter->Release();
     return 0;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc