-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #132 from Azure/dev
3.5.2.0 Release
- Loading branch information
Showing
22 changed files
with
370 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
src/net/Client/ContentKeyAuthorization/Templates/ContentKeySpecs.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| //----------------------------------------------------------------------- | ||
| // <copyright file="ContentKeySpecs.cs" company="Microsoft">Copyright 2014 Microsoft Corporation</copyright> | ||
| // <license> | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </license> | ||
|
|
||
| using Newtonsoft.Json; | ||
| using Newtonsoft.Json.Converters; | ||
|
|
||
| namespace Microsoft.WindowsAzure.MediaServices.Client.Widevine | ||
| { | ||
| [JsonConverter(typeof(StringEnumConverter))] | ||
| public enum Hdcp | ||
| { | ||
| HDCP_NONE, | ||
| HDCP_V1, | ||
| HDCP_V2 | ||
| } | ||
|
|
||
| public class RequiredOutputProtection | ||
| { | ||
| /// <summary> | ||
| /// Indicates whether HDCP is required. | ||
| /// </summary> | ||
| public Hdcp hdcp { get; set; } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// See Widevine Modular DRM Proxy Integration documentation. | ||
| /// </summary> | ||
| public class ContentKeySpecs | ||
| { | ||
| /// <summary> | ||
| /// A track type name. | ||
| /// </summary> | ||
| [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] | ||
| public string track_type { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Unique identifier for the key. | ||
| /// </summary> | ||
| [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] | ||
| public string key_id { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Defines client robustness requirements for playback. | ||
| /// 1 - Software-based whitebox crypto is required. | ||
| /// 2 - Software crypto and an obfuscated decoder is required. | ||
| /// 3 - The key material and crypto operations must be performed | ||
| /// within a hardware backed trusted execution environment. | ||
| /// 4 - The crypto and decoding of content must be performed within | ||
| /// a hardware backed trusted execution environment. | ||
| /// 5 - The crypto, decoding and all handling of the media (compressed | ||
| /// and uncompressed) must be handled within a hardware backed trusted | ||
| /// execution environment. | ||
| /// </summary> | ||
| [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] | ||
| public int? security_level { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Indicates whether HDCP V1 or V2 is required or not. | ||
| /// </summary> | ||
| [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] | ||
| public RequiredOutputProtection required_output_protection { get; set; } | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
src/net/Client/ContentKeyAuthorization/Templates/WidevineMessage.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| //----------------------------------------------------------------------- | ||
| // <copyright file="WidevineMessage.cs" company="Microsoft">Copyright 2014 Microsoft Corporation</copyright> | ||
| // <license> | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </license> | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using Newtonsoft.Json; | ||
| using Newtonsoft.Json.Converters; | ||
|
|
||
| namespace Microsoft.WindowsAzure.MediaServices.Client.Widevine | ||
| { | ||
| [JsonConverter(typeof(StringEnumConverter))] | ||
| public enum AllowedTrackTypes { SD_ONLY, SD_HD } | ||
|
|
||
| /// <summary> | ||
| /// See Widevine Modular DRM Proxy Integration documentation. | ||
| /// </summary> | ||
| public class WidevineMessage | ||
| { | ||
| /// <summary> | ||
| /// Controls which content keys should be included in a license. | ||
| /// Only one of allowed_track_types and content_key_specs can be specified. | ||
| /// </summary> | ||
| [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] | ||
| public AllowedTrackTypes? allowed_track_types { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// A finer grained control on what content keys to return. | ||
| /// Only one of allowed_track_types and content_key_specs can be specified. | ||
| /// </summary> | ||
| [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] | ||
| public ContentKeySpecs[] content_key_specs { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Policy settings for this license. In the event this asset has | ||
| /// a pre-defined policy, these specified values will be used. | ||
| /// </summary> | ||
| [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] | ||
| public object policy_overrides { get; set; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.