Refactor VideoCaptureManager::GetDeviceFormatsInUse()

content/browser/renderer_host/media/video_capture_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 517 matching lines @@
     media::VideoCaptureSessionId capture_session_id,
     media::VideoCaptureFormats* formats_in_use) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(formats_in_use->empty());
 
   SessionMap::iterator it = sessions_.find(capture_session_id);
   if (it == sessions_.end())
     return false;
   DVLOG(1) << "GetDeviceFormatsInUse for device: " << it->second.name;
 
-  return GetDeviceFormatsInUse(it->second.type, it->second.id, formats_in_use);
-}
+  base::Optional<media::VideoCaptureFormat> format =
+      GetDeviceFormatInUse(it->second.type, it->second.id);
+  if (format.has_value())
+    formats_in_use->push_back(format.value());
 
-bool VideoCaptureManager::GetDeviceFormatsInUse(
-    MediaStreamType stream_type,
-    const std::string& device_id,
-    media::VideoCaptureFormats* formats_in_use) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(formats_in_use->empty());
-  // Return the currently in-use format(s) of the device, if it's started.
-  VideoCaptureController* device_in_use =
-      LookupControllerByMediaTypeAndDeviceId(stream_type, device_id);
-  if (device_in_use) {
-    // Currently only one format-in-use is supported at the VCC level.
-    formats_in_use->push_back(device_in_use->GetVideoCaptureFormat());
-  }
   return true;
 }
 
+base::Optional<media::VideoCaptureFormat>
+VideoCaptureManager::GetDeviceFormatInUse(MediaStreamType stream_type,
+                                          const std::string& device_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  // Return the currently in-use format of the device, if it's started.
+  VideoCaptureController* device_in_use =
+      LookupControllerByMediaTypeAndDeviceId(stream_type, device_id);
+  return device_in_use ? device_in_use->GetVideoCaptureFormat() : base::nullopt;
+}
+
 void VideoCaptureManager::SetDesktopCaptureWindowId(
     media::VideoCaptureSessionId session_id,
     gfx::NativeViewId window_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   VLOG(2) << "SetDesktopCaptureWindowId called for session " << session_id;
 
   notification_window_ids_[session_id] = window_id;
   MaybePostDesktopCaptureWindowId(session_id);
 }
 
@@ skipping 299 matching lines @@
       // Session ID is only valid for Screen capture. So we can fake it to
       // resume video capture devices here.
       QueueStartDevice(kFakeSessionId, controller.get(),
                        controller->parameters());
     }
   }
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content