ProRes folyamat javitasok

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33222

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java
index 26b2e68cba94b7a3d682fef15d797e5101793ad9..51869b7c3d3aa423a04bc7410f733793966d1649 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java
@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
 \r
 import user.commons.DownloadableMedia;\r
 import user.commons.StoreUri;\r
+import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Item;\r
 import user.jobengine.db.Media;\r
@@ -34,7 +35,8 @@ public class MetadataPersisterStep extends JobStep {
                                String fileName = downloadable.getString("fileName");\r
                                long mediaId = downloadable.containsKey("mediaId") ? downloadable.getLong("mediaId") : 0;\r
                                String fileTypeName = fileName.substring(fileName.lastIndexOf(".") + 1).toUpperCase();\r
-                               boolean addStoreNameAsFilePrefix = downloadable.getBoolean("addStoreNameAsFilePrefix");\r
+\r
+                               boolean addStoreNameAsFilePrefix = NoSQLUtils.asBool(downloadable, "addStoreNameAsFilePrefix");\r
 \r
                                IItemManager manager = getManager();\r
 \r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java
index d4778320f6968dd9b5bd6db21e61f7acb460d7ce..a303b2f8a33e96fcbb579905c286ff80b91860eb 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java
@@ -9,7 +9,9 @@ import org.apache.logging.log4j.Logger;
 import user.commons.mediaarea.MediaArea;\r
 \r
 public class ValidateProResStep extends JobStep {\r
-       private static final double FRAMERATE = 23.976;\r
+       private static final double FRAMERATE_23976 = 23.976;\r
+       private static final double FRAMERATE_24 = 24;\r
+       private static final double FRAMERATE_25 = 25;\r
        private static final String PRORES = "PRORES";\r
        private static final String _422_HQ = "422 HQ";\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -41,7 +43,8 @@ public class ValidateProResStep extends JobStep {
        }\r
 \r
        private boolean isProRes(MediaArea mediaArea) {\r
-               boolean isProRes = mediaArea.getFrameRate() == FRAMERATE;\r
+               boolean isProRes = (mediaArea.getFrameRate() == FRAMERATE_23976 || mediaArea.getFrameRate() == FRAMERATE_24\r
+                               || mediaArea.getFrameRate() == FRAMERATE_25);\r
                isProRes = PRORES.equals(mediaArea.getFormat()) && isProRes;\r
                isProRes = _422_HQ.equals(mediaArea.getFormatProfileName()) && isProRes;\r
                return isProRes;\r