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

Side by Side Diff: media/video/capture/win/capability_list_win.h

Issue 913183006: Use BITMAPINFOHEADER from capture capability enumeration when using MJPG (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed a nit. Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/video/capture/win/capability_list_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Windows specific implementation of VideoCaptureDevice. 5 // Windows specific implementation of VideoCaptureDevice.
6 // DirectShow is used for capturing. DirectShow provide its own threads 6 // DirectShow is used for capturing. DirectShow provide its own threads
7 // for capturing. 7 // for capturing.
8 8
9 #ifndef MEDIA_VIDEO_CAPTURE_WIN_CAPABILITY_LIST_WIN_H_ 9 #ifndef MEDIA_VIDEO_CAPTURE_WIN_CAPABILITY_LIST_WIN_H_
10 #define MEDIA_VIDEO_CAPTURE_WIN_CAPABILITY_LIST_WIN_H_ 10 #define MEDIA_VIDEO_CAPTURE_WIN_CAPABILITY_LIST_WIN_H_
11 11
12 #include <list> 12 #include <list>
13 #include <windows.h>
13 14
14 #include "media/video/capture/video_capture_types.h" 15 #include "media/video/capture/video_capture_types.h"
15 16
16 namespace media { 17 namespace media {
17 18
18 struct CapabilityWin { 19 struct CapabilityWin {
19 CapabilityWin(int index, const VideoCaptureFormat& format) 20 CapabilityWin(int index, const VideoCaptureFormat& format)
20 : stream_index(index), supported_format(format) {} 21 : stream_index(index), supported_format(format) {}
21 int stream_index; 22
22 VideoCaptureFormat supported_format; 23 // Used by VideoCaptureDeviceWin.
24 CapabilityWin(int index, const VideoCaptureFormat& format,
25 const BITMAPINFOHEADER& info_header)
26 : stream_index(index),
27 supported_format(format),
28 info_header(info_header) {
29 }
30
31 const int stream_index;
32 const VideoCaptureFormat supported_format;
33
34 // |info_header| is only valid if DirectShow is used.
35 const BITMAPINFOHEADER info_header;
23 }; 36 };
24 37
25 typedef std::list<CapabilityWin> CapabilityList; 38 typedef std::list<CapabilityWin> CapabilityList;
26 39
27 CapabilityWin GetBestMatchedCapability(const VideoCaptureFormat& requested, 40 const CapabilityWin& GetBestMatchedCapability(
28 const CapabilityList& capabilities); 41 const VideoCaptureFormat& requested,
42 const CapabilityList& capabilities);
29 43
30 } // namespace media 44 } // namespace media
31 45
32 #endif // MEDIA_VIDEO_CAPTURE_WIN_CAPABILITY_LIST_WIN_H_ 46 #endif // MEDIA_VIDEO_CAPTURE_WIN_CAPABILITY_LIST_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | media/video/capture/win/capability_list_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698