Skip to content

Commit

Permalink
Simplifying the wrapper somewhat.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcookems
jcookems committed Jan 10, 2013
1 parent 97fe653 commit 509942b
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 84 deletions.
8 changes: 5 additions & 3 deletions ...src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java
View file
Expand Up @@ -37,6 +37,7 @@
import com.microsoft.windowsazure.services.media.models.JobInfo;
import com.microsoft.windowsazure.services.media.models.ListResult;
import com.microsoft.windowsazure.services.media.models.Task;
import com.microsoft.windowsazure.services.scenarios.MediaServiceWrapper.EncoderType;

public class MediaServiceScenarioTest extends ScenarioTestBase {
private static final String rootTestAssetPrefix = "testAssetPrefix-";
Expand Down Expand Up @@ -151,7 +152,8 @@ public void transformEncryptedAsset() throws Exception {
.createAsset(testAssetPrefix + "transformEncryptedAsset", AssetOption.StorageEncrypted);
wrapper.uploadFilesToAsset(asset, 10, getTestAssetFiles(), aesKey);
String jobName = "my job transformEncryptedAsset" + UUID.randomUUID().toString();
JobInfo job = wrapper.createJob(jobName, asset, wrapper.createTaskOptionsDecodeAsset("Decode", 0, 0));
JobInfo job = wrapper.createJob(jobName, asset,
wrapper.createTaskOptions("Decode", 0, 0, EncoderType.StorageDecryption));
signalSetupFinished();

waitForJobToFinish(job);
Expand Down Expand Up @@ -180,8 +182,8 @@ private void waitForJobToFinish(JobInfo job) throws InterruptedException, Servic
private List<Task.CreateBatchOperation> createTasks() throws ServiceException {
List<Task.CreateBatchOperation> tasks = new ArrayList<Task.CreateBatchOperation>();

tasks.add(wrapper.createTaskOptionsMp4ToSmoothStreams("MP4 to SS", 0, 0));
tasks.add(wrapper.createTaskOptionsSmoothStreamsToHls("SS to HLS", 0, 1));
tasks.add(wrapper.createTaskOptions("MP4 to SS", 0, 0, EncoderType.Mp4ToSmoothStream));
tasks.add(wrapper.createTaskOptions("SS to HLS", 0, 1, EncoderType.SmoothStreamsToHls));
return tasks;
}

Expand Down
114 changes: 33 additions & 81 deletions ...-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java
View file
Expand Up @@ -67,7 +67,6 @@
import com.microsoft.windowsazure.services.media.models.MediaProcessorInfo;
import com.microsoft.windowsazure.services.media.models.ProtectionKey;
import com.microsoft.windowsazure.services.media.models.Task;
import com.microsoft.windowsazure.services.media.models.TaskOption;

class MediaServiceWrapper {
private final MediaContract service;
Expand All @@ -77,7 +76,6 @@ class MediaServiceWrapper {
private final String MEDIA_PROCESSOR_STORAGE_DECRYPTION = "Storage Decryption";
private final String MEDIA_PROCESSOR_WINDOWS_AZURE_MEDIA_ENCODER = "Windows Azure Media Encoder";
private final String MEDIA_PROCESSOR_MP4_TO_SMOOTH_STREAMS = "MP4 to Smooth Streams Task";
private final String MEDIA_PROCESSOR_PLAYREADY_PROTECTION = "PlayReady Protection Task";
private final String MEDIA_PROCESSOR_SMOOTH_STREAMS_TO_HLS = "Smooth Streams to HLS Task";

// From http://msdn.microsoft.com/en-us/library/windowsazure/hh973635.aspx
Expand Down Expand Up @@ -119,6 +117,10 @@ class MediaServiceWrapper {
+ " <type>Microsoft.Web.Media.TransformManager.SmoothToHLS.SmoothToHLSTask, Microsoft.Web.Media.TransformManager.SmoothToHLS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</type>"
+ " </taskCode>" + "</taskDefinition>";

public static enum EncoderType {
WindowsAzureMediaEncoder, Mp4ToSmoothStream, SmoothStreamsToHls, StorageDecryption
}

public MediaServiceWrapper(MediaContract service) {
this.service = service;
}
Expand Down Expand Up @@ -284,55 +286,35 @@ public JobInfo createJob(String jobName, AssetInfo inputAsset, List<Task.CreateB
}

// Process
public Task.CreateBatchOperation createTaskOptionsWindowsAzureMediaEncoder(String taskName, int inputAssetId,
int outputAssetId) throws ServiceException {
String taskBody = getTaskBody(inputAssetId, outputAssetId);
Task.CreateBatchOperation taskCreate = Task
.create(getMediaProcessorIdByName(MEDIA_PROCESSOR_WINDOWS_AZURE_MEDIA_ENCODER), taskBody)
.setName(taskName).setConfiguration("H.264 256k DSL CBR");

return taskCreate;
}

// Process
public Task.CreateBatchOperation createTaskOptionsPlayReadyProtection(String taskName,
String playReadyConfiguration, int inputAssetId, int outputAssetId) throws ServiceException {
String taskBody = getTaskBody(inputAssetId, outputAssetId);
Task.CreateBatchOperation taskCreate = Task
.create(getMediaProcessorIdByName(MEDIA_PROCESSOR_PLAYREADY_PROTECTION), taskBody).setName(taskName)
.setOptions(TaskOption.ProtectedConfiguration).setConfiguration(playReadyConfiguration);

return taskCreate;
}

// Process
public Task.CreateBatchOperation createTaskOptionsMp4ToSmoothStreams(String taskName, int inputAssetId,
int outputAssetId) throws ServiceException {
public Task.CreateBatchOperation createTaskOptions(String taskName, int inputAssetId, int outputAssetId,
EncoderType encoderType) throws ServiceException {
String taskBody = getTaskBody(inputAssetId, outputAssetId);
Task.CreateBatchOperation taskCreate = Task
.create(getMediaProcessorIdByName(MEDIA_PROCESSOR_MP4_TO_SMOOTH_STREAMS), taskBody).setName(taskName)
.setConfiguration(configMp4ToSmoothStreams);

return taskCreate;
}

// Process
public Task.CreateBatchOperation createTaskOptionsSmoothStreamsToHls(String taskName, int inputAssetId,
int outputAssetId) throws ServiceException {
String taskBody = getTaskBody(inputAssetId, outputAssetId);
Task.CreateBatchOperation taskCreate = Task
.create(getMediaProcessorIdByName(MEDIA_PROCESSOR_SMOOTH_STREAMS_TO_HLS), taskBody).setName(taskName)
.setConfiguration(configSmoothStreamsToAppleHttpLiveStreams);

return taskCreate;
}
String processor = null;
String configuration = null;
switch (encoderType) {
case Mp4ToSmoothStream:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_MP4_TO_SMOOTH_STREAMS);
configuration = configMp4ToSmoothStreams;
break;
case SmoothStreamsToHls:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_SMOOTH_STREAMS_TO_HLS);
configuration = configSmoothStreamsToAppleHttpLiveStreams;
break;
case WindowsAzureMediaEncoder:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_WINDOWS_AZURE_MEDIA_ENCODER);
configuration = "H.264 256k DSL CBR";
break;
case StorageDecryption:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_STORAGE_DECRYPTION);
configuration = null;
break;
default:
break;
}

// Process
public Task.CreateBatchOperation createTaskOptionsDecodeAsset(String taskName, int inputAssetId, int outputAssetId)
throws ServiceException {
String taskBody = getTaskBody(inputAssetId, outputAssetId);
Task.CreateBatchOperation taskCreate = Task.create(
getMediaProcessorIdByName(MEDIA_PROCESSOR_STORAGE_DECRYPTION), taskBody).setName(taskName);
Task.CreateBatchOperation taskCreate = Task.create(processor, taskBody).setName(taskName)
.setConfiguration(configuration);

return taskCreate;
}
Expand Down Expand Up @@ -372,49 +354,19 @@ public void cancelJob(JobInfo job) throws ServiceException {
service.action(Job.cancel(job.getId()));
}

// Deliver
public List<URL> createOriginUrlsForStreamingContent(AssetInfo asset, int availabilityWindowInMinutes)
throws ServiceException, MalformedURLException {
return createOriginUrlsForStreamingContentWorker(asset, availabilityWindowInMinutes, true, "",
LocatorType.OnDemandOrigin);
}

// Deliver
public List<URL> createOriginUrlsForAppleHLSContent(AssetInfo asset, int availabilityWindowInMinutes)
throws ServiceException, MalformedURLException {
return createOriginUrlsForStreamingContentWorker(asset, availabilityWindowInMinutes, true,
"(format=m3u8-aapl)", LocatorType.OnDemandOrigin);
}

// Deliver
public List<URL> createFileURLsFromAsset(AssetInfo asset, int availabilityWindowInMinutes) throws ServiceException,
MalformedURLException {
return createOriginUrlsForStreamingContentWorker(asset, availabilityWindowInMinutes, false, null,
LocatorType.SAS);
}

private List<URL> createOriginUrlsForStreamingContentWorker(AssetInfo asset, int availabilityWindowInMinutes,
boolean isSmooth, String suffix, LocatorType locatorType) throws ServiceException, MalformedURLException {
List<URL> ret = new ArrayList<URL>();

AccessPolicyInfo readAP = service.create(AccessPolicy.create(accessPolicyPrefix + "tempAccessPolicy",
availabilityWindowInMinutes, EnumSet.of(AccessPolicyPermission.READ)));
LocatorInfo readLocator = service.create(Locator.create(readAP.getId(), asset.getId(), locatorType));
LocatorInfo readLocator = service.create(Locator.create(readAP.getId(), asset.getId(), LocatorType.SAS));

List<AssetFileInfo> publishedFiles = service.list(AssetFile.list(asset.getAssetFilesLink()));
for (AssetFileInfo fi : publishedFiles) {
if (isSmooth) {
// Smooth Streaming format ends with ".ism*"
int index = fi.getName().lastIndexOf('.');
boolean isSmoothSteamFile = fi.getName().regionMatches(true, index + 1, "ism", 0, 3);
if (isSmoothSteamFile) {
ret.add(constructUrlFromLocatorAndFileName(readLocator, fi.getName() + "/manifest"));
}
}
else {
URL file = constructUrlFromLocatorAndFileName(readLocator, fi.getName());
ret.add(file);
}
URL file = constructUrlFromLocatorAndFileName(readLocator, fi.getName());
ret.add(file);
}

return ret;
Expand Down

0 comments on commit 509942b

Please sign in to comment.