media/video/capture/file_video_capture_device.cc - Issue 91343002: Added supported formats caching to VideoCaptureManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/video/capture/file_video_capture_device.cc

Issue 91343002: Added supported formats caching to VideoCaptureManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mad formatting corrected in certain files. Created 7 years 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

« media/video/capture/fake_video_capture_device.cc ('K') | « media/video/capture/file_video_capture_device.h ('k') | media/video/capture/linux/video_capture_device_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/file_video_capture_device.cc

diff --git a/media/video/capture/file_video_capture_device.cc b/media/video/capture/file_video_capture_device.cc

index 79e8f3b8f269b9ac237ce00a87079a49dfcab0b0..3efa3e73276ac1f37c107b459583d7bec0cf7b1c 100644

--- a/media/video/capture/file_video_capture_device.cc

+++ b/media/video/capture/file_video_capture_device.cc

@@ -159,11 +159,11 @@ void FileVideoCaptureDevice::GetDeviceNames(Names* const device_names) {

void FileVideoCaptureDevice::GetDeviceSupportedFormats(

const Name& device,

- VideoCaptureCapabilities* formats) {

+ VideoCaptureFormats* supported_formats) {

base::PlatformFile file = OpenFileForRead(GetFilePathFromCommandLine());

- VideoCaptureCapability capture_capability;

- ParseFileAndExtractVideoFormat(file, &capture_capability.supported_format);

- formats->push_back(capture_capability);

+ VideoCaptureFormat capture_format;

+ ParseFileAndExtractVideoFormat(file, &capture_format);

+ supported_formats->push_back(capture_format);

CHECK(base::ClosePlatformFile(file));

}