Index: gpu/config/gpu_info.cc |
diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc |
index f1f67cee9178fce094c4532877a53ea22888e90b..2e89d0ed3254643e4bb2db00f2b9f925eaccf17c 100644 |
--- a/gpu/config/gpu_info.cc |
+++ b/gpu/config/gpu_info.cc |
@@ -17,9 +17,26 @@ void EnumerateGPUDevice(gpu::GPUInfo::Enumerator* enumerator, |
enumerator->EndGPUDevice(); |
} |
+void EnumerateVideoDecodeAcceleratorSupportedResolution( |
wuchengli
2014/12/23 03:37:20
According to the style guide, the input parameter
henryhsu
2014/12/23 05:52:06
Done.
|
+ gpu::GPUInfo::Enumerator* enumerator, |
+ const gpu::VideoDecodeAcceleratorSupportedResolution& resolution) { |
+ enumerator->AddInt( |
+ "videoDecodeAcceleratorSupportedResolutionMinWidth", |
+ resolution.min.width()); |
+ enumerator->AddInt( |
+ "videoDecodeAcceleratorSupportedResolutionMinHeight", |
+ resolution.min.height()); |
+ enumerator->AddInt( |
+ "videoDecodeAcceleratorSupportedResolutionMaxWidth", |
+ resolution.max.width()); |
+ enumerator->AddInt( |
+ "videoDecodeAcceleratorSupportedResolutionMaxHeight", |
+ resolution.max.height()); |
+} |
+ |
void EnumerateVideoEncodeAcceleratorSupportedProfile( |
gpu::GPUInfo::Enumerator* enumerator, |
- const gpu::VideoEncodeAcceleratorSupportedProfile profile) { |
+ const gpu::VideoEncodeAcceleratorSupportedProfile& profile) { |
enumerator->BeginVideoEncodeAcceleratorSupportedProfile(); |
enumerator->AddInt("profile", profile.profile); |
enumerator->AddInt("maxResolutionWidth", profile.max_resolution.width()); |
@@ -101,6 +118,8 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const { |
CollectInfoResult dx_diagnostics_info_state; |
DxDiagNode dx_diagnostics; |
#endif |
+ VideoDecodeAcceleratorSupportedResolution |
+ video_decode_accelerator_supported_resolution; |
std::vector<VideoEncodeAcceleratorSupportedProfile> |
video_encode_accelerator_supported_profiles; |
}; |
@@ -158,6 +177,8 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const { |
enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state); |
#endif |
// TODO(kbr): add dx_diagnostics on Windows. |
+ EnumerateVideoDecodeAcceleratorSupportedResolution( |
+ enumerator, video_decode_accelerator_supported_resolution); |
for (size_t ii = 0; ii < video_encode_accelerator_supported_profiles.size(); |
++ii) { |
EnumerateVideoEncodeAcceleratorSupportedProfile( |