From c8dbe4e3f3cc212ec055714afcd72051886ae62d Mon Sep 17 00:00:00 2001 From: "vasary.daniel" Date: Thu, 28 Jan 2021 11:21:40 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32128 --- server/-dependencies/jobengine.target | 6 +++--- server/-dependencies/pom.xml | 6 +++--- server/-product/mediacube.product | 2 +- .../server/steps/PASAPOOLTransferToStep.java | 13 ++++++++++--- .../META-INF/MANIFEST.MF | 1 - server/user.jobengine.osgi.db/META-INF/MANIFEST.MF | 7 +++---- .../user.jobengine.osgi.server/META-INF/MANIFEST.MF | 4 ++-- 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index 02402b93..62660c20 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -1,5 +1,5 @@ - + @@ -35,8 +35,8 @@ - - + + diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 74e93792..c3263272 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -156,13 +156,13 @@ org.eclipse.jetty:jetty-server:9.3.9.v20160517 - org.apache.felix:org.apache.felix.gogo.shell:0.12.0 + org.apache.felix:org.apache.felix.gogo.shell:0.10.0 - org.apache.felix:org.apache.felix.gogo.command:0.12.0 + org.apache.felix:org.apache.felix.gogo.command:0.10.0 - org.apache.felix:org.apache.felix.gogo.runtime:0.12.0 + org.apache.felix:org.apache.felix.gogo.runtime:0.10.0 commons-io:commons-io:2.2 diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index bcfe6b22..3f116596 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -157,7 +157,7 @@ - + diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java index 017f58fe..52c90280 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java @@ -16,6 +16,7 @@ import user.commons.mediatool.MediaInfo; public class PASAPOOLTransferToStep extends TransferStep { private static final Logger logger = LogManager.getLogger(); private static final String CODEC_PROFILE_HIGH = "HIGH"; + private static final String CODEC_PROFILE_MAIN = "MAIN"; private static final String CODEC_PROFILE_422 = "4:2:2"; private static final String DISPLAY_ASPECT_16_9 = "16:9"; private static final String DISPLAY_ASPECT_4_3 = "4:3"; @@ -96,15 +97,21 @@ public class PASAPOOLTransferToStep extends TransferStep { // aspect=4:3 // >SELENIOPOOL_4_3 | \\10.170.100.21\media\SelenioPool\4_3 private boolean isSD_HIGH_4_3(MediaInfo mi) { - return mi.getHeight() < 650 && CODEC_PROFILE_HIGH.equals(mi.getCodecProfileName()) && DISPLAY_ASPECT_4_3.equals(mi.getDisplayAspect()); + String codecProfileName = mi.getCodecProfileName(); + if (codecProfileName != null) + codecProfileName = codecProfileName.toUpperCase(); + return mi.getHeight() < 650 && CODEC_PROFILE_HIGH.equals(codecProfileName) && DISPLAY_ASPECT_4_3.equals(mi.getDisplayAspect()); } // SD - MAIN/422@HIGH // height < 650 - // profile=High || profile=4:2:2 + // profile=Main || profile=4:2:2 // >PEABLEBEACH | \\10.170.100.21\media\BeachPool private boolean isSD_MAIN_422(MediaInfo mi) { - return mi.getHeight() < 650 && (CODEC_PROFILE_HIGH.equals(mi.getCodecProfileName()) || CODEC_PROFILE_422.equals(mi.getCodecProfileName())); + String codecProfileName = mi.getCodecProfileName(); + if (codecProfileName != null) + codecProfileName = codecProfileName.toUpperCase(); + return mi.getHeight() < 650 && (CODEC_PROFILE_MAIN.equals(codecProfileName) || CODEC_PROFILE_422.equals(mi.getCodecProfileName())); } protected void logMediaProfile() { diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF index c178cccf..3ef3e4ac 100644 --- a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", junit.framework, org.apache.logging.log4j;version="2.8.2", org.apache.logging.log4j.message;version="2.8.2", - org.hamcrest, org.jboss.resteasy.client.jaxrs, org.jboss.resteasy.plugins.providers, org.jboss.resteasy.spi, diff --git a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF index 1cd481b6..8248ed90 100644 --- a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF @@ -9,7 +9,9 @@ Require-Bundle: user.jobengine.osgi.commons;bundle-version="1.0.0", com.ibm.nosql;bundle-version="4.19.26";visibility:=reexport, org.jmock.junit4;bundle-version="2.6.0", org.jmock;bundle-version="2.6.0", - com.ibm.db2.jcc;bundle-version="1.4.0" + com.ibm.db2.jcc;bundle-version="1.4.0", + org.hamcrest.core;bundle-version="1.3.0", + junit;bundle-version="4.12.0" Service-Component: OSGI-INF/component.xml Bundle-ActivationPolicy: lazy Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", @@ -18,9 +20,6 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", javax.ws.rs.core, org.apache.commons.io;version="2.2.0", org.apache.logging.log4j;version="2.8.2", - org.hamcrest, - org.junit, - org.junit.runner, sqlj.runtime.ref Export-Package: user.jobengine.db, user.jobengine.search diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF index 0ed9c4d4..a427f2b0 100644 --- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Import-Package: com.fasterxml.jackson.databind;version="2.4.5", org.apache.logging.log4j.message;version="2.8.2", org.eclipse.core.runtime.adaptor, org.eclipse.osgi.framework.console;version="1.1.0", - org.hamcrest, org.jboss.resteasy.client.jaxrs, org.jboss.resteasy.spi, org.junit, @@ -35,7 +34,8 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0", org.apache.commons.lang;bundle-version="2.4.0";visibility:=reexport, org.jmock;bundle-version="2.6.0", org.jmock.junit4;bundle-version="2.6.0", - org.apache.servicemix.bundles.quartz;bundle-version="2.2.2" + org.apache.servicemix.bundles.quartz;bundle-version="2.2.2", + org.hamcrest.core;bundle-version="1.3.0" Export-Package: user.jobengine.osgi.server, user.jobengine.server, user.jobengine.server.ast, -- 2.54.0