Merge pull request #191156 from IngridAtMicrosoft/movenet

Merging files

Author: tamarakhader

.openpublishing.redirection.media-services.json

@@ -639,7 +639,52 @@
             "source_path_from_root": "/articles/media-services/latest/job-create-cli-how-to.md",
             "redirect_url": "/azure/media-services/latest/job-create-how-to",
             "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          }, 
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-presets-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
           },   
+          {
+            "source_path_from_root": "/articles/media-services/latest/crop-howto.md",
+            "redirect_url": "/azure/media-services/latest/transform-crop-how-to",
+            "redirect_document_id": false
+          },  
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/media-reserved-units-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/media-reserved-units-how-to",
+            "redirect_document_id": false
+          },
         {
             "source_path_from_root": "/articles/media-services/latest/latest/asset-publish-cli-how-to.md",
             "redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",

articles/media-services/latest/TOC.yml

@@ -504,46 +504,37 @@
     - name: Create a transform
       href: transform-create-transform-how-to.md
       displayName: Transform, encoding, encode, encoder, thumbnail, H264, HEVC, MP4, TS, MOV, MXF, Content aware encoding, ABR, adaptive bitrate, custom encoding, custom job, job, preset
-    - name: Create a basic audio transform with REST
+    - name: Create a basic audio transform
       href: transform-create-basic-audio-how-to.md
       displayName: Transform, speech to text, audio, transcription, captions, subtitles, translation, language, accessibility
     - name: Create thumbnail sprites
       href: transform-create-thumbnail-sprites-how-to.md
       displayName: thumbnail, thumbnails, encoder, encode, sprite, webVTT sprite, webVTT, web VTT, sprites, poster, VTT
-    - name: Stitch two or more video files with .NET
+    - name: Stitch two or more video files
       href: transform-stitch-how-to.md
       displayName: stitch, edit, edit decision list, edl, stitching, combine, merge, clips, highlight
-    - name: Subclip a video .NET
-      href: transform-subclip-video-dotnet-how-to.md
+    - name: Subclip a video
+      href: transform-subclip-video-how-to.md
       displayName: clip, highlight, clips, edit, edit decision list, edl, trim, head, tail, clipping, trimming, editing, subclipping, remove
-    - name: Subclip a video REST
-      href: transform-subclip-video-rest-how-to.md
-      displayName: clip, highlight, clips, edit, edit decision list, edl, trim, head, tail, clipping, trimming, editing, subclipping, remove
-    - name: Customize encoder presets .NET
-      href: transform-custom-presets-how-to.md
+    - name: Customize encoder transforms
+      href: transform-custom-transform-how-to.md
       displayName: custom, preset, custom preset, custom encoding, user defined, customize, presets, transcode, encode, encoding, encoder, MES, Standard encoder, .NET, transform, custom transform
-    - name: Create an overlay transform .NET
+    - name: Create an overlay transform
       href: transform-create-overlay-how-to.md
       displayName: overlay, video overlay, audio overlay, audio silence, remove audio, redact video, logo, lower third, bug, brand, branding, text overlay, graphic overlay, graphics, image overlay, image
-    - name: Generate thumbnails .NET
-      href: transform-generate-thumbnails-dotnet-how-to.md
+    - name: Generate thumbnails
+      href: transform-generate-thumbnails-how-to.md
       displayName: thumbnail, generate thumbnail, thumbnail job, job, image, jpg, png, bmp, sprite, VTT, WebVTT, best frame, automatic thumbnail, poster, poster frame, step, percentage
-    - name: Crop videos with .NET
-      href: crop-howto.md
+    - name: Crop videos
+      href: transform-crop-how-to.md
       displayName: encoder, transcoder, encode, custom preset, crop, resolution, aspect ratio, pixels, remove, 
-    - name: Customize encoder presets CLI
-      href: transform-custom-preset-cli-how-to.md
-      displayName: CLI, custom preset, encoder, transcoder, custom
-    - name: Customize encoder presets REST
-      displayName: encode, encoding, custom, transform, REST
-      href: transform-custom-preset-rest-how-to.md
-    - name: Generate thumbnails REST
-      href: transform-generate-thumbnails-rest-how-to.md
+    - name: Generate thumbnails
+      href: transform-generate-thumbnails-how-to.md
       displayName: thumbnail, generate thumbnail, thumbnail job, job, image, jpg, png, bmp, sprite, VTT, WebVTT, best frame, automatic thumbnail, poster, poster frame, step, percentage
-    - name: Create a copyAllBitrateNonInterleaved transform with REST
+    - name: Create a copyAllBitrateNonInterleaved transform
       href: transform-create-copyallbitratenoninterleaved-how-to.md
       displayName: Copy, copy bitrates, copyAllBitrateNonInterleaved
-    - name: Copy videos without re-encoding with REST
+    - name: Copy videos without re-encoding
       href: transform-create-copy-video-audio-how-to.md
       displayName: copy videos, copy, copy codec, copy video codec, copy audio codec, fast encoding, fast remux, remuxing, re-package, packaging, re-encoding
     - name: Use the content aware encoding preset
@@ -561,10 +552,10 @@
       href: transform-delete-transform-how-to.md
   - name: Create jobs
     items:
-    - name: Create jobs with CLI
+    - name: Create jobs
       href: job-create-cli-how-to.md
       displayName: CLI, create job, jobs, submit job, encode with CLI, encode
-    - name: Create job input with a local file and .NET
+    - name: Create job input with a local file
       displayName: upload, upload file, ingest file, local file, uploading, CLI
       href: job-input-from-local-file-how-to.md
     - name: Jobs with multiple transform outputs
@@ -584,8 +575,8 @@
     - name: Live event error codes
       href: live-event-error-codes-reference.md  
       displayName: live event, error codes, error, codes, live streaming, debugging, troubleshooting live
-    - name: Scale media reserved units CLI
-      href: media-reserved-units-cli-how-to.md   
+    - name: Scale media reserved units
+      href: media-reserved-units-how-to.md   
       displayName: CLI, MRU, media reserved units, scaling
   - name: Use Event Grid
     items:
@@ -606,7 +597,7 @@
   - name: Protect content
     items:
     - name: Get content key policy
-      href: drm-get-content-key-policy-dotnet-how-to.md   
+      href: drm-get-content-key-policy-how-to.md   
       displayName: content protection, DRM, content keys, content key policy, .NET, how to, how-to, sample, tutorial, 
     - name: Offline FairPlay for iOS 
       href: drm-offline-fairplay-for-ios-concept.md
@@ -668,7 +659,7 @@
           displayName: security, private link, links, firewall, storage account, storage, private, links, secure
       - name: Secure streaming
         items:
-        - name: How to pass authentication tokens to the key delivery service
+        - name: Pass authentication tokens to key delivery service
           href: security-pass-authentication-tokens-how-to.md
           displayName: AMP, player, Azure Media Player, authentication, tokens, auth tokens, token auth, authentication tokens
   - name: Use media players

articles/media-services/latest/concept-media-reserved-units.md

@@ -19,17 +19,17 @@ ms.author: inhenkel
 
 [!INCLUDE [media services api v3 logo](./includes/v3-hr.md)]
 
-Media Reserved Units (MRUs) were previously used in Azure Media Services v2 to control encoding concurrency and performance. You no longer need to manage MRUs or request quota increases for any media services account as the system will automatically scale up and down based on load. You will also see performance that is equal to or improved in comparison to using MRUs. 
+Media Reserved Units (MRUs) were previously used in Azure Media Services v2 to control encoding concurrency and performance. You no longer need to manage MRUs or request quota increases for any media services account as the system will automatically scale up and down based on load. You'll also see performance that is equal to or improved in comparison to using MRUs. 
 
-If you have an account that was created using a version prior to the 2020-05-01 API, you will still have access to API’s for managing MRUs, however none of the MRU configuration that you set will be used to control encoding concurrency or performance. If you don’t see the option to manage MRUs in the Azure portal, you have an account that was created with the 2020-05-01 API or later. 
+If you have an account that was created using a version prior to the 2020-05-01 API, you'll still have access to APIs for managing MRUs, however none of the MRU configuration that you set will be used to control encoding concurrency or performance. If you don’t see the option to manage MRUs in the Azure portal, you have an account that was created with the 2020-05-01 API or later. 
 
 ## Billing
 
-While there were previously charges for Media Reserved Units, as of April 17, 2021 there are no longer any charges for accounts that have configuration for Media Reserved Units. For more information on billing for encoding jobs, please see [Encoding video and audio with Media Services](encoding-concept.md)
+While there were previously charges for Media Reserved Units, as of April 17, 2021 there are no longer any charges for accounts that have configuration for Media Reserved Units. For more information on billing for encoding jobs, see [Encoding video and audio with Media Services](encoding-concept.md)
 
-For accounts created in with the **2020-05-01** version of the API (i.e. the v3 version) or through the Azure portal, scaling and media reserved units are no longer required. Scaling is now automatically handled by the service internally. Media reserved units are no longer needed or supported for any Azure Media Services account. See [Media reserved units (legacy)](concept-media-reserved-units.md) for additional information.
+For accounts created in with the **2020-05-01** version of the API, that is, the v3 version, or through the Azure portal, scaling and media reserved units are no longer required. Scaling is now automatically handled by the service internally. Media reserved units are no longer needed or supported for any Azure Media Services account. See [Media reserved units (legacy)](concept-media-reserved-units.md) for additional information.
 
 ## See also
 
 * [Migrate from Media Services v2 to v3](migrate-v-2-v-3-migration-introduction.md)
-* [Scale Media Reserved Units with CLI](media-reserved-units-cli-how-to.md)
+* [Scale Media Reserved Units with CLI](media-reserved-units-how-to.md)

articles/media-services/latest/configure-connect-dotnet-howto.md

@@ -235,10 +235,10 @@ namespace ConsoleApp1
 - [Tutorial: Analyze videos with Media Services v3 - .NET](analyze-videos-tutorial.md)
 - [Create a job input from a local file - .NET](job-input-from-local-file-how-to.md)
 - [Create a job input from an HTTPS URL - .NET](job-input-from-http-how-to.md)
-- [Encode with a custom Transform - .NET](transform-custom-presets-how-to.md)
+- [Encode with a custom Transform - .NET](transform-custom-transform-how-to.md)
 - [Use AES-128 dynamic encryption and the key delivery service - .NET](drm-playready-license-template-concept.md)
 - [Use DRM dynamic encryption and license delivery service - .NET](drm-protect-with-drm-tutorial.md)
-- [Get a signing key from the existing policy - .NET](drm-get-content-key-policy-dotnet-how-to.md)
+- [Get a signing key from the existing policy - .NET](drm-get-content-key-policy-how-to.md)
 - [Create filters with Media Services - .NET](filters-dynamic-manifest-dotnet-how-to.md)
 - [Advanced video on-demand examples of Azure Functions v2 with Media Services v3](https://aka.ms/ams3functions)
 

articles/media-services/latest/drm-content-key-policy-concept.md

@@ -47,7 +47,7 @@ Usually, you associate your content key policy with your [Streaming Locator](str
 
 ## Example
 
-To get to the key, use `GetPolicyPropertiesWithSecretsAsync`, as shown in the [Get a signing key from the existing policy](drm-get-content-key-policy-dotnet-how-to.md#get-contentkeypolicy-with-secrets) example.
+To get to the key, use `GetPolicyPropertiesWithSecretsAsync`, as shown in the [Get a signing key from the existing policy](drm-get-content-key-policy-how-to.md#get-contentkeypolicy-with-secrets) example.
 
 ## Filtering, ordering, paging
 

articles/media-services/latest/drm-get-content-key-policy-dotnet-how-to.md renamed to articles/media-services/latest/drm-get-content-key-policy-how-to.md

@@ -1,18 +1,12 @@
 ---
-title: Get a signing key from a policy  .NET
-description: This topic shows how to get a signing key from the existing policy using Media Services v3 .NET SDK.
-services: media-services
-documentationcenter: ''
+title: Get a signing key from a policy
+description: This topic shows how to get a signing key from the existing policy using Media Services v3.
 author: IngridAtMicrosoft
 manager: femila
-editor: ''
 ms.service: media-services
-ms.workload: 
-ms.devlang: csharp
 ms.topic: how-to
-ms.date: 05/25/2021
+ms.date: 03/09/2022
 ms.author: inhenkel
-ms.custom: seodec18
 ---
 
 # Get a signing key from the existing policy
@@ -21,9 +15,9 @@ ms.custom: seodec18
 
 One of the key design principles of the v3 API is to make the API more secure. v3 APIs do not return secrets or credentials on **Get** or **List** operations. See the detailed explanation here: For more information, see [Azure RBAC and Media Services accounts](security-rbac-concept.md)
 
-The example in this article shows how to use .NET to get a signing key from the existing policy. 
- 
-## Download 
+The example in this article shows how to get a signing key from the existing policy.
+
+## Download
 
 Clone a GitHub repository that contains the full .NET sample to your machine using the following command:  
 
@@ -33,12 +27,12 @@ Clone a GitHub repository that contains the full .NET sample to your machine usi
 
 The ContentKeyPolicy with secrets example is located in the [EncryptWithDRM](https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials/tree/main/AMSV3Tutorials/EncryptWithDRM) folder.
 
-## Get ContentKeyPolicy with secrets 
+## [.NET](#tab/net/)
+
+## Get ContentKeyPolicy with secrets
 
 To get to the key, use **GetPolicyPropertiesWithSecretsAsync**, as shown in the example below.
 
 [!code-csharp[Main](../../../media-services-v3-dotnet-tutorials/AMSV3Tutorials/EncryptWithDRM/Program.cs#GetOrCreateContentKeyPolicy)]
 
-## Next steps
-
-[Design of a multi-DRM content protection system with access control](architecture-design-multi-drm-system.md) 
+---

articles/media-services/latest/drm-offline-fairplay-for-ios-concept.md

@@ -1,15 +1,14 @@
 ---
 title: Media Services v3 offline FairPlay Streaming for iOS
 description: This topic gives an overview and shows how to use Azure Media Services v3 to dynamically encrypt your HTTP Live Streaming (HLS) content with Apple FairPlay in offline mode.
-services: media-services
 author: willzhan
 manager: femila
 ms.service: media-services
-ms.devlang: csharp
 ms.topic: how-to
-ms.date: 05/25/2021
+ms.date: 03/09/2022
 ms.author: inhenkel
 ---
+
 # Offline FairPlay Streaming for iOS with Media Services v3
 
 [!INCLUDE [media services api v3 logo](./includes/v3-hr.md)]
@@ -53,6 +52,8 @@ Before you implement offline DRM for FairPlay on an iOS 10+ device:
 
     You will need to modify the code in [Encrypt with DRM using .NET](https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials/tree/main/AMSV3Tutorials/EncryptWithDRM) to add FairPlay configurations.  
 
+## [.NET](#tab/net/)
+
 ## Configure content protection in Azure Media Services
 
 In the [GetOrCreateContentKeyPolicyAsync](https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials/blob/main/AMSV3Tutorials/EncryptWithDRM/Program.cs#L192) method, do the following:
@@ -194,6 +195,8 @@ Three test samples in Media Services cover the following three scenarios:
 You can find these samples at [this demo site](https://aka.ms/poc#22), with the corresponding application certificate hosted in an Azure web app.
 With either the version 3 or version 4 sample of the FPS Server SDK, if a master playlist contains alternate audio, during offline mode it plays audio only. Therefore, you need to strip the alternate audio. In other words, the second and third samples listed previously work in online and offline mode. The sample listed first plays audio only during offline mode, while online streaming works properly.
 
+---
+
 ## Offline Fairplay questions
 
 See [offline fairplay questions in the FAQ](frequently-asked-questions.yml).

articles/media-services/latest/drm-offline-playready-streaming-for-windows-10.md

@@ -3,18 +3,12 @@ title: Configure offline PlayReady streaming
 description: This article shows how to configure your Azure Media Services v3 account for streaming PlayReady for Windows 10 offline.
 services: media-services
 keywords: DASH, DRM, Widevine Offline Mode, ExoPlayer, Android
-documentationcenter: ''
 author: willzhan
-manager: steveng
-editor: ''
+manager: femila
 ms.service: media-services
-ms.workload: media
-ms.tgt_pltfrm: na
-ms.devlang: csharp
-ms.topic: article
-ms.date: 08/31/2020
-ms.author: willzhan
-ms.custom: devx-track-csharp
+ms.topic: how-to
+ms.date: 03/09/2022
+ms.author: inhenkel
 ---
 
 # Offline PlayReady Streaming for Windows 10 with Media Services v3
@@ -68,6 +62,8 @@ Below are two sets of test assets, the first one using PlayReady license deliver
 
 For playback testing, we used a Universal Windows Application on Windows 10. In [Windows 10 Universal samples](https://github.com/Microsoft/Windows-universal-samples), there is a basic player sample called [Adaptive Streaming Sample](https://github.com/Microsoft/Windows-universal-samples/tree/master/Samples/AdaptiveStreaming). All we have to do is to add the code for us to pick downloaded video and use it as the source, instead of adaptive streaming source. The changes are in button click event handler:
 
+## [.NET](#tab/net/)
+
 ```csharp
 private async void LoadUri_Click(object sender, RoutedEventArgs e)
 {
@@ -119,3 +115,5 @@ In summary, we have achieved offline mode on Azure Media Services:
 * Content can be hosted in Azure Media Services or Azure Storage for progressive download;
 * PlayReady license delivery can be from Azure Media Services or elsewhere;
 * The prepared smooth streaming content can still be used for online streaming via DASH or smooth with PlayReady as the DRM.
+
+---