Author: solomax
Date: Tue Mar 11 18:19:22 2014
New Revision: 1576450
URL: http://svn.apache.org/r1576450
Log:
[OPENMEETINGS-938] duration in format HH:mm:ss is saved in the recording
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
Tue Mar 11 18:19:22 2014
@@ -232,7 +232,7 @@ public class FlvRecordingDao {
return null;
}
- public Long addFlvRecording(String fileHash, String fileName, Long
fileSize, Long user_id, Long room_id,
+ public Long addFlvRecording(String fileHash, String fileName, Long
user_id, Long room_id,
Date recordStart, Date recordEnd, Long ownerId, String
comment, String recorderStreamId, Integer width,
Integer height, Boolean isInterview) {
try {
@@ -242,7 +242,6 @@ public class FlvRecordingDao {
flvRecording.setDeleted(false);
flvRecording.setFileHash(fileHash);
flvRecording.setFileName(fileName);
- flvRecording.setFileSize(fileSize);
flvRecording.setInsertedBy(user_id);
flvRecording.setFolder(false);
flvRecording.setIsImage(false);
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
Tue Mar 11 18:19:22 2014
@@ -57,7 +57,7 @@ public class RecordingObject {
private Integer flvHeight;
private String previewImage;
- private Long fileSize;
+ private String duration;
private String recorderStreamId;
private Long organization_id;
@@ -100,7 +100,7 @@ public class RecordingObject {
this.flvHeight = customObject.getFlvHeight();
this.previewImage = customObject.getPreviewImage();
- this.fileSize = customObject.getFileSize();
+ this.duration = customObject.getDuration();
this.recorderStreamId = customObject.getRecorderStreamId();
this.organization_id = customObject.getOrganization_id();
@@ -293,12 +293,12 @@ public class RecordingObject {
this.previewImage = previewImage;
}
- public Long getFileSize() {
- return fileSize;
+ public String getDuration() {
+ return duration;
}
- public void setFileSize(Long fileSize) {
- this.fileSize = fileSize;
+ public void setDuration(String duration) {
+ this.duration = duration;
}
public String getRecorderStreamId() {
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
Tue Mar 11 18:19:22 2014
@@ -176,9 +176,9 @@ public class FlvRecording implements Ser
@Element(data = true, required = false)
private String previewImage;
- @Column(name = "filesize")
+ @Column(name = "duration")
@Element(data = true, required = false)
- private Long fileSize;
+ private String duration;
@Column(name = "recorder_stream_id")
@Element(data = true, required = false)
@@ -331,12 +331,12 @@ public class FlvRecording implements Ser
this.updated = updated;
}
- public Long getFileSize() {
- return fileSize;
+ public String getDuration() {
+ return duration;
}
- public void setFileSize(Long fileSize) {
- this.fileSize = fileSize;
+ public void setDuration(String duration) {
+ this.duration = duration;
}
public Date getRecordStart() {
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
Tue Mar 11 18:19:22 2014
@@ -28,7 +28,9 @@ import static org.apache.openmeetings.ut
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
@@ -82,6 +84,21 @@ public abstract class BaseConverter {
return getStreamsSubDir(flvRecording.getRoom_id());
}
+ protected String getDifference(Date from, Date to) {
+ long millis = from.getTime() - to.getTime();
+ long hours = TimeUnit.MILLISECONDS.toHours(millis);
+ millis -= TimeUnit.HOURS.toMillis(hours);
+ long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
+ millis -= TimeUnit.MINUTES.toMillis(minutes);
+ long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+ millis -= TimeUnit.SECONDS.toMillis(seconds);
+ return String.format("%02d:%02d:%02d.%03d", hours, minutes,
seconds, millis);
+ }
+
+ protected void updateDuration(FlvRecording r) {
+ r.setDuration(getDifference(r.getRecordEnd(),
r.getRecordStart()));
+ }
+
protected void deleteFileIfExists(String name) {
File f = new File(name);
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
Tue Mar 11 18:19:22 2014
@@ -279,6 +279,7 @@ public class FlvInterviewConverter exten
flvRecording.setAlternateDownload(alternateDownloadName);
+ updateDuration(flvRecording);
recordingDao.update(flvRecording);
convertToMp4(flvRecording, returnLog);
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
Tue Mar 11 18:19:22 2014
@@ -23,10 +23,8 @@ import static org.apache.openmeetings.ut
import java.io.File;
import java.util.ArrayList;
-import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
@@ -73,17 +71,6 @@ public class FlvRecorderConverter extend
}
}
- private String getDifference(Date from, Date to) {
- long millis = from.getTime() - to.getTime();
- long hours = TimeUnit.MILLISECONDS.toHours(millis);
- millis -= TimeUnit.HOURS.toMillis(hours);
- long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
- millis -= TimeUnit.MINUTES.toMillis(minutes);
- long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
- millis -= TimeUnit.SECONDS.toMillis(seconds);
- return String.format("%02d:%02d:%02d.%03d", hours, minutes,
seconds, millis);
- }
-
public void stripAudioFromFLVs(FlvRecording flvRecording) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
List<String> listOfFullWaveFiles = new LinkedList<String>();
@@ -203,6 +190,7 @@ public class FlvRecorderConverter extend
flvRecording.setAlternateDownload(alternateDownloadName);
+ updateDuration(flvRecording);
recordingDao.update(flvRecording);
convertToMp4(flvRecording, returnLog);
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
Tue Mar 11 18:19:22 2014
@@ -138,7 +138,7 @@ public class FLVRecorderService implemen
Date now = new Date();
// Receive flvRecordingId
- Long flvRecordingId =
flvRecordingDaoImpl.addFlvRecording("", roomRecordingName, null,
+ Long flvRecordingId =
flvRecordingDaoImpl.addFlvRecording("", roomRecordingName,
currentClient.getUser_id(), room_id,
now, null, currentClient.getUser_id(), comment,
currentClient.getStreamid(),
currentClient.getVWidth(), currentClient.getVHeight(), isInterview);
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
Tue Mar 11 18:19:22 2014
@@ -28,7 +28,7 @@
</tr>
<tr>
<td><wicket:ommessage key="864"/></td>
- <td><span wicket:id="fileSize"></span></td>
+ <td><span wicket:id="duration"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="865"/></td>
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Tue Mar 11 18:19:22 2014
@@ -55,7 +55,7 @@ public class VideoInfo extends Panel {
add(container.setOutputMarkupId(true));
setDefaultModel(rm);
- container.add(new Label("fileName"), new Label("fileSize"), new
Label("recordEnd"), new Label("room_id", roomName),
+ container.add(new Label("fileName"), new Label("duration"), new
Label("recordEnd"), new Label("room_id", roomName),
dFLV.setEnabled(false), dAVI.setEnabled(false));
dAVI.add(new AjaxEventBehavior("click"){
private static final long serialVersionUID = 1L;
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
Tue Mar 11 18:19:22 2014
@@ -232,7 +232,7 @@ public class FlvRecordingDao {
return null;
}
- public Long addFlvRecording(String fileHash, String fileName, Long
fileSize, Long user_id, Long room_id,
+ public Long addFlvRecording(String fileHash, String fileName, Long
user_id, Long room_id,
Date recordStart, Date recordEnd, Long ownerId, String
comment, String recorderStreamId, Integer width,
Integer height, Boolean isInterview) {
try {
@@ -242,7 +242,6 @@ public class FlvRecordingDao {
flvRecording.setDeleted(false);
flvRecording.setFileHash(fileHash);
flvRecording.setFileName(fileName);
- flvRecording.setFileSize(fileSize);
flvRecording.setInsertedBy(user_id);
flvRecording.setFolder(false);
flvRecording.setIsImage(false);
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
Tue Mar 11 18:19:22 2014
@@ -57,7 +57,7 @@ public class RecordingObject {
private Integer flvHeight;
private String previewImage;
- private Long fileSize;
+ private String duration;
private String recorderStreamId;
private Long organization_id;
@@ -100,7 +100,7 @@ public class RecordingObject {
this.flvHeight = customObject.getFlvHeight();
this.previewImage = customObject.getPreviewImage();
- this.fileSize = customObject.getFileSize();
+ this.duration = customObject.getDuration();
this.recorderStreamId = customObject.getRecorderStreamId();
this.organization_id = customObject.getOrganization_id();
@@ -293,12 +293,12 @@ public class RecordingObject {
this.previewImage = previewImage;
}
- public Long getFileSize() {
- return fileSize;
+ public String getDuration() {
+ return duration;
}
- public void setFileSize(Long fileSize) {
- this.fileSize = fileSize;
+ public void setDuration(String duration) {
+ this.duration = duration;
}
public String getRecorderStreamId() {
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
Tue Mar 11 18:19:22 2014
@@ -176,9 +176,9 @@ public class FlvRecording implements Ser
@Element(data = true, required = false)
private String previewImage;
- @Column(name = "filesize")
+ @Column(name = "duration")
@Element(data = true, required = false)
- private Long fileSize;
+ private String duration;
@Column(name = "recorder_stream_id")
@Element(data = true, required = false)
@@ -331,12 +331,12 @@ public class FlvRecording implements Ser
this.updated = updated;
}
- public Long getFileSize() {
- return fileSize;
+ public String getDuration() {
+ return duration;
}
- public void setFileSize(Long fileSize) {
- this.fileSize = fileSize;
+ public void setDuration(String duration) {
+ this.duration = duration;
}
public Date getRecordStart() {
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
Tue Mar 11 18:19:22 2014
@@ -28,7 +28,9 @@ import static org.apache.openmeetings.ut
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
@@ -82,6 +84,21 @@ public abstract class BaseConverter {
return getStreamsSubDir(flvRecording.getRoom_id());
}
+ protected String getDifference(Date from, Date to) {
+ long millis = from.getTime() - to.getTime();
+ long hours = TimeUnit.MILLISECONDS.toHours(millis);
+ millis -= TimeUnit.HOURS.toMillis(hours);
+ long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
+ millis -= TimeUnit.MINUTES.toMillis(minutes);
+ long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+ millis -= TimeUnit.SECONDS.toMillis(seconds);
+ return String.format("%02d:%02d:%02d.%03d", hours, minutes,
seconds, millis);
+ }
+
+ protected void updateDuration(FlvRecording r) {
+ r.setDuration(getDifference(r.getRecordEnd(),
r.getRecordStart()));
+ }
+
protected void deleteFileIfExists(String name) {
File f = new File(name);
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
Tue Mar 11 18:19:22 2014
@@ -279,6 +279,7 @@ public class FlvInterviewConverter exten
flvRecording.setAlternateDownload(alternateDownloadName);
+ updateDuration(flvRecording);
recordingDao.update(flvRecording);
convertToMp4(flvRecording, returnLog);
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
Tue Mar 11 18:19:22 2014
@@ -23,10 +23,8 @@ import static org.apache.openmeetings.ut
import java.io.File;
import java.util.ArrayList;
-import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
@@ -73,17 +71,6 @@ public class FlvRecorderConverter extend
}
}
- private String getDifference(Date from, Date to) {
- long millis = from.getTime() - to.getTime();
- long hours = TimeUnit.MILLISECONDS.toHours(millis);
- millis -= TimeUnit.HOURS.toMillis(hours);
- long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
- millis -= TimeUnit.MINUTES.toMillis(minutes);
- long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
- millis -= TimeUnit.SECONDS.toMillis(seconds);
- return String.format("%02d:%02d:%02d.%03d", hours, minutes,
seconds, millis);
- }
-
public void stripAudioFromFLVs(FlvRecording flvRecording) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
List<String> listOfFullWaveFiles = new LinkedList<String>();
@@ -203,6 +190,7 @@ public class FlvRecorderConverter extend
flvRecording.setAlternateDownload(alternateDownloadName);
+ updateDuration(flvRecording);
recordingDao.update(flvRecording);
convertToMp4(flvRecording, returnLog);
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
Tue Mar 11 18:19:22 2014
@@ -138,7 +138,7 @@ public class FLVRecorderService implemen
Date now = new Date();
// Receive flvRecordingId
- Long flvRecordingId =
flvRecordingDaoImpl.addFlvRecording("", roomRecordingName, null,
+ Long flvRecordingId =
flvRecordingDaoImpl.addFlvRecording("", roomRecordingName,
currentClient.getUser_id(), room_id,
now, null, currentClient.getUser_id(), comment,
currentClient.getStreamid(),
currentClient.getVWidth(), currentClient.getVHeight(), isInterview);
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.html
Tue Mar 11 18:19:22 2014
@@ -28,7 +28,7 @@
</tr>
<tr>
<td><wicket:ommessage key="864"/></td>
- <td><span wicket:id="fileSize"></span></td>
+ <td><span wicket:id="duration"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="865"/></td>
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1576450&r1=1576449&r2=1576450&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Tue Mar 11 18:19:22 2014
@@ -55,7 +55,7 @@ public class VideoInfo extends Panel {
add(container.setOutputMarkupId(true));
setDefaultModel(rm);
- container.add(new Label("fileName"), new Label("fileSize"), new
Label("recordEnd"), new Label("room_id", roomName),
+ container.add(new Label("fileName"), new Label("duration"), new
Label("recordEnd"), new Label("room_id", roomName),
dFLV.setEnabled(false), dAVI.setEnabled(false));
dAVI.add(new AjaxEventBehavior("click"){
private static final long serialVersionUID = 1L;
