Delete RawVideoType enum, use the VideoType enum instead.

webrtc/modules/video_capture/video_capture_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 71 matching lines @@
       _requestedCapability(),
       _lastProcessTimeNanos(rtc::TimeNanos()),
       _lastFrameRateCallbackTimeNanos(rtc::TimeNanos()),
       _dataCallBack(NULL),
       _lastProcessFrameTimeNanos(rtc::TimeNanos()),
       _rotateFrame(kVideoRotation_0),
       apply_rotation_(false) {
     _requestedCapability.width = kDefaultWidth;
     _requestedCapability.height = kDefaultHeight;
     _requestedCapability.maxFPS = 30;
-    _requestedCapability.rawType = kVideoI420;
+    _requestedCapability.videoType = VideoType::kI420;
     memset(_incomingFrameTimesNanos, 0, sizeof(_incomingFrameTimesNanos));
 }
 
 VideoCaptureImpl::~VideoCaptureImpl()
 {
     DeRegisterCaptureDataCallback();
     if (_deviceUniqueId)
         delete[] _deviceUniqueId;
 }
 
@@ skipping 24 matching lines @@
     int64_t captureTime/*=0*/)
 {
     rtc::CritScope cs(&_apiCs);
 
     const int32_t width = frameInfo.width;
     const int32_t height = frameInfo.height;
 
     TRACE_EVENT1("webrtc", "VC::IncomingFrame", "capture_time", captureTime);
 
     // Not encoded, convert to I420.
-    const VideoType commonVideoType =
-        RawVideoTypeToCommonVideoVideoType(frameInfo.rawType);
-
-    if (frameInfo.rawType != kVideoMJPEG &&
-        CalcBufferSize(commonVideoType, width, abs(height)) !=
+    if (frameInfo.videoType != VideoType::kMJPEG &&
+        CalcBufferSize(frameInfo.videoType, width, abs(height)) !=
             videoFrameLength) {
       LOG(LS_ERROR) << "Wrong incoming frame length.";
       return -1;
     }
 
     int stride_y = width;
     int stride_uv = (width + 1) / 2;
     int target_width = width;
     int target_height = height;
 
@@ skipping 10 matching lines @@
     }
 
     // Setting absolute height (in case it was negative).
     // In Windows, the image starts bottom left, instead of top left.
     // Setting a negative source height, inverts the image (within LibYuv).
 
     // TODO(nisse): Use a pool?
     rtc::scoped_refptr<I420Buffer> buffer = I420Buffer::Create(
         target_width, abs(target_height), stride_y, stride_uv, stride_uv);
     const int conversionResult = ConvertToI420(
-        commonVideoType, videoFrame, 0, 0,  // No cropping
+        frameInfo.videoType, videoFrame, 0, 0,  // No cropping
         width, height, videoFrameLength,
         apply_rotation ? _rotateFrame : kVideoRotation_0, buffer.get());
     if (conversionResult < 0) {
       LOG(LS_ERROR) << "Failed to convert capture frame from type "
-                    << frameInfo.rawType << "to I420.";
+                    << static_cast<int>(frameInfo.videoType) << "to I420.";
       return -1;
     }
 
     VideoFrame captureFrame(buffer, 0, rtc::TimeMillis(),
                             !apply_rotation ? _rotateFrame : kVideoRotation_0);
     captureFrame.set_ntp_time_ms(captureTime);
 
     DeliverCapturedFrame(captureFrame);
 
     return 0;
@@ skipping 43 matching lines @@
                    rtc::kNumNanosecsPerMillisec;
     if (diff > 0) {
       return uint32_t((nrOfFrames * 1000.0f / diff) + 0.5f);
     }
   }
 
   return nrOfFrames;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc