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

Unified Diff: media/video/capture/win/sink_input_pin_win.cc

Issue 22876027: Consolidate duplicated frame / capability structures in video_capture_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased: changed media::VideoCaptureCapability::kI420 -> media::PIXEL_FORMAT_I420 etc. Created 7 years, 3 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/video_capture_types.cc ('k') | media/video/capture/win/video_capture_device_mf_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.cc
diff --git a/media/video/capture/win/sink_input_pin_win.cc b/media/video/capture/win/sink_input_pin_win.cc
index 7e55531b89fd35a4cb7caf3651b434ccb6d69a28..1de1ea1671adb340f409cf50fd482b7fce27bebf 100644
--- a/media/video/capture/win/sink_input_pin_win.cc
+++ b/media/video/capture/win/sink_input_pin_win.cc
@@ -114,17 +114,17 @@ bool SinkInputPin::IsMediaTypeValid(const AM_MEDIA_TYPE* media_type) {
}
if (sub_type == kMediaSubTypeI420 &&
pvi->bmiHeader.biCompression == MAKEFOURCC('I', '4', '2', '0')) {
- resulting_capability_.color = VideoCaptureCapability::kI420;
+ resulting_capability_.color = PIXEL_FORMAT_I420;
return true; // This format is acceptable.
}
if (sub_type == MEDIASUBTYPE_YUY2 &&
pvi->bmiHeader.biCompression == MAKEFOURCC('Y', 'U', 'Y', '2')) {
- resulting_capability_.color = VideoCaptureCapability::kYUY2;
+ resulting_capability_.color = PIXEL_FORMAT_YUY2;
return true; // This format is acceptable.
}
if (sub_type == MEDIASUBTYPE_RGB24 &&
pvi->bmiHeader.biCompression == BI_RGB) {
- resulting_capability_.color = VideoCaptureCapability::kRGB24;
+ resulting_capability_.color = PIXEL_FORMAT_RGB24;
return true; // This format is acceptable.
}
return false;
@@ -146,7 +146,7 @@ void SinkInputPin::SetRequestedMediaCapability(
resulting_capability_.width = 0;
resulting_capability_.height = 0;
resulting_capability_.frame_rate = 0;
- resulting_capability_.color = VideoCaptureCapability::kColorUnknown;
+ resulting_capability_.color = PIXEL_FORMAT_UNKNOWN;
resulting_capability_.expected_capture_delay = 0;
resulting_capability_.interlaced = false;
}
« no previous file with comments | « media/video/capture/video_capture_types.cc ('k') | media/video/capture/win/video_capture_device_mf_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698