Delete RawVideoType enum, use the VideoType enum instead.

webrtc/modules/video_capture/linux/device_info_linux.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 269 matching lines @@
             if (ioctl(fd, VIDIOC_TRY_FMT, &video_fmt) >= 0)
             {
                 if ((video_fmt.fmt.pix.width == size[i][0])
                     && (video_fmt.fmt.pix.height == size[i][1]))
                 {
                     VideoCaptureCapability cap;
                     cap.width = video_fmt.fmt.pix.width;
                     cap.height = video_fmt.fmt.pix.height;
                     if (videoFormats[fmts] == V4L2_PIX_FMT_YUYV)
                     {
-                        cap.rawType = kVideoYUY2;
+                      cap.videoType = VideoType::kYUY2;
                     }
                     else if (videoFormats[fmts] == V4L2_PIX_FMT_YUV420)
                     {
-                        cap.rawType = kVideoI420;
+                      cap.videoType = VideoType::kI420;
                     }
                     else if (videoFormats[fmts] == V4L2_PIX_FMT_MJPEG)
                     {
-                        cap.rawType = kVideoMJPEG;
+                      cap.videoType = VideoType::kMJPEG;
                     }
                     else if (videoFormats[fmts] == V4L2_PIX_FMT_UYVY)
                     {
-                        cap.rawType = kVideoUYVY;
+                      cap.videoType = VideoType::kUYVY;
                     }
 
                     // get fps of current camera mode
                     // V4l2 does not have a stable method of knowing so we just guess.
-                    if(cap.width >= 800 && cap.rawType != kVideoMJPEG)
-                    {
-                        cap.maxFPS = 15;
+                    if (cap.width >= 800 &&
+                        cap.videoType != VideoType::kMJPEG) {
+                      cap.maxFPS = 15;
                     }
                     else
                     {
                         cap.maxFPS = 30;
                     }
 
                     _captureCapabilities.push_back(cap);
                     index++;
                     WEBRTC_TRACE(
                         webrtc::kTraceInfo, webrtc::kTraceVideoCapture, 0,
                         "Camera capability, width:%d height:%d type:%d fps:%d",
-                        cap.width, cap.height, cap.rawType, cap.maxFPS);
+                        cap.width, cap.height, cap.videoType, cap.maxFPS);
                 }
             }
         }
     }
 
     WEBRTC_TRACE(webrtc::kTraceInfo,
                  webrtc::kTraceVideoCapture,
                  0,
                  "CreateCapabilityMap %u",
                  static_cast<unsigned int>(_captureCapabilities.size()));
     return _captureCapabilities.size();
 }
 
 }  // namespace videocapturemodule
 }  // namespace webrtc