added Azure Media OCR + Media Encoder Standard

Author: Yoichi Kawasaki

src/main/java/azuremediaprocessor/App.java

@@ -33,13 +33,15 @@ public void start( String[] args )
         Options opts = new Options();
         opts.addOption("c", "config", true, "(Required) App config file. ex) app.config");
         opts.addOption("t", "type", true, "(Required) Media Processor type (Integer):\n" 
+                                        + "1 -> Media Encoder Standard\n"
                                         + "10 -> Azure Media Indexer\n"
                                         + "11 -> Azure Media Indexer 2 Preview\n"
                                         + "12 -> Azure Media Hyperlapse\n"
                                         + "13 -> Azure Media Face Detector\n"
                                         + "14 -> Azure Media Motion Detector\n"
                                         + "15 -> Azure Media Stabilizer\n"
                                         + "16 -> Azure Media Video Thumbnails\n"
+                                        + "17 -> Azure Media OCR\n"
                                 );
         opts.addOption("f", "file", true, "(Optional) Uploading file. By specifing this, you start from uploading file");
         opts.addOption("a", "assetname", true, "(Required) Asset Name to process media indexing");

src/main/java/azuremediaprocessor/Constants.java

@@ -11,13 +11,15 @@ public class Constants {
     public static final Map<String, String> MediaProcessorType_MAP;
         static {
             HashMap<String,String> m = new HashMap<String,String>();
+            m.put("1", "Media Encoder Standard");
             m.put("10", "Azure Media Indexer");
             m.put("11", "Azure Media Indexer 2 Preview");
             m.put("12", "Azure Media Hyperlapse");
             m.put("13", "Azure Media Face Detector");
             m.put("14", "Azure Media Motion Detector");
             m.put("15", "Azure Media Stabilizer");
             m.put("16", "Azure Media Video Thumbnails");
+            m.put("17", "Azure Media OCR");
             MediaProcessorType_MAP = Collections.unmodifiableMap(m); 
         }
     public Constants() { }

src/main/java/azuremediaprocessor/MediaProcessRunner.java

@@ -115,7 +115,7 @@ public void run() {
             }
             checkJobStatus(jobId);
 
-            downloadIndexedAssetFilesFromJob(jobInfo);
+            downloadProcessedAssetFilesFromJob(jobInfo);
         } catch (Exception e) {
              System.err.println("Exception occured while running media processing job: "
                                         + e.getMessage());
@@ -170,12 +170,12 @@ private synchronized void checkJobStatus(String jobId)
         }
     }
 
-    private synchronized void downloadIndexedAssetFilesFromJob(JobInfo jobInfo)
+    private synchronized void downloadProcessedAssetFilesFromJob(JobInfo jobInfo)
             throws ServiceException, URISyntaxException, FileNotFoundException, StorageException, IOException {
 
         final ListResult<AssetInfo> outputAssets;
         outputAssets = service.list(Asset.list(jobInfo.getOutputAssetsLink()));
-        AssetInfo indexedAsset = outputAssets.get(0);
+        AssetInfo processedAsset = outputAssets.get(0);
         final AccessPolicyInfo downloadAccessPolicy;
         final LocatorInfo downloadLocator;
 
@@ -189,17 +189,17 @@ private synchronized void downloadIndexedAssetFilesFromJob(JobInfo jobInfo)
         downloadLocator = service.create(
                             Locator.create(
                                 downloadAccessPolicy.getId(),
-                                indexedAsset.getId(),
+                                processedAsset.getId(),
                                 LocatorType.SAS
                             )
                         );
 
-        for (AssetFileInfo assetFile : service.list(AssetFile.list(indexedAsset.getAssetFilesLink()))) {
+        for (AssetFileInfo assetFile : service.list(AssetFile.list(processedAsset.getAssetFilesLink()))) {
             String fileName = assetFile.getName();
             String outFileName=fileName;
             // Rename JobResult file not to overwrite it in the directory where all job output files are to be stored
             if (fileName.equals("JobResult.txt")) {
-                outFileName = "JobResult_" + indexedAsset.getName();
+                outFileName = "JobResult_" + processedAsset.getName();
             }
             String locatorPath = downloadLocator.getPath();
             int startOfSas = locatorPath.indexOf("?");