media/video/capture/win/sink_filter_win.cc - Issue 913183006: Use BITMAPINFOHEADER from capture capability enumeration when using MJPG

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/win/sink_filter_win.cc

Issue 913183006: Use BITMAPINFOHEADER from capture capability enumeration when using MJPG (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed so that the SinkInputBit now uses the BITMAPINFOHEADER from capabilities enumeration. 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 side-by-side diff with in-line comments

Download patch

« media/video/capture/win/capability_list_win.h ('K') | « media/video/capture/win/sink_filter_win.h ('k') | media/video/capture/win/sink_input_pin_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/win/sink_filter_win.cc

diff --git a/media/video/capture/win/sink_filter_win.cc b/media/video/capture/win/sink_filter_win.cc

index ce31f1ae757992ad5cfe80b0fdc800b0bb7165a5..631dd17a99f8610e0910efcf6964738b6b1f22a4 100644

--- a/media/video/capture/win/sink_filter_win.cc

+++ b/media/video/capture/win/sink_filter_win.cc

@@ -35,8 +35,10 @@ SinkFilter::~SinkFilter() {

input_pin_->SetOwner(NULL);

}

-void SinkFilter::SetRequestedMediaFormat(const VideoCaptureFormat& format) {

- input_pin_->SetRequestedMediaFormat(format);

+void SinkFilter::SetRequestedMediaFormat(VideoPixelFormat pixel_format,

+ float frame_rate,

+ const BITMAPINFOHEADER& info_header) {

+ input_pin_->SetRequestedMediaFormat(pixel_format, frame_rate, info_header);

}

const VideoCaptureFormat& SinkFilter::ResultingFormat() {

« media/video/capture/win/capability_list_win.h ('K') | « media/video/capture/win/sink_filter_win.h ('k') | media/video/capture/win/sink_input_pin_win.h » ('j') | no next file with comments »