Delete VideoCaptureCapability::codecType and related logic.

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 75 matching lines @@
       _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.codecType = kVideoCodecUnknown;
     memset(_incomingFrameTimesNanos, 0, sizeof(_incomingFrameTimesNanos));
 }
 
 VideoCaptureImpl::~VideoCaptureImpl()
 {
     DeRegisterCaptureDataCallback();
     delete &_apiCs;
 
     if (_deviceUniqueId)
         delete[] _deviceUniqueId;
@@ skipping 25 matching lines @@
     const VideoCaptureCapability& frameInfo,
     int64_t captureTime/*=0*/)
 {
     CriticalSectionScoped cs(&_apiCs);
 
     const int32_t width = frameInfo.width;
     const int32_t height = frameInfo.height;
 
     TRACE_EVENT1("webrtc", "VC::IncomingFrame", "capture_time", captureTime);
 
-    if (frameInfo.codecType == kVideoCodecUnknown)
+    // Not encoded, convert to I420.
+    const VideoType commonVideoType =
+              RawVideoTypeToCommonVideoVideoType(frameInfo.rawType);
+
+    if (frameInfo.rawType != kVideoMJPEG &&
+        CalcBufferSize(commonVideoType, width,
+                       abs(height)) != videoFrameLength)
     {
-        // Not encoded, convert to I420.
-        const VideoType commonVideoType =
-                  RawVideoTypeToCommonVideoVideoType(frameInfo.rawType);
-
-        if (frameInfo.rawType != kVideoMJPEG &&
-            CalcBufferSize(commonVideoType, 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;
-
-        // SetApplyRotation doesn't take any lock. Make a local copy here.
-        bool apply_rotation = apply_rotation_;
-
-        if (apply_rotation) {
-          // Rotating resolution when for 90/270 degree rotations.
-          if (_rotateFrame == kVideoRotation_90 ||
-              _rotateFrame == kVideoRotation_270) {
-            target_width = abs(height);
-            target_height = width;
-          }
-        }
-
-        // 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
-            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.";
-            return -1;
-        }
-
-        VideoFrame captureFrame(
-            buffer, 0, rtc::TimeMillis(),
-            !apply_rotation ? _rotateFrame : kVideoRotation_0);
-        captureFrame.set_ntp_time_ms(captureTime);
-
-        DeliverCapturedFrame(captureFrame);
-    }
-    else // Encoded format
-    {
-        assert(false);
+        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;
+
+    // SetApplyRotation doesn't take any lock. Make a local copy here.
+    bool apply_rotation = apply_rotation_;
+
+    if (apply_rotation) {
+      // Rotating resolution when for 90/270 degree rotations.
+      if (_rotateFrame == kVideoRotation_90 ||
+          _rotateFrame == kVideoRotation_270) {
+        target_width = abs(height);
+        target_height = width;
+      }
+    }
+
+    // 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
+        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.";
+        return -1;
+    }
+
+    VideoFrame captureFrame(
+        buffer, 0, rtc::TimeMillis(),
+        !apply_rotation ? _rotateFrame : kVideoRotation_0);
+    captureFrame.set_ntp_time_ms(captureTime);
+
+    DeliverCapturedFrame(captureFrame);
+
     return 0;
 }
 
 int32_t VideoCaptureImpl::SetCaptureRotation(VideoRotation rotation) {
   CriticalSectionScoped cs(&_apiCs);
   _rotateFrame = rotation;
   return 0;
 }
 
 bool VideoCaptureImpl::SetApplyRotation(bool enable) {
@@ skipping 46 matching lines @@
         if (diff > 0)
         {
             return uint32_t((nrOfFrames * 1000.0f / diff) + 0.5f);
         }
     }
 
     return nrOfFrames;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc