You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/08/03 05:31:10 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1142] hang
while recording conversion should be fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new f68a21b [OPENMEETINGS-1142] hang while recording conversion should be fixed
f68a21b is described below
commit f68a21b2bb8eb2d9492e90039f5e4c9feeac8f25
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Aug 3 12:30:31 2018 +0700
[OPENMEETINGS-1142] hang while recording conversion should be fixed
---
.../org/apache/openmeetings/core/converter/BaseConverter.java | 8 ++------
.../apache/openmeetings/core/converter/InterviewConverter.java | 4 +++-
.../apache/openmeetings/core/converter/RecordingConverter.java | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index bfd2918..3b5833d 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -153,13 +153,9 @@ public abstract class BaseConverter {
return argv.toArray(new String[0]);
}
- private void stripAudioFirstPass(Recording r, ProcessResultList logs, List<File> waveFiles, File streamFolder) {
- stripAudioFirstPass(r, logs, waveFiles, streamFolder, metaDataDao.getAudioMetaDataByRecording(r.getId()));
- }
-
- protected void createWav(Recording r, ProcessResultList logs, File streamFolder, List<File> waveFiles, File wav) throws IOException {
+ protected void createWav(Recording r, ProcessResultList logs, File streamFolder, List<File> waveFiles, File wav, List<RecordingMetaData> metaList) throws IOException {
deleteFileIfExists(wav);
- stripAudioFirstPass(r, logs, waveFiles, streamFolder);
+ stripAudioFirstPass(r, logs, waveFiles, streamFolder, metaList == null ? metaDataDao.getAudioMetaDataByRecording(r.getId()) : metaList);
if (waveFiles.isEmpty()) {
// create default Audio to merge it. strip to content length
String oneSecWav = new File(getStreamsHibernateDir(), "one_second.wav").getCanonicalPath();
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 817cceb..9ef0c56 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -80,7 +80,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
List<RecordingMetaData> metaList = metaDataDao.getByRecording(r.getId());
File wav = new File(streamFolder, String.format("INTERVIEW_%s_FINAL_WAVE.wav", r.getId()));
- createWav(r, logs, streamFolder, waveFiles, wav);
+ createWav(r, logs, streamFolder, waveFiles, wav, metaList);
final String interviewCam = interviewCamFile.getCanonicalPath();
@@ -153,6 +153,8 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
args.add("-i");
args.add(interviewCam);
} else {
+ args.add("-t");
+ args.add(formatMillis(p.getDuration()));
args.add("-i");
args.add(p.getFile());
}
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
index a52f23e..e761a6f 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
@@ -84,7 +84,7 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve
// Merge Wave to Full Length
File wav = new File(streamFolder, screenMetaData.getStreamName() + "_FINAL_WAVE.wav");
- createWav(r, logs, streamFolder, waveFiles, wav);
+ createWav(r, logs, streamFolder, waveFiles, wav, null);
screenMetaData.setFullWavAudioData(wav.getName());
metaDataDao.update(screenMetaData);