Merge branch 'release/5.5.3' into develop

# Conflicts: # current/core/pom.xml # current/pom.xml # current/ui.apps/pom.xml
brightcove · Feb 21, 2020 · 0901ca3 · 0901ca3
2 parents f1172d5 + b70ddd9
commit 0901ca3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/current/core/src/main/java/com/coresecure/brightcove/wrapper/sling/ServiceUtil.java b/current/core/src/main/java/com/coresecure/brightcove/wrapper/sling/ServiceUtil.java
@@ -850,6 +850,12 @@ private JSONObject setOriginalRendition(Rendition original_rendition, Date brc_l
         Date orig_lastmod_time = original_map.get(JcrConstants.JCR_LASTMODIFIED,new Date(0));
         LOGGER.trace("ORGINAL RENDITION : [Rendition Last Mod: {}] VS [Last Sync: {} ]"  ,orig_lastmod_time, brc_lastsync_time);
         //LOGGER.trace("{}",original_map);
+        ConfigurationGrabber cg = ServiceUtil.getConfigurationGrabber();
+        ConfigurationService brcService = cg.getConfigurationService(account_id);
+        String ingest_profile = brcService.getIngestProfile();
+        if (ingest_profile == null || ingest_profile.length() == 0) {
+            ingest_profile = "";
+        }
 
         if(orig_lastmod_time.compareTo(brc_lastsync_time)  > 0)
         {
@@ -861,7 +867,7 @@ private JSONObject setOriginalRendition(Rendition original_rendition, Date brc_l
             LOGGER.trace("S3RESP : " + s3_url_resp_original);
             LOGGER.trace("##CURRENT VIDEO " + currentVideo.toJSON());
             if (s3_url_resp_original != null && s3_url_resp_original.getBoolean(Constants.SENT)) {
-                master = new JSONObject("{'master': {'url': '" + s3_url_resp_original.getString(Constants.API_REQUEST_URL) + "'},'profile': 'high-resolution','capture-images': false}");
+                master = new JSONObject("{'master': {'url': '" + s3_url_resp_original.getString(Constants.API_REQUEST_URL) + "'},'profile': '" + ingest_profile + "','capture-images': false}");
             }
 
         }