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 2016/12/08 04:31:21 UTC

svn commit: r1773170 - in /openmeetings/application: branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/ branches/3.1.x/openmeetings-...

Author: solomax
Date: Thu Dec  8 04:31:20 2016
New Revision: 1773170

URL: http://svn.apache.org/viewvc?rev=1773170&view=rev
Log:
[OPENMEETINGS-1518] recordings are not being converted to avi

Removed:
    openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/AviRecordingResourceReference.java
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/AviRecordingResourceReference.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/AviRecordingResourceReference.java
Modified:
    openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
    openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
    openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
    openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
    openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
    openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
    openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
    openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
    openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
    openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
    openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
    openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
    openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
    openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
    openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
    openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
    openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
    openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
    openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
    openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
    openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
    openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
    openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java

Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java Thu Dec  8 04:31:20 2016
@@ -286,16 +286,6 @@ public class InterviewConverter extends
 
 			returnLog.add(ProcessHelper.executeScript("generateFullFLV", argv_previewFLV));
 
-			String alternateDownloadName = recordingFileName + recording.getId() + ".avi";
-			String alternateDownloadFullName = new File(streamFolderGeneral, alternateDownloadName).getCanonicalPath();
-			deleteFileIfExists(alternateDownloadFullName);
-
-			String[] argv_alternateDownload = new String[] { getPathToFFMPEG(), "-y", "-i", outputFullFlv, alternateDownloadFullName };
-
-			returnLog.add(ProcessHelper.executeScript("alternateDownload", argv_alternateDownload));
-
-			recording.setAlternateDownload(alternateDownloadName);
-
 			updateDuration(recording);
 			convertToMp4(recording, returnLog);
 			recording.setStatus(Recording.Status.PROCESSED);

Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java Thu Dec  8 04:31:20 2016
@@ -171,15 +171,6 @@ public class RecordingConverter extends
 
 			returnLog.add(ProcessHelper.executeScript("previewFullFLV", argv_previewFLV));
 
-			File alternateDownload = new File(getStreamsHibernateDir(), finalNamePrefix + ".avi");
-
-			String[] argv_alternateDownload = new String[] { getPathToFFMPEG(), "-y", "-i", outputFullFlv.getCanonicalPath(), "-vcodec",
-					"copy", alternateDownload.getCanonicalPath() };
-
-			returnLog.add(ProcessHelper.executeScript("alternateDownload", argv_alternateDownload));
-
-			recording.setAlternateDownload(alternateDownload.getName());
-
 			updateDuration(recording);
 			convertToMp4(recording, returnLog);
 			recording.setStatus(Recording.Status.PROCESSED);

Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.db.dao.record;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
@@ -279,9 +278,6 @@ public class RecordingDao {
 		if (r.exists(EXTENSION_FLV)) {
 			size += r.getFile(EXTENSION_FLV).length();
 		}
-		if (r.exists(EXTENSION_AVI)) {
-			size += r.getFile(EXTENSION_AVI).length();
-		}
 		if (r.exists(EXTENSION_JPG)) {
 			size += r.getFile(EXTENSION_JPG).length();
 		}

Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java Thu Dec  8 04:31:20 2016
@@ -36,7 +36,6 @@ public class RecordingDTO implements Ser
 	private Long id;
 	private String name;
 	private String flvName;
-	private String aviName;
 	private Long roomId;
 	private String status;
 	private boolean interview;
@@ -51,7 +50,6 @@ public class RecordingDTO implements Ser
 		this.id = r.getId();
 		this.name = r.getName();
 		this.flvName = r.getHash();
-		this.aviName = r.getAlternateDownload();
 		this.roomId = r.getRoomId();
 		this.status = r.getStatus().name();
 		this.interview = r.isInterview();
@@ -85,14 +83,6 @@ public class RecordingDTO implements Ser
 		this.flvName = flvName;
 	}
 
-	public String getAviName() {
-		return aviName;
-	}
-
-	public void setAviName(String aviName) {
-		this.aviName = aviName;
-	}
-
 	public Long getRoomId() {
 		return roomId;
 	}

Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.db.entity.record;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
 import static org.apache.openmeetings.util.OmFileHelper.getRecording;
@@ -124,10 +123,6 @@ public class Recording extends FileItem
 	@Element(data = true, name = "flvRecordingId")
 	private Long id;
 
-	@Column(name = "alternate_download")
-	@Element(data = true, required = false)
-	private String alternateDownload;
-
 	@Column(name = "comment")
 	@Element(data = true, required = false)
 	private String comment;
@@ -264,14 +259,6 @@ public class Recording extends FileItem
 		this.height = height;
 	}
 
-	public String getAlternateDownload() {
-		return alternateDownload;
-	}
-
-	public void setAlternateDownload(String alternateDownload) {
-		this.alternateDownload = alternateDownload;
-	}
-
 	public List<RecordingLog> getLog() {
 		return log;
 	}
@@ -312,8 +299,6 @@ public class Recording extends FileItem
 				f = getRecording(String.format("%s%s.%s.%s", recordingFileName, id, EXTENSION_FLV, EXTENSION_MP4));
 			} else if (EXTENSION_FLV.equals(ext)) {
 				f = getRecording(String.format("%s%s.%s", recordingFileName, id, EXTENSION_FLV));
-			} else if (EXTENSION_AVI.equals(ext)) {
-				f = getRecording(String.format("%s%s.%s", recordingFileName, id, EXTENSION_AVI));
 			}
 		}
 		return f;

Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx Thu Dec  8 04:31:20 2016
@@ -215,6 +215,7 @@
 	</method>
 
 	<method name="prepare" args="mode, streamName, camReference, micReference">
+	<![CDATA[
 		if (this._ns != null){
 			this._stop();
 		}
@@ -231,7 +232,7 @@
 			if ($debug) Debug.write("codecType=" + canvas.codecType);
 			if (canvas.codecType === "h264") {
 				videoStreamSettings = new H264VideoStreamSettings();
-				videoStreamSettings.setProfileLevel(H264Profile.BASELINE, H264Level.LEVEL_5_1);
+				videoStreamSettings.setProfileLevel(H264Profile.BASELINE, H264Level.LEVEL_3_1);
 			} else {
 				videoStreamSettings = new VideoStreamSettings();
 			}
@@ -246,8 +247,8 @@
 			this._ns.attachAudio(micReference);
 			muteMicro(this.micMuted);
 		}
-		
 		this._ns.publish("" + streamName, (mode == "broadcast") ? "live" : mode);
+	]]>
 	</method>
 	<!---
 		BroadCasts a Stream
@@ -269,9 +270,11 @@
 	<method name="_stop">
 		if ($debug) Debug.write("STOP: ",this.mode,this._ns);
 		//Stop NetStream
-		if (this._ns==null) return;
+		if (this._ns == null) return;
 		this.camera = null;
 		this.micro = null;
+		this._ns.attachCamera(null);
+		this._ns.attachAudio(null);
 		if (this.mode == "play") {
 			this.soundRefMC = null;
 			this.soundRef = null;

Modified: openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.service.quartz.scheduler;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -111,7 +110,6 @@ public class CleanupJob extends Abstract
 				log.debug("cleanExpiredRecordings:: following recording will be deleted {}", rec);
 				rec.getFile(EXTENSION_MP4).delete();
 				rec.getFile(EXTENSION_FLV).delete();
-				rec.getFile(EXTENSION_AVI).delete();
 				recordingDao.delete(rec);
 			}
 		});

Modified: openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Thu Dec  8 04:31:20 2016
@@ -79,7 +79,6 @@ public class OmFileHelper {
 	public static final String EXTENSION_WML = "wml";
 	public static final String EXTENSION_FLV = "flv";
 	public static final String EXTENSION_MP4 = "mp4";
-	public static final String EXTENSION_AVI = "avi";
 	public static final String EXTENSION_JPG = "jpg";
 	public static final String EXTENSION_SWF = "swf";
 	public static final String WML_EXTENSION = "." + EXTENSION_WML;

Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Dec  8 04:31:20 2016
@@ -61,7 +61,6 @@ import org.apache.openmeetings.web.user.
 import org.apache.openmeetings.web.user.dashboard.StartWidgetDescriptor;
 import org.apache.openmeetings.web.user.dashboard.WelcomeWidgetDescriptor;
 import org.apache.openmeetings.web.user.dashboard.admin.AdminWidgetDescriptor;
-import org.apache.openmeetings.web.user.record.AviRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.FlvRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
@@ -148,7 +147,6 @@ public class Application extends Authent
 		mountPage("activate", ActivatePage.class);
 		mountPage("reset", ResetPage.class);
 		mountPage("/hash", HashPage.class);
-		mountResource("/recordings/avi/${id}", new AviRecordingResourceReference());
 		mountResource("/recordings/flv/${id}", new FlvRecordingResourceReference());
 		mountResource("/recordings/mp4/${id}", new Mp4RecordingResourceReference());
 		mountResource("/recordings/jpg/${id}", new JpgRecordingResourceReference()); //should be in sync with VideoPlayer

Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.web.user.record;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
 import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
@@ -144,7 +143,7 @@ public class VideoInfo extends Panel {
 			}
 		}
 		reConvert.setEnabled(reConvEnabled);
-		boolean exists = r.exists() || r.exists(EXTENSION_AVI);
+		boolean exists = r.exists();
 		downloadBtn.setEnabled(exists);
 		share.setEnabled(exists);
 		if (target != null) {
@@ -186,24 +185,6 @@ public class VideoInfo extends Panel {
 				download.setFileName(f.getName());
 				download.setResourceStream(new FileResourceStream(f));
 				download.initiate(target);
-			}
-		});
-		//avi
-		list.add(new MenuItem(getString("884"), JQueryIcon.ARROWTHICKSTOP_1_S) {
-			private static final long serialVersionUID = 1L;
-			
-			@Override
-			public boolean isEnabled() {
-				Recording r = rm.getObject();
-				return r != null && r.exists(EXTENSION_AVI);
-			}
-			
-			@Override
-			public void onClick(AjaxRequestTarget target) {
-				File f = rm.getObject().getFile(EXTENSION_AVI);
-				download.setFileName(f.getName());
-				download.setResourceStream(new FileResourceStream(f));
-				download.initiate(target);
 			}
 		});
 		//flv

Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.core.converter;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
@@ -284,13 +283,6 @@ public class InterviewConverter extends
 
 			logs.add(ProcessHelper.executeScript("generateFullFLV", argv_previewFLV));
 
-			File avi = r.getFile(EXTENSION_AVI);
-			deleteFileIfExists(avi);
-
-			String[] argv_alternateDownload = new String[] { getPathToFFMPEG(), "-y", "-i", flv.getCanonicalPath(), avi.getCanonicalPath() };
-
-			logs.add(ProcessHelper.executeScript("alternateDownload", argv_alternateDownload));
-
 			updateDuration(r);
 			convertToMp4(r, logs);
 			r.setStatus(Recording.Status.PROCESSED);

Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.core.converter;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
@@ -172,13 +171,6 @@ public class RecordingConverter extends
 
 			logs.add(ProcessHelper.executeScript("previewFullFLV", cmdJpg));
 
-			File avi = r.getFile(EXTENSION_AVI);
-
-			String[] cmdAvi = new String[] { getPathToFFMPEG(), "-y", "-i", flv.getCanonicalPath(), "-vcodec",
-					"copy", avi.getCanonicalPath() };
-
-			logs.add(ProcessHelper.executeScript("alternateDownload", cmdAvi));
-
 			updateDuration(r);
 			convertToMp4(r, logs);
 			r.setStatus(Recording.Status.PROCESSED);

Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.db.dao.record;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
@@ -279,9 +278,6 @@ public class RecordingDao {
 		if (r.exists(EXTENSION_FLV)) {
 			size += r.getFile(EXTENSION_FLV).length();
 		}
-		if (r.exists(EXTENSION_AVI)) {
-			size += r.getFile(EXTENSION_AVI).length();
-		}
 		if (r.exists(EXTENSION_JPG)) {
 			size += r.getFile(EXTENSION_JPG).length();
 		}

Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx Thu Dec  8 04:31:20 2016
@@ -215,6 +215,7 @@
 	</method>
 
 	<method name="prepare" args="mode, streamName, camReference, micReference">
+	<![CDATA[
 		if (this._ns != null){
 			this._stop();
 		}
@@ -231,7 +232,7 @@
 			if ($debug) Debug.write("codecType=" + canvas.codecType);
 			if (canvas.codecType === "h264") {
 				videoStreamSettings = new H264VideoStreamSettings();
-				videoStreamSettings.setProfileLevel(H264Profile.BASELINE, H264Level.LEVEL_5_1);
+				videoStreamSettings.setProfileLevel(H264Profile.BASELINE, H264Level.LEVEL_3_1);
 			} else {
 				videoStreamSettings = new VideoStreamSettings();
 			}
@@ -246,8 +247,8 @@
 			this._ns.attachAudio(micReference);
 			muteMicro(this.micMuted);
 		}
-		
 		this._ns.publish("" + streamName, (mode == "broadcast") ? "live" : mode);
+	]]>
 	</method>
 	<!---
 		BroadCasts a Stream

Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Thu Dec  8 04:31:20 2016
@@ -24,7 +24,6 @@ import static org.apache.openmeetings.db
 import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
 import static org.apache.openmeetings.util.OmFileHelper.BCKP_RECORD_FILES;
 import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
@@ -556,7 +555,6 @@ public class BackupImport {
 					r.setHash(UUID.randomUUID().toString());
 					fileMap.put(String.format("%s.%s", name, EXTENSION_FLV), String.format("%s.%s", r.getHash(), EXTENSION_FLV));
 					fileMap.put(String.format("%s.%s.meta", name, EXTENSION_FLV), String.format("%s.%s.meta", r.getHash(), EXTENSION_FLV));
-					fileMap.put(String.format("%s.%s", name, EXTENSION_AVI), String.format("%s.%s", r.getHash(), EXTENSION_AVI));
 					fileMap.put(String.format("%s.%s", name, EXTENSION_JPG), String.format("%s.%s", r.getHash(), EXTENSION_JPG));
 					fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_MP4), String.format("%s.%s", r.getHash(), EXTENSION_MP4));
 				}

Modified: openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.service.quartz.scheduler;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -111,7 +110,6 @@ public class CleanupJob extends Abstract
 				log.debug("cleanExpiredRecordings:: following recording will be deleted {}", rec);
 				rec.getFile(EXTENSION_MP4).delete();
 				rec.getFile(EXTENSION_FLV).delete();
-				rec.getFile(EXTENSION_AVI).delete();
 				recordingDao.delete(rec);
 			}
 		});

Modified: openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Thu Dec  8 04:31:20 2016
@@ -63,7 +63,6 @@ public class OmFileHelper {
 	public static final String EXTENSION_WML = "wml";
 	public static final String EXTENSION_FLV = "flv";
 	public static final String EXTENSION_MP4 = "mp4";
-	public static final String EXTENSION_AVI = "avi";
 	public static final String EXTENSION_JPG = "jpg";
 	public static final String EXTENSION_SWF = "swf";
 	public static final String EXTENSION_PDF = "pdf";

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Dec  8 04:31:20 2016
@@ -65,7 +65,6 @@ import org.apache.openmeetings.web.user.
 import org.apache.openmeetings.web.user.dashboard.StartWidgetDescriptor;
 import org.apache.openmeetings.web.user.dashboard.WelcomeWidgetDescriptor;
 import org.apache.openmeetings.web.user.dashboard.admin.AdminWidgetDescriptor;
-import org.apache.openmeetings.web.user.record.AviRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.FlvRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
@@ -150,7 +149,6 @@ public class Application extends Authent
 		mountPage("install", InstallWizardPage.class);
 		mountPage("activate", ActivatePage.class);
 		mountPage("reset", ResetPage.class);
-		mountResource("/recordings/avi/${id}", new AviRecordingResourceReference());
 		mountResource("/recordings/flv/${id}", new FlvRecordingResourceReference());
 		mountResource("/recordings/mp4/${id}", new Mp4RecordingResourceReference());
 		mountResource("/recordings/jpg/${id}", new JpgRecordingResourceReference()); //should be in sync with VideoPlayer

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.web.user.record;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
 import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
@@ -144,7 +143,7 @@ public class VideoInfo extends Panel {
 			}
 		}
 		reConvert.setEnabled(reConvEnabled);
-		boolean exists = r.exists() || r.exists(EXTENSION_AVI);
+		boolean exists = r.exists();
 		downloadBtn.setEnabled(exists);
 		share.setEnabled(exists);
 		if (target != null) {
@@ -186,24 +185,6 @@ public class VideoInfo extends Panel {
 				download.setFileName(f.getName());
 				download.setResourceStream(new FileResourceStream(f));
 				download.initiate(target);
-			}
-		});
-		//avi
-		list.add(new MenuItem(getString("884"), JQueryIcon.ARROWTHICKSTOP_1_S) {
-			private static final long serialVersionUID = 1L;
-			
-			@Override
-			public boolean isEnabled() {
-				Recording r = rm.getObject();
-				return r != null && r.exists(EXTENSION_AVI);
-			}
-			
-			@Override
-			public void onClick(AjaxRequestTarget target) {
-				File f = rm.getObject().getFile(EXTENSION_AVI);
-				download.setFileName(f.getName());
-				download.setResourceStream(new FileResourceStream(f));
-				download.initiate(target);
 			}
 		});
 		//flv

Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.core.converter;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
@@ -284,13 +283,6 @@ public class InterviewConverter extends
 
 			logs.add(ProcessHelper.executeScript("generateFullFLV", argv_previewFLV));
 
-			File avi = r.getFile(EXTENSION_AVI);
-			deleteFileIfExists(avi);
-
-			String[] argv_alternateDownload = new String[] { getPathToFFMPEG(), "-y", "-i", flv.getCanonicalPath(), avi.getCanonicalPath() };
-
-			logs.add(ProcessHelper.executeScript("alternateDownload", argv_alternateDownload));
-
 			updateDuration(r);
 			convertToMp4(r, logs);
 			r.setStatus(Recording.Status.PROCESSED);

Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.core.converter;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
@@ -172,13 +171,6 @@ public class RecordingConverter extends
 
 			logs.add(ProcessHelper.executeScript("previewFullFLV", cmdJpg));
 
-			File avi = r.getFile(EXTENSION_AVI);
-
-			String[] cmdAvi = new String[] { getPathToFFMPEG(), "-y", "-i", flv.getCanonicalPath(), "-vcodec",
-					"copy", avi.getCanonicalPath() };
-
-			logs.add(ProcessHelper.executeScript("alternateDownload", cmdAvi));
-
 			updateDuration(r);
 			convertToMp4(r, logs);
 			r.setStatus(Recording.Status.PROCESSED);

Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.db.dao.record;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
@@ -279,9 +278,6 @@ public class RecordingDao {
 		if (r.exists(EXTENSION_FLV)) {
 			size += r.getFile(EXTENSION_FLV).length();
 		}
-		if (r.exists(EXTENSION_AVI)) {
-			size += r.getFile(EXTENSION_AVI).length();
-		}
 		if (r.exists(EXTENSION_JPG)) {
 			size += r.getFile(EXTENSION_JPG).length();
 		}

Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Thu Dec  8 04:31:20 2016
@@ -24,7 +24,6 @@ import static org.apache.openmeetings.db
 import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
 import static org.apache.openmeetings.util.OmFileHelper.BCKP_RECORD_FILES;
 import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
@@ -556,7 +555,6 @@ public class BackupImport {
 					r.setHash(UUID.randomUUID().toString());
 					fileMap.put(String.format("%s.%s", name, EXTENSION_FLV), String.format("%s.%s", r.getHash(), EXTENSION_FLV));
 					fileMap.put(String.format("%s.%s.meta", name, EXTENSION_FLV), String.format("%s.%s.meta", r.getHash(), EXTENSION_FLV));
-					fileMap.put(String.format("%s.%s", name, EXTENSION_AVI), String.format("%s.%s", r.getHash(), EXTENSION_AVI));
 					fileMap.put(String.format("%s.%s", name, EXTENSION_JPG), String.format("%s.%s", r.getHash(), EXTENSION_JPG));
 					fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_MP4), String.format("%s.%s", r.getHash(), EXTENSION_MP4));
 				}

Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.service.quartz.scheduler;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -111,7 +110,6 @@ public class CleanupJob extends Abstract
 				log.debug("cleanExpiredRecordings:: following recording will be deleted {}", rec);
 				rec.getFile(EXTENSION_MP4).delete();
 				rec.getFile(EXTENSION_FLV).delete();
-				rec.getFile(EXTENSION_AVI).delete();
 				recordingDao.delete(rec);
 			}
 		});

Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Thu Dec  8 04:31:20 2016
@@ -63,7 +63,6 @@ public class OmFileHelper {
 	public static final String EXTENSION_WML = "wml";
 	public static final String EXTENSION_FLV = "flv";
 	public static final String EXTENSION_MP4 = "mp4";
-	public static final String EXTENSION_AVI = "avi";
 	public static final String EXTENSION_JPG = "jpg";
 	public static final String EXTENSION_SWF = "swf";
 	public static final String EXTENSION_PDF = "pdf";

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Dec  8 04:31:20 2016
@@ -65,7 +65,6 @@ import org.apache.openmeetings.web.user.
 import org.apache.openmeetings.web.user.dashboard.StartWidgetDescriptor;
 import org.apache.openmeetings.web.user.dashboard.WelcomeWidgetDescriptor;
 import org.apache.openmeetings.web.user.dashboard.admin.AdminWidgetDescriptor;
-import org.apache.openmeetings.web.user.record.AviRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.FlvRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
 import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
@@ -150,7 +149,6 @@ public class Application extends Authent
 		mountPage("install", InstallWizardPage.class);
 		mountPage("activate", ActivatePage.class);
 		mountPage("reset", ResetPage.class);
-		mountResource("/recordings/avi/${id}", new AviRecordingResourceReference());
 		mountResource("/recordings/flv/${id}", new FlvRecordingResourceReference());
 		mountResource("/recordings/mp4/${id}", new Mp4RecordingResourceReference());
 		mountResource("/recordings/jpg/${id}", new JpgRecordingResourceReference()); //should be in sync with VideoPlayer

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1773170&r1=1773169&r2=1773170&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Thu Dec  8 04:31:20 2016
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.web.user.record;
 
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
 import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
@@ -144,7 +143,7 @@ public class VideoInfo extends Panel {
 			}
 		}
 		reConvert.setEnabled(reConvEnabled);
-		boolean exists = r.exists() || r.exists(EXTENSION_AVI);
+		boolean exists = r.exists();
 		downloadBtn.setEnabled(exists);
 		share.setEnabled(exists);
 		if (target != null) {
@@ -186,24 +185,6 @@ public class VideoInfo extends Panel {
 				download.setFileName(f.getName());
 				download.setResourceStream(new FileResourceStream(f));
 				download.initiate(target);
-			}
-		});
-		//avi
-		list.add(new MenuItem(getString("884"), JQueryIcon.ARROWTHICKSTOP_1_S) {
-			private static final long serialVersionUID = 1L;
-			
-			@Override
-			public boolean isEnabled() {
-				Recording r = rm.getObject();
-				return r != null && r.exists(EXTENSION_AVI);
-			}
-			
-			@Override
-			public void onClick(AjaxRequestTarget target) {
-				File f = rm.getObject().getFile(EXTENSION_AVI);
-				download.setFileName(f.getName());
-				download.setResourceStream(new FileResourceStream(f));
-				download.initiate(target);
 			}
 		});
 		//flv