Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Unified Diff: content/browser/media/media_internals.h

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/media/media_internals.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_internals.h
diff --git a/content/browser/media/media_internals.h b/content/browser/media/media_internals.h
index 7203b2fc9ac50e9d5603e58a8fa63392071eb1b4..77f4fb1bf09c594a60fedf0fa642ad90ac4b5cb3 100644
--- a/content/browser/media/media_internals.h
+++ b/content/browser/media/media_internals.h
@@ -8,6 +8,7 @@
#include <list>
#include <map>
#include <string>
+#include <tuple>
#include <vector>
#include "base/callback_forward.h"
@@ -22,7 +23,8 @@
#include "content/public/browser/notification_registrar.h"
#include "media/audio/audio_logging.h"
#include "media/base/media_log.h"
-#include "media/capture/video/video_capture_device_info.h"
+#include "media/base/video_capture_types.h"
+#include "media/capture/video/video_capture_device_descriptor.h"
namespace media {
class AudioParameters;
@@ -73,7 +75,9 @@ class CONTENT_EXPORT MediaInternals
// Called to inform of the capabilities enumerated for video devices.
void UpdateVideoCaptureDeviceCapabilities(
- const media::VideoCaptureDeviceInfos& video_capture_device_infos);
+ const std::vector<std::tuple<media::VideoCaptureDeviceDescriptor,
+ media::VideoCaptureFormats>>&
+ descriptors_and_formats);
// AudioLogFactory implementation. Safe to call from any thread.
std::unique_ptr<media::AudioLog> CreateAudioLog(
« no previous file with comments | « no previous file | content/browser/media/media_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698