From: vasary.daniel Date: Fri, 23 Apr 2021 14:19:34 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=00eb5c25df08ce693f998b82ef240070cc58a22b;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32220 --- diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json index 431b53ad..b69cbe1d 100644 --- a/client/DxPlay/Configuration/dxplay.json +++ b/client/DxPlay/Configuration/dxplay.json @@ -4,6 +4,7 @@ "isMaximized": false, "isStandalone": true, "player": { + "rendererType": "VM7", "autoStart": false, "segmentEditor": false } diff --git a/client/DxPlay/DxPlaySettings.cs b/client/DxPlay/DxPlaySettings.cs index 97b9bd74..4a1b8ece 100644 --- a/client/DxPlay/DxPlaySettings.cs +++ b/client/DxPlay/DxPlaySettings.cs @@ -1,8 +1,10 @@ -using MaestroShared.Configuration; +using MaestroShared.Commons; +using MaestroShared.Configuration; using MaestroShared.Metadata; using System.ComponentModel; namespace DxPlay { + public class DxPlaySettings : UISettings { public string TargetDirectory { get; set; } public Player Player { get; set; } diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs index 0d949141..1bf7af4b 100644 --- a/client/DxPlay/DxPlayer.cs +++ b/client/DxPlay/DxPlayer.cs @@ -128,7 +128,8 @@ namespace DxPlay { } private void SetupGraph() { - graph = new PlayerGraph(MediaDescription.FileName, playerWindow.Handle); + var rendererType = settings.Player.RendererType; + graph = new PlayerGraph(MediaDescription.FileName, playerWindow.Handle, rendererType); AMMediaType media = new AMMediaType(); graph.SampleGrabber.GetConnectedMediaType(media); diff --git a/client/DxPlay/FilterGraphTools.cs b/client/DxPlay/FilterGraphTools.cs index 13e6a84a..6c0ab3f6 100644 --- a/client/DxPlay/FilterGraphTools.cs +++ b/client/DxPlay/FilterGraphTools.cs @@ -541,6 +541,7 @@ namespace DirectShowLib.Utils { } } + /// /// Save a DirectShow Graph to a GRF file /// diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs index 7a8b0503..fecc2459 100644 --- a/client/DxPlay/PlayerGraph.cs +++ b/client/DxPlay/PlayerGraph.cs @@ -1,5 +1,6 @@ using DirectShowLib; using DirectShowLib.Utils; +using MaestroShared.Commons; using NLog; using System; using System.Runtime.InteropServices; @@ -19,7 +20,7 @@ namespace DxPlay { private bool isDisposed; - public PlayerGraph(string fileName, IntPtr handle) { + public PlayerGraph(string fileName, IntPtr handle, VideoRendererType rendererType) { try { MediaSeeking = this as IMediaSeeking; MediaControl = this as IMediaControl; @@ -40,9 +41,21 @@ namespace DxPlay { EnableDeinterlace(videoDecoder); IBaseFilter sampleGrabber = AddSampleGrabber(graphBuilder, videoDecoder); SampleGrabber = (ISampleGrabber)sampleGrabber; - //IBaseFilter videoRenderer = AddRenderer(graphBuilder, sampleGrabber); - //IBaseFilter videoRenderer = AddSimpleRenderer(graphBuilder, sampleGrabber); - //IBaseFilter videoRenderer = AddEVRRenderer(graphBuilder, sampleGrabber); + + switch (rendererType) { + case VideoRendererType.VM7: + AddVM7Renderer(graphBuilder, sampleGrabber); + break; + case VideoRendererType.VM9: + AddVM9Renderer(graphBuilder, sampleGrabber); + break; + case VideoRendererType.ENHANCED: + AddEVRRenderer(graphBuilder, sampleGrabber); + break; + case VideoRendererType.DEFAULT: + AddDefaultRenderer(graphBuilder, sampleGrabber); + break; + } FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output"); ConfigureSimpleRenderer(handle); @@ -89,7 +102,7 @@ namespace DxPlay { return audioDecoder; } - private IBaseFilter AddRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) { + private IBaseFilter AddVM9Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) { logger.Debug("Add VideoMixingRenderer9 to graph"); IBaseFilter videoRenderer = (IBaseFilter)new VideoMixingRenderer9(); DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "Video Mixing Renderer 9")); @@ -106,7 +119,30 @@ namespace DxPlay { logger.Error(e); graphBuilder.RemoveFilter(videoRenderer); logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 9"); - AddSimpleRenderer(graphBuilder, sampleGrabber); + AddDefaultRenderer(graphBuilder, sampleGrabber); + } + + return videoRenderer; + } + + private IBaseFilter AddVM7Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) { + logger.Debug("Add VideoMixingRenderer7 to graph"); + IBaseFilter videoRenderer = (IBaseFilter)new VideoMixingRenderer(); + DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "Video Mixing Renderer 7")); + logger.Debug("Connect SampleGrabber -> VideoMixingRenderer7"); + + try { + //IVMRFilterConfig9 filterConfig = (IVMRFilterConfig9) videoRenderer; + //filterConfig.SetRenderingMode(VMR9Mode.Windowless); + //WindowlessControl = (IVMRWindowlessControl9) videoRenderer; + //WindowlessControl.SetVideoClippingWindow(handle); + //WindowlessControl.SetAspectRatioMode(VMR9AspectRatioMode.LetterBox); + FilterGraphTools.ConnectFilters(graphBuilder, sampleGrabber, "Output", videoRenderer, "VMR Input0", true); + } catch (Exception e) { + logger.Error(e); + graphBuilder.RemoveFilter(videoRenderer); + logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 7"); + AddDefaultRenderer(graphBuilder, sampleGrabber); } return videoRenderer; @@ -131,7 +167,7 @@ namespace DxPlay { DsError.ThrowExceptionForHR(hr); } - private IBaseFilter AddSimpleRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) { + private IBaseFilter AddDefaultRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) { logger.Debug("Add default VideoRenderer to graph"); IBaseFilter videoRenderer = (IBaseFilter)new VideoRendererDefault(); DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "VideoRendererDefault")); diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json index 0cae128b..08c2527a 100644 --- a/client/Maestro/Configuration/dev-local.json +++ b/client/Maestro/Configuration/dev-local.json @@ -12,101 +12,38 @@ "source": { "$type": "UNCSource", "filter": "avi,wav,mxf,mts,mov", - "useAlternateCopy": false, - "autoTarget": "AUTOTARGET", - "autoTags": [ "AUTOTAG" ], + "useAlternateCopy": true, "local": { - "address": "file://c:/_video", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 + "address": "file://c:/_video" } }, "metadatas": [ - { - "$type": "MediaCubeMetadata", - "server": { - "address": "http://localhost:8888/services/rest/jobengine", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - }, - "wsserver": { - "address": "ws://10.10.1.27/services/wsapi", - "timeout": 1000 - }, - "jobTemplate": "retrieve-material.xml", - "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE", - "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE", - "restoreNamePattern": "%s_%GUID%", - "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE", - "killDateDays": 1 - } ], "targets": [ { - "label": "Stúdióba küldés", - "processor": "FTPTargetProcessor", + "label": "Target1", + "processor": "UNCTargetProcessor", "outputFormat": "%ID%", - "tag": "TESZT", - "nexioServer": true, - "nexioFileExistsMessage": "A feltöltéshez új 'placeholder' generálása szükséges az Octopus rendszerben, az anyagon belül az ALT+1 billenytűkombináció segítségével.", - "killDateDays": 1, - "disableFileVersioning": true, - "agency": "ARCHIVED", + "reference": [ "AUTOTARGET" ], "remote": { - "address": "ftp://10.10.1.55:2098", - "userName": "administrator", - "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh", - "timeout": 1000 + "address": "file://c:/_video/t1" } }, { - "label": "Adáskész", - "processor": "FTPTargetProcessor", + "label": "Target2", + "processor": "UNCTargetProcessor", "outputFormat": "%ID%", - "killDateDays": 5, - "saveSegments": true, - "tag": "Adáskész", - "disableFileVersioning": true, - "enableOverride": false, - "saveMorpheusMetadata": true, - "pathMorpheusMetadata": "/TESZT/TC/CHECK/Input", - "deviceIdMorpheus": "ISILON", + "reference": [ "AUTOTARGET" ], "remote": { - "address": "ftp://10.10.1.105/TESZT/TC/CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 + "address": "file://c:/_video/t2" } }, { "label": "AUTOTARGET", "processor": "UNCTargetProcessor", - "outputFormat": "%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 0, - "saveArchiveMetadata": true, - "remote": { - "address": "file://c:/_video/y", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Napi megtekintőbe", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%TEXT%", - "tag": "Online", - "disableFileVersioning": true, - "killDateDays": 2, - "saveArchiveMetadata": false, + "outputFormat": "%ID%", "remote": { - "address": "ftp://10.10.1.105/TESZT/CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 + "address": "file://c:/_video/ta" } } diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index dbce69ab..a5e7fa5b 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -263,7 +263,8 @@ namespace Maestro { player.Settings = new DxPlaySettings { Player = new Player { AutoStart = Configuration.Player.AutoStart, - SegmentEditor = Configuration.Player.SegmentEditor && segmentEditor + SegmentEditor = Configuration.Player.SegmentEditor && segmentEditor, + RendererType = Configuration.Player.RendererType }, Metadata = trafficIDSelector.Parameters.Configuration, Segments = MovieSegments diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 8e656c19..0f5ea85d 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.1.1")] -[assembly: AssemblyFileVersion("2.1.1.1")] +[assembly: AssemblyVersion("2.1.1.2")] +[assembly: AssemblyFileVersion("2.1.1.2")] diff --git a/client/MaestroShared/Commons/VideoRendererType.cs b/client/MaestroShared/Commons/VideoRendererType.cs new file mode 100644 index 00000000..0d19595c --- /dev/null +++ b/client/MaestroShared/Commons/VideoRendererType.cs @@ -0,0 +1,5 @@ +namespace MaestroShared.Commons { + public enum VideoRendererType { + AUTO, DEFAULT, VM7, VM9, ENHANCED + } +} diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index b657a37d..f53bcd4d 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -92,6 +92,8 @@ namespace MaestroShared.Configuration { [DefaultValue(new[] { "MXF" })] [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] public string[] Extensions { get; set; } + + public VideoRendererType RendererType { get; set; } } public class Target { diff --git a/client/MaestroShared/MaestroShared.csproj b/client/MaestroShared/MaestroShared.csproj index d66f3880..9e2feaa1 100644 --- a/client/MaestroShared/MaestroShared.csproj +++ b/client/MaestroShared/MaestroShared.csproj @@ -97,6 +97,7 @@ + diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index 39ec0603..e5e31e59 100644 --- a/client/MaestroShared/Properties/AssemblyInfo.cs +++ b/client/MaestroShared/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.0.8")] -[assembly: AssemblyFileVersion("2.1.0.8")] +[assembly: AssemblyVersion("2.1.0.9")] +[assembly: AssemblyFileVersion("2.1.0.9")] diff --git a/server/-product/production/AMC/configuration/config.ini b/server/-product/production/AMC/configuration/config.ini deleted file mode 100644 index 702342e6..00000000 --- a/server/-product/production/AMC/configuration/config.ini +++ /dev/null @@ -1,9 +0,0 @@ -#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser -#Sun Apr 18 21:25:34 CEST 2021 -osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4 -equinox.use.ds=true -osgi.bundles.defaultStartLevel=4 -osgi.framework=file\:plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar -osgi.framework.extensions= -eclipse.p2.data.area=@config.dir/../p2 -eclipse.p2.profile=DefaultProfile diff --git a/server/-product/production/MEDIAVIVANTIS/configuration/config.ini b/server/-product/production/MEDIAVIVANTIS/configuration/config.ini deleted file mode 100644 index 702342e6..00000000 --- a/server/-product/production/MEDIAVIVANTIS/configuration/config.ini +++ /dev/null @@ -1,9 +0,0 @@ -#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser -#Sun Apr 18 21:25:34 CEST 2021 -osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4 -equinox.use.ds=true -osgi.bundles.defaultStartLevel=4 -osgi.framework=file\:plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar -osgi.framework.extensions= -eclipse.p2.data.area=@config.dir/../p2 -eclipse.p2.profile=DefaultProfile diff --git a/server/user.mediacube.gui/js/jquery.maskedinput.min.js b/server/user.mediacube.gui/js/jquery.maskedinput.min.js new file mode 100644 index 00000000..d4dfd011 --- /dev/null +++ b/server/user.mediacube.gui/js/jquery.maskedinput.min.js @@ -0,0 +1,7 @@ +/* + jQuery Masked Input Plugin + Copyright (c) 2007 - 2015 Josh Bush (digitalbush.com) + Licensed under the MIT license (http://digitalbush.com/projects/masked-input-plugin/#license) + Version: 1.4.1 +*/ +!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){var b,c=navigator.userAgent,d=/iphone/i.test(c),e=/chrome/i.test(c),f=/android/i.test(c);a.mask={definitions:{9:"[0-9]",a:"[A-Za-z]","*":"[A-Za-z0-9]"},autoclear:!0,dataName:"rawMaskFn",placeholder:"_"},a.fn.extend({caret:function(a,b){var c;if(0!==this.length&&!this.is(":hidden"))return"number"==typeof a?(b="number"==typeof b?b:a,this.each(function(){this.setSelectionRange?this.setSelectionRange(a,b):this.createTextRange&&(c=this.createTextRange(),c.collapse(!0),c.moveEnd("character",b),c.moveStart("character",a),c.select())})):(this[0].setSelectionRange?(a=this[0].selectionStart,b=this[0].selectionEnd):document.selection&&document.selection.createRange&&(c=document.selection.createRange(),a=0-c.duplicate().moveStart("character",-1e5),b=a+c.text.length),{begin:a,end:b})},unmask:function(){return this.trigger("unmask")},mask:function(c,g){var h,i,j,k,l,m,n,o;if(!c&&this.length>0){h=a(this[0]);var p=h.data(a.mask.dataName);return p?p():void 0}return g=a.extend({autoclear:a.mask.autoclear,placeholder:a.mask.placeholder,completed:null},g),i=a.mask.definitions,j=[],k=n=c.length,l=null,a.each(c.split(""),function(a,b){"?"==b?(n--,k=a):i[b]?(j.push(new RegExp(i[b])),null===l&&(l=j.length-1),k>a&&(m=j.length-1)):j.push(null)}),this.trigger("unmask").each(function(){function h(){if(g.completed){for(var a=l;m>=a;a++)if(j[a]&&C[a]===p(a))return;g.completed.call(B)}}function p(a){return g.placeholder.charAt(a=0&&!j[a];);return a}function s(a,b){var c,d;if(!(0>a)){for(c=a,d=q(b);n>c;c++)if(j[c]){if(!(n>d&&j[c].test(C[d])))break;C[c]=C[d],C[d]=p(d),d=q(d)}z(),B.caret(Math.max(l,a))}}function t(a){var b,c,d,e;for(b=a,c=p(a);n>b;b++)if(j[b]){if(d=q(b),e=C[b],C[b]=c,!(n>d&&j[d].test(e)))break;c=e}}function u(){var a=B.val(),b=B.caret();if(o&&o.length&&o.length>a.length){for(A(!0);b.begin>0&&!j[b.begin-1];)b.begin--;if(0===b.begin)for(;b.beging)&&g&&13!==g){if(i.end-i.begin!==0&&(y(i.begin,i.end),s(i.begin,i.end-1)),c=q(i.begin-1),n>c&&(d=String.fromCharCode(g),j[c].test(d))){if(t(c),C[c]=d,z(),e=q(c),f){var k=function(){a.proxy(a.fn.caret,B,e)()};setTimeout(k,0)}else B.caret(e);i.begin<=m&&h()}b.preventDefault()}}}function y(a,b){var c;for(c=a;b>c&&n>c;c++)j[c]&&(C[c]=p(c))}function z(){B.val(C.join(""))}function A(a){var b,c,d,e=B.val(),f=-1;for(b=0,d=0;n>b;b++)if(j[b]){for(C[b]=p(b);d++e.length){y(b+1,n);break}}else C[b]===e.charAt(d)&&d++,k>b&&(f=b);return a?z():k>f+1?g.autoclear||C.join("")===D?(B.val()&&B.val(""),y(0,n)):z():(z(),B.val(B.val().substring(0,f+1))),k?b:l}var B=a(this),C=a.map(c.split(""),function(a,b){return"?"!=a?i[a]?p(b):a:void 0}),D=C.join(""),E=B.val();B.data(a.mask.dataName,function(){return a.map(C,function(a,b){return j[b]&&a!=p(b)?a:null}).join("")}),B.one("unmask",function(){B.off(".mask").removeData(a.mask.dataName)}).on("focus.mask",function(){if(!B.prop("readonly")){clearTimeout(b);var a;E=B.val(),a=A(),b=setTimeout(function(){B.get(0)===document.activeElement&&(z(),a==c.replace("?","").length?B.caret(0,a):B.caret(a))},10)}}).on("blur.mask",v).on("keydown.mask",w).on("keypress.mask",x).on("input.mask paste.mask",function(){B.prop("readonly")||setTimeout(function(){var a=A(!0);B.caret(a),h()},0)}),e&&f&&B.off("input.mask").on("input.mask",u),A()})}})}); \ No newline at end of file diff --git a/server/user.mediacube.gui/pages/metadatadetails.zul b/server/user.mediacube.gui/pages/metadatadetails.zul index e10186cd..ce1ac853 100644 --- a/server/user.mediacube.gui/pages/metadatadetails.zul +++ b/server/user.mediacube.gui/pages/metadatadetails.zul @@ -1,6 +1,13 @@ + + + + + + + @@ -42,6 +49,14 @@ + + + + + + + + @@ -121,3 +136,4 @@ --> + \ No newline at end of file diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/TCConverter.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/TCConverter.java index 68d6290b..bb9fd02a 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/TCConverter.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/TCConverter.java @@ -8,26 +8,31 @@ import user.commons.mediatool.Timecode; import user.commons.mediatool.Timecode.Type; public class TCConverter implements Converter { - @Override public Long coerceToBean(String text, Label label, BindContext context) { - return null; + Long result = 0L; + + if (text != null) { + String[] tokens = text.split(":"); + if (tokens.length == 4) { + try { + long f = Integer.parseInt(tokens[3]); + long s = Integer.parseInt(tokens[2]); + long m = Integer.parseInt(tokens[1]); + long h = Integer.parseInt(tokens[0]); + result = f + s * 25 + m * 60 * 25 + +h * m * 60 * 25; + } finally { + } + + } + } + return result; } @Override public String coerceToUi(Long frames, Label label, BindContext context) { - //kell a konverzio, mert egyebkent float-ra cast-ol es rosszul szamol Timecode timecode = new Timecode(frames, Type.PAL); return timecode.toString(); - // double reminder = frames; - // int hour = (int) Math.floor(reminder / (60 * 60 * 25)); - // reminder = reminder % (60 * 60 * 25); - // int minute = (int) Math.floor(reminder / (60 * 25)); - // reminder = reminder % (60 * 25); - // int sec = (int) Math.floor(reminder / 25); - // reminder = reminder % 25; - // int frame = (int) Math.floor(reminder); - // return String.format("%02d:%02d:%02d:%02d", hour, minute, sec, frame); } }