Added Widevine Base License Acquisition + FairPlay support (#849)

* Widevine Base Aquisition Url + FairPlay types

* Added FairPlay support + sample

* Updated readme

* Updated examples readme

* Update .gitignore

* Fixed identation issues

* Fixed identation issues #2

* revert changes to TokenRestrictionTemplateSerializer

* # padding on content key checksum generation is now optional

README.md

@@ -43,9 +43,9 @@ Microsoft Azure tables, blobs, queues, service bus (queues and topics), service
   * Encoding / process asset, create job, job templates
   * Manage media services entities: create / update / read / delete / get list
   * Delivery SAS and Streaming media content
-  * Dynamic encryption: AES and DRM (PlayReady/Widevine) with and without Token restriction
+  * Dynamic encryption: AES and DRM (PlayReady/Widevine/FairPlay) with and without Token restriction
   * Scale encoding reserved unit type
-  * REST API Version: 2.11
+  * REST API Version: 2.12
 
 
 # Getting Started

examples/MediaServices/README.md

@@ -1,7 +1,9 @@
 This folder contains the following Azure Media Service PHP SDK samples:
 
+* userconfig.php: common file to store the AMS credentials to execute the samples. 
 * vodworkflow_aes.php: End-to-end VOD workflow that applies AES content protection.
-* vodworkflow_aes.php: End-to-end VOD workflow that applies DRM (PlayReady + Widevine) content protection.
+* vodworkflow_drm_playready_widevine.php: End-to-end VOD workflow that applies DRM (PlayReady + Widevine) content protection.
+* vodworkflow_drm_fairplay.php: End-to-end VOD workflow that applies DRM (FairPlay) content protection.
 * scale_encoding_units.php: Scales the encoding reserved units.
 
 To run these samples you can use the following command (assuming that your include_path are correctly configured)

examples/MediaServices/vodworkflow_aes.php

@@ -45,9 +45,9 @@
 use WindowsAzure\MediaServices\Models\AssetDeliveryProtocol;
 use WindowsAzure\MediaServices\Models\AssetDeliveryPolicyType;
 use WindowsAzure\MediaServices\Models\AssetDeliveryPolicyConfigurationKey;
+use WindowsAzure\MediaServices\Templates\SymmetricVerificationKey;
 use WindowsAzure\MediaServices\Templates\TokenRestrictionTemplateSerializer;
 use WindowsAzure\MediaServices\Templates\TokenRestrictionTemplate;
-use WindowsAzure\MediaServices\Templates\SymmetricVerificationKey;
 use WindowsAzure\MediaServices\Templates\TokenClaim;
 use WindowsAzure\MediaServices\Templates\TokenType;
 
@@ -106,7 +106,7 @@ function uploadFileAndCreateAsset($restProxy, $mezzanineFileName)
     $asset = $restProxy->createAsset($asset);
     $assetId = $asset->getId();
 
-    echo 'Asset created: name='.$asset->getName().' id='.$assetId."\r\n";
+    echo "Asset created: name={$asset->getName()} id={$assetId}\r\n";
 
     // 1.3. create an Access Policy with Write permissions
     $accessPolicy = new AccessPolicy('UploadAccessPolicy');
@@ -284,7 +284,7 @@ function createAssetDeliveryPolicy($restProxy, $encodedAsset, $contentKey)
     // 5.2 Generate the AssetDeliveryPolicy Configuration Key
     $randomKey = Utilities::generateCryptoKey(16);
     $configuration = [AssetDeliveryPolicyConfigurationKey::ENVELOPE_KEY_ACQUISITION_URL => $acquisitionUrl,
-                      AssetDeliveryPolicyConfigurationKey::ENVELOPE_ENCRYPTION_IV_AS_BASE64 => base64_encode($randomKey), ];
+                      AssetDeliveryPolicyConfigurationKey::ENVELOPE_ENCRYPTION_IV_AS_BASE64 => base64_encode($randomKey)];
     $confJson = AssetDeliveryPolicyConfigurationKey::stringifyAssetDeliveryPolicyConfiguartionKey($configuration);
 
     // 5.3 Create the AssetDeliveryPolicy
@@ -369,3 +369,5 @@ function endsWith($haystack, $needle)
 
     return substr($haystack, -$length) === $needle;
 }
+
+?>