Skip to content

Commit 31d7110

Browse files
more moves
1 parent 66e4e68 commit 31d7110

14 files changed

+75
-153
lines changed

articles/media-services/latest/TOC.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@
519519
- name: Customize encoder tranforms
520520
href: transform-custom-transform-how-to.md
521521
displayName: custom, preset, custom preset, custom encoding, user defined, customize, presets, transcode, encode, encoding, encoder, MES, Standard encoder, .NET, transform, custom transform
522-
- name: Create an overlay transform .NET
522+
- name: Create an overlay transform
523523
href: transform-create-overlay-how-to.md
524524
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
525525
- name: Generate thumbnails
@@ -531,10 +531,10 @@
531531
- name: Generate thumbnails
532532
href: transform-generate-thumbnails-how-to.md
533533
displayName: thumbnail, generate thumbnail, thumbnail job, job, image, jpg, png, bmp, sprite, VTT, WebVTT, best frame, automatic thumbnail, poster, poster frame, step, percentage
534-
- name: Create a copyAllBitrateNonInterleaved transform with REST
534+
- name: Create a copyAllBitrateNonInterleaved transform
535535
href: transform-create-copyallbitratenoninterleaved-how-to.md
536536
displayName: Copy, copy bitrates, copyAllBitrateNonInterleaved
537-
- name: Copy videos without re-encoding with REST
537+
- name: Copy videos without re-encoding
538538
href: transform-create-copy-video-audio-how-to.md
539539
displayName: copy videos, copy, copy codec, copy video codec, copy audio codec, fast encoding, fast remux, remuxing, re-package, packaging, re-encoding
540540
- name: Use the content aware encoding preset
@@ -552,10 +552,10 @@
552552
href: transform-delete-transform-how-to.md
553553
- name: Create jobs
554554
items:
555-
- name: Create jobs with CLI
555+
- name: Create jobs
556556
href: job-create-cli-how-to.md
557557
displayName: CLI, create job, jobs, submit job, encode with CLI, encode
558-
- name: Create job input with a local file and .NET
558+
- name: Create job input with a local file
559559
displayName: upload, upload file, ingest file, local file, uploading, CLI
560560
href: job-input-from-local-file-how-to.md
561561
- name: Jobs with multiple transform outputs
@@ -575,8 +575,8 @@
575575
- name: Live event error codes
576576
href: live-event-error-codes-reference.md
577577
displayName: live event, error codes, error, codes, live streaming, debugging, troubleshooting live
578-
- name: Scale media reserved units CLI
579-
href: media-reserved-units-cli-how-to.md
578+
- name: Scale media reserved units
579+
href: media-reserved-units-how-to.md
580580
displayName: CLI, MRU, media reserved units, scaling
581581
- name: Use Event Grid
582582
items:
@@ -659,7 +659,7 @@
659659
displayName: security, private link, links, firewall, storage account, storage, private, links, secure
660660
- name: Secure streaming
661661
items:
662-
- name: How to pass authentication tokens to the key delivery service
662+
- name: Pass authentication tokens to key delivery service
663663
href: security-pass-authentication-tokens-how-to.md
664664
displayName: AMP, player, Azure Media Player, authentication, tokens, auth tokens, token auth, authentication tokens
665665
- name: Use media players
Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
---
2-
title: Get a signing key from a policy .NET
3-
description: This topic shows how to get a signing key from the existing policy using Media Services v3 .NET SDK.
4-
services: media-services
5-
documentationcenter: ''
2+
title: Get a signing key from a policy
3+
description: This topic shows how to get a signing key from the existing policy using Media Services v3.
64
author: IngridAtMicrosoft
75
manager: femila
8-
editor: ''
96
ms.service: media-services
10-
ms.workload:
11-
ms.devlang: csharp
127
ms.topic: how-to
13-
ms.date: 05/25/2021
8+
ms.date: 03/09/2022
149
ms.author: inhenkel
15-
ms.custom: seodec18
1610
---
1711

1812
# Get a signing key from the existing policy
@@ -21,9 +15,9 @@ ms.custom: seodec18
2115

2216
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)
2317

24-
The example in this article shows how to use .NET to get a signing key from the existing policy.
25-
26-
## Download
18+
The example in this article shows how to to get a signing key from the existing policy.
19+
20+
## Download
2721

2822
Clone a GitHub repository that contains the full .NET sample to your machine using the following command:
2923

@@ -33,12 +27,12 @@ Clone a GitHub repository that contains the full .NET sample to your machine usi
3327

3428
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.
3529

36-
## Get ContentKeyPolicy with secrets
30+
## [.NET](#tab/net/)
31+
32+
## Get ContentKeyPolicy with secrets
3733

3834
To get to the key, use **GetPolicyPropertiesWithSecretsAsync**, as shown in the example below.
3935

4036
[!code-csharp[Main](../../../media-services-v3-dotnet-tutorials/AMSV3Tutorials/EncryptWithDRM/Program.cs#GetOrCreateContentKeyPolicy)]
4137

42-
## Next steps
43-
44-
[Design of a multi-DRM content protection system with access control](architecture-design-multi-drm-system.md)
38+
---

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
---
22
title: Media Services v3 offline FairPlay Streaming for iOS
33
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.
4-
services: media-services
54
author: willzhan
65
manager: femila
76
ms.service: media-services
8-
ms.devlang: csharp
97
ms.topic: how-to
10-
ms.date: 05/25/2021
8+
ms.date: 03/09/2022
119
ms.author: inhenkel
1210
---
11+
1312
# Offline FairPlay Streaming for iOS with Media Services v3
1413

1514
[!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:
5352

5453
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.
5554

55+
## [.NET](#tab/net/)
56+
5657
## Configure content protection in Azure Media Services
5758

5859
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:
194195
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.
195196
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.
196197

198+
---
199+
197200
## Offline Fairplay questions
198201

199202
See [offline fairplay questions in the FAQ](frequently-asked-questions.yml).

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@ title: Configure offline PlayReady streaming
33
description: This article shows how to configure your Azure Media Services v3 account for streaming PlayReady for Windows 10 offline.
44
services: media-services
55
keywords: DASH, DRM, Widevine Offline Mode, ExoPlayer, Android
6-
documentationcenter: ''
76
author: willzhan
8-
manager: steveng
9-
editor: ''
7+
manager: femila
108
ms.service: media-services
11-
ms.workload: media
12-
ms.tgt_pltfrm: na
13-
ms.devlang: csharp
14-
ms.topic: article
15-
ms.date: 08/31/2020
16-
ms.author: willzhan
17-
ms.custom: devx-track-csharp
9+
ms.topic: how-to
10+
ms.date: 03/09/2022
11+
ms.author: inhenkel
1812
---
1913

2014
# 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
6862

6963
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:
7064

65+
## [.NET](#tab/net/)
66+
7167
```csharp
7268
private async void LoadUri_Click(object sender, RoutedEventArgs e)
7369
{
@@ -119,3 +115,5 @@ In summary, we have achieved offline mode on Azure Media Services:
119115
* Content can be hosted in Azure Media Services or Azure Storage for progressive download;
120116
* PlayReady license delivery can be from Azure Media Services or elsewhere;
121117
* The prepared smooth streaming content can still be used for online streaming via DASH or smooth with PlayReady as the DRM.
118+
119+
---

articles/media-services/latest/drm-offline-widevine-for-android.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ services: media-services
55
author: willzhan
66
manager: femila
77
ms.service: media-services
8-
ms.workload: media
9-
ms.devlang: csharp
10-
ms.topic: conceptual
11-
ms.date: 05/25/2021
8+
ms.topic: how-to
9+
ms.date: 03/09/2022
1210
ms.author: inhenkel
1311
---
1412

@@ -52,6 +50,8 @@ Before implementing offline DRM for Widevine on Android devices, you should firs
5250
- [ExoPlayer Developer Guide](https://google.github.io/ExoPlayer/guide.html)
5351
- [EoPlayer Developer Blog](https://medium.com/google-exoplayer)
5452

53+
## [.NET](#tab/net/)
54+
5555
## Configure content protection in Azure Media Services
5656

5757
In the [GetOrCreateContentKeyPolicyAsync](https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials/blob/main/AMSV3Tutorials/EncryptWithDRM/Program.cs#L192) method, the following necessary steps are present:
@@ -148,6 +148,8 @@ The above open-source PWA app is authored in Node.js. If you want to host your o
148148
- The certificate must have trusted CA and a self-signed development certificate does not work
149149
- The certificate must have a CN matching the DNS name of the web server or gateway
150150

151+
---
152+
151153
## More information
152154

153155
For more information, see [Content Protection in the FAQ](frequently-asked-questions.yml).

articles/media-services/latest/job-create-how-to.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 03/01/2022
1010
ms.author: inhenkel
1111
---
1212

13-
# CLI example: Create and submit a job
13+
# Create a job
1414

1515
[!INCLUDE [media services api v3 logo](./includes/v3-hr.md)]
1616

Lines changed: 5 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
---
22
title: Download the results of a job - Azure Media Services
33
description: This article demonstrates how to download the results of a job.
4-
services: media-services
5-
documentationcenter: ''
64
author: IngridAtMicrosoft
75
manager: femila
8-
editor: ''
9-
10-
ms.service: media-services
11-
ms.workload:
6+
ms.service: media-services
127
ms.topic: how-to
13-
ms.date: 08/31/2020
8+
ms.date: 03/09/2022
149
ms.author: inhenkel
15-
ms.custom: devx-track-csharp
1610
---
1711

1812
# Download the results of a job
@@ -23,52 +17,9 @@ In Azure Media Services, when processing your videos (for example, encoding or a
2317

2418
This article demonstrates how to download the results using Java and .NET SDKs.
2519

26-
## Java
27-
28-
```java
29-
/**
30-
* Use Media Service and Storage APIs to download the output files to a local folder
31-
* @param manager The entry point of Azure Media resource management
32-
* @param resourceGroup The name of the resource group within the Azure subscription
33-
* @param accountName The Media Services account name
34-
* @param assetName The asset name
35-
* @param outputFolder The output folder for downloaded files.
36-
* @throws StorageException
37-
* @throws URISyntaxException
38-
* @throws IOException
39-
*/
40-
private static void downloadResults(MediaManager manager, String resourceGroup, String accountName,
41-
String assetName, File outputFolder) throws StorageException, URISyntaxException, IOException {
42-
ListContainerSasInput parameters = new ListContainerSasInput()
43-
.withPermissions(AssetContainerPermission.READ)
44-
.withExpiryTime(DateTime.now().plusHours(1));
45-
AssetContainerSas assetContainerSas = manager.assets()
46-
.listContainerSasAsync(resourceGroup, accountName, assetName, parameters).toBlocking().first();
47-
48-
String strSas = assetContainerSas.assetContainerSasUrls().get(0);
49-
CloudBlobContainer container = new CloudBlobContainer(new URI(strSas));
50-
51-
File directory = new File(outputFolder, assetName);
52-
directory.mkdir();
20+
## Methods
5321

54-
ArrayList<ListBlobItem> blobs = container.listBlobsSegmented(null, true, EnumSet.noneOf(BlobListingDetails.class), 200, null, null, null).getResults();
55-
56-
for (ListBlobItem blobItem: blobs) {
57-
if (blobItem instanceof CloudBlockBlob) {
58-
CloudBlockBlob blob = (CloudBlockBlob)blobItem;
59-
File downloadTo = new File(directory, blob.getName());
60-
61-
blob.downloadToFile(downloadTo.getPath());
62-
}
63-
}
64-
65-
System.out.println("Download complete.");
66-
}
67-
```
68-
69-
See the full code sample: [EncodingWithMESPredefinedPreset](https://github.com/Azure-Samples/media-services-v3-java/blob/master/VideoEncoding/EncodingWithMESPredefinedPreset/src/main/java/sample/EncodingWithMESPredefinedPreset.java)
70-
71-
## .NET
22+
## [.NEt](#tab/net/)
7223

7324
```csharp
7425
/// <summary>
@@ -117,6 +68,4 @@ private async static Task DownloadResults(IAzureMediaServicesClient client, stri
11768

11869
See the full code sample: [EncodingWithMESPredefinedPreset](https://github.com/Azure-Samples/media-services-v3-dotnet/blob/main/VideoEncoding/Encoding_PredefinedPreset/Program.cs)
11970

120-
## Next steps
121-
122-
[Create a job input from an HTTPS URL](job-input-from-http-how-to.md).
71+
---

articles/media-services/latest/job-input-from-http-how-to.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@ In Media Services v3, when you submit Jobs to process your videos, you have to t
2222
> [!TIP]
2323
> Before you start developing, review [Developing with Media Services v3 APIs](media-services-apis-overview.md) (includes information on accessing APIs, naming conventions, etc.)
2424
25+
## [.NET](#tab/net/)
26+
2527
## .NET sample
2628

2729
The following code shows how to create a job with an HTTPS URL input.
2830

2931
[!code-csharp[Main](../../../media-services-v3-dotnet-quickstarts/AMSV3Quickstarts/EncodeAndStreamFiles/Program.cs#SubmitJob)]
3032

31-
## Job error codes
32-
33-
See [Error codes](/rest/api/media/jobs/get#joberrorcode).
34-
35-
## Next steps
36-
37-
[Create a job input from a local file](job-input-from-local-file-how-to.md).
33+
---

articles/media-services/latest/job-input-from-local-file-how-to.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
---
22
title: Create a job input from a local file
33
description: This article demonstrates how to create an Azure Media Services job input from a local file.
4-
services: media-services
5-
documentationcenter: ''
64
author: IngridAtMicrosoft
75
manager: femila
8-
editor: ''
9-
ms.service: media-services
10-
ms.workload:
6+
ms.service: media-services
117
ms.topic: how-to
12-
ms.date: 05/25/2021
8+
ms.date: 03/09/2022
139
ms.author: inhenkel
1410
---
1511

@@ -23,6 +19,8 @@ In Media Services v3, when you submit Jobs to process your videos, you have to t
2319

2420
* [Create a Media Services account](./account-create-how-to.md).
2521

22+
## [.NET](#tab/net/)
23+
2624
## .NET sample
2725

2826
The following code shows how to create an input asset and use it as the input for the job. The CreateInputAsset function performs the following actions:
@@ -45,6 +43,4 @@ The following code snippet submits an encoding job:
4543

4644
See [Error codes](/rest/api/media/jobs/get#joberrorcode).
4745

48-
## Next steps
49-
50-
[Create a job input from an HTTPS URL](job-input-from-http-how-to.md).
46+
---

articles/media-services/latest/job-multiple-transform-outputs-how-to.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ This topic shows how to create a Transform with two Transform Outputs. The first
2323
> [!TIP]
2424
> Before you start developing, review [Developing with Media Services v3 APIs](media-services-apis-overview.md) (includes information on accessing APIs, naming conventions, etc.)
2525
26+
## [.NET](#tab/net/)
27+
2628
## Create a transform
2729

2830
The following code shows how to create a transform that produces two outputs.
@@ -127,10 +129,5 @@ private static async Task<Job> SubmitJobAsync(IAzureMediaServicesClient client,
127129
return job;
128130
}
129131
```
130-
## Job error codes
131-
132-
See [Error codes](/rest/api/media/jobs/get#joberrorcode).
133132

134-
## Next steps
135-
136-
[Azure Media Services v3 samples using .NET](https://github.com/Azure-Samples/media-services-v3-dotnet/tree/master/)
133+
---

0 commit comments

Comments
 (0)