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

Unified Diff: media/video/capture/win/sink_input_pin_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/video/capture/win/sink_filter_win.cc ('k') | media/video/capture/win/sink_input_pin_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/win/sink_input_pin_win.h
diff --git a/media/video/capture/win/sink_input_pin_win.h b/media/video/capture/win/sink_input_pin_win.h
index f14ca33073cadcf862328fde1ba19e35e420c70a..c8767def28be0142c031afdb7681d0605fdf5d02 100644
--- a/media/video/capture/win/sink_input_pin_win.h
+++ b/media/video/capture/win/sink_input_pin_win.h
@@ -24,7 +24,9 @@ class SinkInputPin : public PinBase {
SinkInputPin(IBaseFilter* filter, SinkFilterObserver* observer);
virtual ~SinkInputPin();
- void SetRequestedMediaFormat(const VideoCaptureFormat& format);
+ void SetRequestedMediaFormat(VideoPixelFormat pixel_format,
+ float frame_rate,
+ const BITMAPINFOHEADER& info_header);
// Returns the capability that is negotiated when this
// pin is connected to a media filter.
const VideoCaptureFormat& ResultingFormat();
@@ -36,7 +38,9 @@ class SinkInputPin : public PinBase {
STDMETHOD(Receive)(IMediaSample* media_sample);
private:
- VideoCaptureFormat requested_format_;
+ VideoPixelFormat requested_pixel_format_;
+ float requested_frame_rate_;
+ BITMAPINFOHEADER requested_info_header_;
VideoCaptureFormat resulting_format_;
SinkFilterObserver* observer_;
« no previous file with comments | « media/video/capture/win/sink_filter_win.cc ('k') | media/video/capture/win/sink_input_pin_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698