Delete VideoCaptureCapability::codecType and related logic.

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 136 matching lines @@
         }
         _apiLock.ReleaseLockExclusive();
         _apiLock.AcquireLockShared();
     }
 
     int32_t bestformatIndex = -1;
     int32_t bestWidth = 0;
     int32_t bestHeight = 0;
     int32_t bestFrameRate = 0;
     RawVideoType bestRawType = kVideoUnknown;
-    webrtc::VideoCodecType bestCodecType = webrtc::kVideoCodecUnknown;
 
     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 26 matching lines @@
                             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))
                                 {
-                                    bestCodecType = capability.codecType;
                                     bestRawType = capability.rawType;
                                     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)
                                 {
-                                    if (capability.codecType == requested.codecType
-                                        && bestCodecType != requested.codecType)
-                                    {
-                                        bestCodecType = capability.codecType;
-                                        bestformatIndex = tmp;
-                                    }
+                                  bestformatIndex = tmp;
                                 }
                             }
                             else // Better frame rate
                             {
-                                if (requested.codecType == capability.codecType)
-                                {
-
-                                    bestWidth = capability.width;
-                                    bestHeight = capability.height;
-                                    bestFrameRate = capability.maxFPS;
-                                    bestCodecType = capability.codecType;
-                                    bestRawType = capability.rawType;
-                                    bestformatIndex = tmp;
-                                }
+                                bestWidth = capability.width;
+                                bestHeight = capability.height;
+                                bestFrameRate = capability.maxFPS;
+                                bestRawType = capability.rawType;
+                                bestformatIndex = tmp;
                             }
                         }
                     }
                     else // Better width than previously
                     {
-                        if (requested.codecType == capability.codecType)
-                        {
-                            bestWidth = capability.width;
-                            bestHeight = capability.height;
-                            bestFrameRate = capability.maxFPS;
-                            bestCodecType = capability.codecType;
-                            bestRawType = capability.rawType;
-                            bestformatIndex = tmp;
-                        }
+                        bestWidth = capability.width;
+                        bestHeight = capability.height;
+                        bestFrameRate = capability.maxFPS;
+                        bestRawType = capability.rawType;
+                        bestformatIndex = tmp;
                     }
                 }// else width no good
             }
             else // Better height
             {
-                if (requested.codecType == capability.codecType)
-                {
-                    bestWidth = capability.width;
-                    bestHeight = capability.height;
-                    bestFrameRate = capability.maxFPS;
-                    bestCodecType = capability.codecType;
-                    bestRawType = capability.rawType;
-                    bestformatIndex = tmp;
-                }
+                bestWidth = capability.width;
+                bestHeight = capability.height;
+                bestFrameRate = capability.maxFPS;
+                bestRawType = capability.rawType;
+                bestformatIndex = tmp;
             }
         }// else height not good
     }//end for
 
     LOG(LS_VERBOSE) << "Best camera format: " << bestWidth << "x" << bestHeight
                     << "@" << bestFrameRate
                     << "fps, color format: " << bestRawType;
 
     // 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