Merge branch 'r/6.x' into develop

* r/6.x: MH-13256 Waveform operation fix Automatically update translation keys (r/6.x) Automatically update translation keys (r/5.x) MH-13252, Ineffective Synchronization of Elasticsearch Startup Update paella player to 6.0.4 MH-13232: Fix potentially negative fade-out start MH-13209, Put CAS Feature In Distributions
opencast · Dec 5, 2018 · c457cec · c457cec
2 parents 45dbf98 + f198b49
commit c457cec
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
@@ -117,6 +117,9 @@
             </libraries>
             <archiveZip>false</archiveZip>
             <archiveTarGz>false</archiveTarGz>
+            <installedFeatures>
+              <feature>opencast-security-cas</feature>
+            </installedFeatures>
           </configuration>
         </plugin>
         <plugin>

diff --git a/modules/composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/EncoderEngine.java b/modules/composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/EncoderEngine.java
@@ -811,8 +811,8 @@ private List<String> makeEdits(List<VideoClip> clips, int transitionDuration, Bo
         int fileindx = vclip.getSrc(); // get source file by index
         double inpt = vclip.getStart(); // get in points
         double duration = vclip.getDuration();
-        double vend = duration - vfade;
-        double aend = duration - afade;
+        double vend = Math.max(duration - vfade, 0);
+        double aend = Math.max(duration - afade, 0);
         if (hasVideo) {
           String vvclip;
           vvclip = "[" + fileindx + ":v]trim=" + f.format(inpt) + ":duration=" + f.format(duration)
@@ -843,8 +843,8 @@ private List<String> makeEdits(List<VideoClip> clips, int transitionDuration, Bo
       int fileindx = vclip.getSrc(); // get source file by index
       double inpt = vclip.getStart(); // get in points
       double duration = vclip.getDuration();
-      double vend = duration - vfade;
-      double aend = duration - afade;
+      double vend = Math.max(duration - vfade, 0);
+      double aend = Math.max(duration - afade, 0);
 
       if (hasVideo) {
         String vvclip;

diff --git a/modules/engage-paella-player/package-lock.json b/modules/engage-paella-player/package-lock.json
diff --git a/modules/engage-paella-player/package.json b/modules/engage-paella-player/package.json
@@ -10,6 +10,6 @@
     "eslint-plugin-header": "^2.0.0",
     "gulp": "^3.9.1",
     "merge-stream": "^1.0.1",
-    "paellaplayer": "github:polimediaupv/paella#6.0.3"
+    "paellaplayer": "github:polimediaupv/paella#6.0.4"
   }
 }
diff --git a/...aveform-ffmpeg/src/main/java/org/opencastproject/waveform/ffmpeg/WaveformServiceImpl.java b/...aveform-ffmpeg/src/main/java/org/opencastproject/waveform/ffmpeg/WaveformServiceImpl.java
@@ -311,6 +311,7 @@ private Attachment extractWaveform(Track track, int pixelsPerMinute, int minWidt
       "-nostats",
       "-i", mediaFile.getAbsolutePath(),
       "-lavfi", createWaveformFilter(track, width, height),
+      "-frames:v", "1",
       "-an", "-vn", "-sn", "-y",
       waveformFilePath
     };