Index: gpu/config/gpu_info.h |
diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h |
index bdbb20562cafdb446f5974861593aae1c6693e4c..7bc9539d22e682422ce544ecc97d0f080d6973c2 100644 |
--- a/gpu/config/gpu_info.h |
+++ b/gpu/config/gpu_info.h |
@@ -18,7 +18,7 @@ |
#include "gpu/config/dx_diag_node.h" |
#include "gpu/config/gpu_performance_stats.h" |
#include "gpu/gpu_export.h" |
-#include "media/video/video_encode_accelerator.h" |
+#include "ui/gfx/geometry/size.h" |
namespace gpu { |
@@ -35,6 +35,15 @@ enum CollectInfoResult { |
kCollectInfoFatalFailure = 3 |
}; |
+// Specification of an encoding profile supported by a hardware encoder. |
+struct GPU_EXPORT VideoEncodeAcceleratorSupportedProfile { |
+ // This is media::VideoCodecProfile. Use int to avoid the dependency on media. |
piman
2014/10/21 19:41:53
Can you move the enum here?
|
+ int profile; |
+ gfx::Size max_resolution; |
+ uint32 max_framerate_numerator; |
+ uint32 max_framerate_denominator; |
+}; |
+ |
struct GPU_EXPORT GPUInfo { |
struct GPU_EXPORT GPUDevice { |
GPUDevice(); |
@@ -178,7 +187,7 @@ struct GPU_EXPORT GPUInfo { |
DxDiagNode dx_diagnostics; |
#endif |
- std::vector<media::VideoEncodeAccelerator::SupportedProfile> |
+ std::vector<VideoEncodeAcceleratorSupportedProfile> |
video_encode_accelerator_supported_profiles; |
// Note: when adding new members, please remember to update EnumerateFields |
// in gpu_info.cc. |
@@ -204,7 +213,7 @@ struct GPU_EXPORT GPUInfo { |
virtual void BeginGPUDevice() = 0; |
virtual void EndGPUDevice() = 0; |
- // Markers indicating that a VideoEncodeAccelerator::SupportedProfile is |
+ // Markers indicating that a VideoEncodeAcceleratorSupportedProfile is |
// being described. |
virtual void BeginVideoEncodeAcceleratorSupportedProfile() = 0; |
virtual void EndVideoEncodeAcceleratorSupportedProfile() = 0; |