Delete RawVideoType enum, use the VideoType enum instead.

webrtc/modules/video_capture/device_info_impl.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 135 matching lines @@
             return -1;
         }
         _apiLock.ReleaseLockExclusive();
         _apiLock.AcquireLockShared();
     }
 
     int32_t bestformatIndex = -1;
     int32_t bestWidth = 0;
     int32_t bestHeight = 0;
     int32_t bestFrameRate = 0;
-    RawVideoType bestRawType = kVideoUnknown;
+    VideoType bestVideoType = VideoType::kUnknown;
 
     const int32_t numberOfCapabilies =
         static_cast<int32_t>(_captureCapabilities.size());
 
     for (int32_t tmp = 0; tmp < numberOfCapabilies; ++tmp) // Loop through all capabilities
     {
         VideoCaptureCapability& capability = _captureCapabilities[tmp];
 
         const int32_t diffWidth = capability.width - requested.width;
         const int32_t diffHeight = capability.height - requested.height;
@@ skipping 19 matching lines @@
                         if (((diffFrameRate >= 0 &&
                               diffFrameRate <= currentbestDiffFrameRate) // Frame rate to high but better match than previouse and we have not selected IUV
                             ||
                             (currentbestDiffFrameRate < 0 &&
                              diffFrameRate >= currentbestDiffFrameRate)) // Current frame rate is lower than requested. This is better.
                         )
                         {
                             if ((currentbestDiffFrameRate == diffFrameRate) // Same frame rate as previous  or frame rate allready good enough
                                 || (currentbestDiffFrameRate >= 0))
                             {
-                                if (bestRawType != requested.rawType
-                                    && requested.rawType != kVideoUnknown
-                                    && (capability.rawType == requested.rawType
-                                        || capability.rawType == kVideoI420
-                                        || capability.rawType == kVideoYUY2
-                                        || capability.rawType == kVideoYV12))
-                                {
-                                    bestRawType = capability.rawType;
-                                    bestformatIndex = tmp;
+                              if (bestVideoType != requested.videoType &&
+                                  requested.videoType != VideoType::kUnknown &&
+                                  (capability.videoType ==
+                                       requested.videoType ||
+                                   capability.videoType == VideoType::kI420 ||
+                                   capability.videoType == VideoType::kYUY2 ||
+                                   capability.videoType == VideoType::kYV12)) {
+                                bestVideoType = capability.videoType;
+                                bestformatIndex = tmp;
                                 }
                                 // If width height and frame rate is full filled we can use the camera for encoding if it is supported.
                                 if (capability.height == requested.height
                                     && capability.width == requested.width
                                     && capability.maxFPS >= requested.maxFPS)
                                 {
                                   bestformatIndex = tmp;
                                 }
                             }
                             else // Better frame rate
                             {
                                 bestWidth = capability.width;
                                 bestHeight = capability.height;
                                 bestFrameRate = capability.maxFPS;
-                                bestRawType = capability.rawType;
+                                bestVideoType = capability.videoType;
                                 bestformatIndex = tmp;
                             }
                         }
                     }
                     else // Better width than previously
                     {
                         bestWidth = capability.width;
                         bestHeight = capability.height;
                         bestFrameRate = capability.maxFPS;
-                        bestRawType = capability.rawType;
+                        bestVideoType = capability.videoType;
                         bestformatIndex = tmp;
                     }
                 }// else width no good
             }
             else // Better height
             {
                 bestWidth = capability.width;
                 bestHeight = capability.height;
                 bestFrameRate = capability.maxFPS;
-                bestRawType = capability.rawType;
+                bestVideoType = capability.videoType;
                 bestformatIndex = tmp;
             }
         }// else height not good
     }//end for
 
     LOG(LS_VERBOSE) << "Best camera format: " << bestWidth << "x" << bestHeight
                     << "@" << bestFrameRate
-                    << "fps, color format: " << bestRawType;
+                    << "fps, color format: " << static_cast<int>(bestVideoType);
 
     // Copy the capability
     if (bestformatIndex < 0)
         return -1;
     resulting = _captureCapabilities[bestformatIndex];
     return bestformatIndex;
 }
 
 //Default implementation. This should be overridden by Mobile implementations.
 int32_t DeviceInfoImpl::GetOrientation(const char* deviceUniqueIdUTF8,
                                        VideoRotation& orientation) {
   orientation = kVideoRotation_0;
     return -1;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc