Index: chromeos/display/output_configurator.h |
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h |
index 5891785381cb22161e41415a98e62b8fd00679b1..e7d0655923af1faa205762389981bf57cc118267 100644 |
--- a/chromeos/display/output_configurator.h |
+++ b/chromeos/display/output_configurator.h |
@@ -25,6 +25,10 @@ typedef XID RROutput; |
typedef XID RRCrtc; |
typedef XID RRMode; |
+namespace chrome { |
+class PepperOutputProtectionHost; |
+} // namespace chrome |
+ |
namespace chromeos { |
// Used to describe the state of a multi-display configuration. |
@@ -36,6 +40,23 @@ enum OutputState { |
STATE_DUAL_EXTENDED, |
}; |
+// Video output link types. |
+enum OutputLinkType { |
+ OUTPUT_LINK_TYPE_NONE = 0, |
+ OUTPUT_LINK_TYPE_UNKNOWN = 1 << 0, |
+ OUTPUT_LINK_TYPE_INTERNAL = 1 << 1, |
+ OUTPUT_LINK_TYPE_VGA = 1 << 2, |
+ OUTPUT_LINK_TYPE_HDMI = 1 << 3, |
+ OUTPUT_LINK_TYPE_DVI = 1 << 4, |
+ OUTPUT_LINK_TYPE_DISPLAYPORT = 1 << 5, |
+}; |
+ |
+// Content protection methods applied on video output link. |
+enum OutputProtectionMethod { |
+ OUTPUT_PROTECTION_METHOD_NONE, |
dmichael (off chromium)
2013/09/17 17:25:33
= 0?
kcwu
2013/09/17 23:15:32
Done.
|
+ OUTPUT_PROTECTION_METHOD_HDCP = 1 << 0, |
+}; |
+ |
// This class interacts directly with the underlying Xrandr API to manipulate |
// CTRCs and Outputs. |
class CHROMEOS_EXPORT OutputConfigurator |
@@ -218,6 +239,23 @@ class CHROMEOS_EXPORT OutputConfigurator |
// Sends a D-Bus message to the power manager telling it that the |
// machine is or is not projecting. |
virtual void SendProjectingStateToPowerManager(bool projecting) = 0; |
+ |
+ // Register a client for output protection and request a client id. Returns |
+ // 0 if requesting failed. |
+ virtual uint64_t RegisterOutputProtectionClient() = 0; |
+ // Unregister the client. |
+ virtual void UnregisterOutputProtectionClient(uint64_t client_id) = 0; |
+ // Query link status and protection status. Returns true on success. |
+ virtual bool QueryOutputProtectionStatus( |
+ uint64_t client_id, |
+ uint32_t* link_mask, |
+ uint32_t* protection_mask) = 0; |
+ |
+ // Request the desired protection methods. Returns true when the protection |
+ // request has been made. |
+ virtual bool EnableOutputProtection( |
+ uint64_t client_id, |
+ uint32_t desired_method_mask) = 0; |
}; |
// Helper class used by tests. |
@@ -348,6 +386,30 @@ class CHROMEOS_EXPORT OutputConfigurator |
// so that time-consuming ConfigureOutputs() won't be called multiple times. |
void ScheduleConfigureOutputs(); |
+ // Register a client for output protection and request a client id. Returns |
+ // 0 if requesting failed. |
+ uint64_t RegisterOutputProtectionClient(); |
+ // Unregister the client. |
+ void UnregisterOutputProtectionClient(uint64_t client_id); |
+ // Query link status and protection status. |
+ // |link_mask| is the type of connected output links, which is a bitmask |
+ // of PP_OutputProtectionLinkType_Private values. |protection_mask| is the |
+ // desired protection methods, which is a bitmask of the |
+ // PP_OutputProtectionMethod_Private values. |
+ // Returns true on success. |
+ bool QueryOutputProtectionStatus( |
+ uint64_t client_id, |
+ uint32_t* link_mask, |
+ uint32_t* protection_mask); |
+ |
+ // Request the desired protection methods. |
+ // |protection_mask| is the desired protection methods, which is a bitmask |
+ // of the PP_OutputProtectionMethod_Private values. |
+ // Returns true when the protection request has been made. |
+ bool EnableOutputProtection( |
+ uint64_t client_id, |
+ uint32_t desired_method_mask); |
+ |
private: |
// Configure outputs. |
void ConfigureOutputs(); |