Revision: 4737
Author: [email protected]
Date: Sat Dec 17 23:46:26 2011
Log: Recording re-convertion intermediate check-in; code cleanup
http://code.google.com/p/openmeetings/source/detail?r=4737
Added:
/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/resources/reload.png
Modified:
/trunk/singlewebapp/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/library.lzx
/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDeltaDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverterTask.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewReConverterTask.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverterTask.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamTranscodingListener.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/logs/ConferenceLogTypeDaoImpl.java
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/resources/reload.png
Sat Dec 17 23:46:26 2011
Binary file, no diff available.
=======================================
---
/trunk/singlewebapp/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
Wed Nov 30 09:22:42 2011
+++
/trunk/singlewebapp/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
Sat Dec 17 23:46:26 2011
@@ -16,21 +16,9 @@
<property name="queueCapacity" value="25" />
</bean>
- <bean id="openmeetings.FlvRecorderConverterTask"
class="org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverterTask">
- <constructor-arg type="org.springframework.core.task.TaskExecutor"
ref="openmeetings.TaskExecutor" />
- <constructor-arg
type="org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverter"
ref="openmeetings.FlvRecorderConverter"/>
- </bean>
-
- <bean id="openmeetings.FlvInterviewConverterTask"
class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverterTask">
- <constructor-arg type="org.springframework.core.task.TaskExecutor"
ref="openmeetings.TaskExecutor" />
- <constructor-arg
type="org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverter"
ref="openmeetings.FlvInterviewConverter"/>
- </bean>
-
- <bean id="openmeetings.FlvInterviewReConverterTask"
class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewReConverterTask">
- <constructor-arg type="org.springframework.core.task.TaskExecutor"
ref="openmeetings.TaskExecutor" />
- <constructor-arg
type="org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverter"
ref="openmeetings.FlvInterviewConverter"/>
- </bean>
-
+ <bean id="openmeetings.FlvRecorderConverterTask"
class="org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverterTask"/>
+ <bean id="openmeetings.FlvInterviewConverterTask"
class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverterTask"/>
+ <bean id="openmeetings.FlvInterviewReConverterTask"
class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewReConverterTask"/>
<bean id="openmeetings.FlvInterviewConverter"
class="org.openmeetings.app.data.flvrecord.converter.FlvInterviewConverter"
/>
<bean id="openmeetings.FlvRecorderConverter"
class="org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverter"
/>
=======================================
--- /trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/library.lzx
Mon May 30 13:39:45 2011
+++ /trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/library.lzx
Sat Dec 17 23:46:26 2011
@@ -13,6 +13,7 @@
<resource name="icon_flv_recording_video_start_rsc"
src="resources/icon_flv_recording_video_start.png" />
<resource name="recorder_show_log_rsc"
src="resources/messagebox_info.png" />
+ <resource name="flv_reload_rsc" src="resources/reload.png" />
<include href="baseChooseIconFLVView.lzx" />
<include href="messageRecordingWin.lzx" />
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
Sun Oct 23 02:39:44 2011
+++
/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
Sat Dec 17 23:46:26 2011
@@ -235,14 +235,14 @@
var restSeconds = deltaInSeconds - (minutes*60);
- var timeInMinutes = minutes+" min "+restSeconds+" sek";
+ var timeInMinutes = minutes+" min "+restSeconds+" sec";
if (minutes > 60) {
var hours = Math.floor(minutes/60);
var restMinutes = minutes - (hours*60);
- var timeInMinutes = hours+" h "+restMinutes+"
min "+restSeconds+" sek";
+ var timeInMinutes = hours+" h "+restMinutes+"
min "+restSeconds+" sec";
}
this._recordingsInfo.content.recordingName = rec.fileHash;
@@ -413,6 +413,9 @@
<customEdittext name="right" x="$once{ parent.width - 68 }"
width="26" text="0" y="20"/>
<view name="_show_log1" resource="flv_reload_rsc" y="18"
x="$once{ parent.width - 36 }">
+ <handler name="oninit">
+ if ($debug) Debug.write("_show_log1::oninit ", this);
+ </handler>
<handler name="onclick" args="clickObj">
parent.parent.parent.parent._recordingsViewMain.restartConversion(parent.left.getText(),parent.right.getText(),parent.leftTime.getText(),parent.rightTime.getText());
</handler>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Mon Nov 21 05:20:59 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Sat Dec 17 23:46:26 2011
@@ -138,11 +138,11 @@
return null;
}
- public SearchResult getAllConf(long user_level, int start, int max,
+ public SearchResult<Configuration> getAllConf(long user_level, int start,
int max,
String orderby, boolean asc) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
- SearchResult sresult = new SearchResult();
+ SearchResult<Configuration> sresult = new
SearchResult<Configuration>();
sresult.setRecords(this.selectMaxFromConfigurations());
sresult.setResult(this.getConfigurations(start,
max, orderby,
asc));
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Sat Oct 1 11:15:55 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Sat Dec 17 23:46:26 2011
@@ -478,10 +478,10 @@
return new Long(-1);
}
- public SearchResult getFieldsByLanguage(int start, int max, String
orderby,
+ public SearchResult<Fieldvalues> getFieldsByLanguage(int start, int max,
String orderby,
boolean asc, Long language_id) {
try {
- SearchResult sresult = new SearchResult();
+ SearchResult<Fieldvalues> sresult = new
SearchResult<Fieldvalues>();
sresult.setObjectName(Fieldlanguagesvalues.class.getName());
sresult.setRecords(this.selectMaxFromFieldsValues());
sresult.setResult(this.getMixedFieldValuesList(start,
max, orderby,
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java
Mon Nov 21 05:20:59 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java
Sat Dec 17 23:46:26 2011
@@ -2,12 +2,11 @@
import java.util.List;
-public class SearchResult {
+public class SearchResult<T> {
private String objectName;
private Long records;
- @SuppressWarnings("rawtypes")
- private List result;
+ private List<T> result;
private Long errorId;
public String getObjectName() {
@@ -22,10 +21,10 @@
public void setRecords(Long records) {
this.records = records;
}
- public List getResult() {
+ public List<T> getResult() {
return result;
}
- public void setResult(List result) {
+ public void setResult(List<T> result) {
this.result = result;
}
public Long getErrorId() {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Wed Sep 7 11:46:30 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Sat Dec 17 23:46:26 2011
@@ -265,11 +265,11 @@
return null;
}
- public SearchResult getRooms(long user_level, int start, int max,
+ public SearchResult<Rooms> getRooms(long user_level, int start, int max,
String orderby, boolean asc, String search) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
- SearchResult sResult = new SearchResult();
+ SearchResult<Rooms> sResult = new
SearchResult<Rooms>();
sResult.setRecords(this.selectMaxFromRooms(search));
sResult.setObjectName(Rooms.class.getName());
sResult.setResult(this.getRoomsInternatlByHQL(start, max,
@@ -282,11 +282,11 @@
return null;
}
- public SearchResult getRoomsWithCurrentUsers(long user_level, int start,
+ public SearchResult<Rooms> getRoomsWithCurrentUsers(long user_level, int
start,
int max, String orderby, boolean asc) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
- SearchResult sResult = new SearchResult();
+ SearchResult<Rooms> sResult = new
SearchResult<Rooms>();
sResult.setRecords(this.selectMaxFromRooms(""));
sResult.setObjectName(Rooms.class.getName());
@@ -1052,13 +1052,13 @@
return null;
}
- public SearchResult getRoomsOrganisationByOrganisationId(long
user_level,
+ public SearchResult<Rooms_Organisation>
getRoomsOrganisationByOrganisationId(long user_level,
long organisation_id, int start, int max, String
orderby,
boolean asc) {
try {
if (authLevelManagement.checkModLevel(user_level)) {
- SearchResult sResult = new SearchResult();
+ SearchResult<Rooms_Organisation> sResult = new
SearchResult<Rooms_Organisation>();
sResult.setObjectName(Rooms_Organisation.class.getName());
sResult.setRecords(this.selectMaxFromRoomsByOrganisation(
organisation_id).longValue());
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Thu Nov 17 08:19:12 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Sat Dec 17 23:46:26 2011
@@ -6,9 +6,10 @@
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.persistence.beans.flvrecord.FlvRecording;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -19,8 +20,8 @@
*/
@Transactional
public class FlvRecordingDaoImpl {
-
- private static final Logger log =
Red5LoggerFactory.getLogger(FlvRecordingDaoImpl.class);
+ private static final Logger log =
Red5LoggerFactory.getLogger(FlvRecordingDaoImpl.class,
+ ScopeApplicationAdapter.webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -30,12 +31,12 @@
String hql = "SELECT c FROM FlvRecording c " +
"WHERE c.flvRecordingId =
:flvRecordingId";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("flvRecordingId", flvRecordingId);
FlvRecording flvRecording = null;
try {
- flvRecording = (FlvRecording)
query.getSingleResult();
+ flvRecording = query.getSingleResult();
} catch (NoResultException ex) {
}
return flvRecording;
@@ -51,7 +52,7 @@
String hql = "SELECT c FROM FlvRecording c " +
"WHERE c.deleted <> :deleted
";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("deleted", "true");
List<FlvRecording> flvRecordings =
query.getResultList();
@@ -75,7 +76,7 @@
"AND u.externalUserId = :externalUserId
" +
"AND c.deleted <> :deleted ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("externalUserId", externalUserId);
query.setParameter("deleted", "true");
@@ -101,7 +102,7 @@
"AND c.insertedBy LIKE :insertedBy " +
"AND c.deleted <> :deleted ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("externalRoomType",
externalRoomType);
query.setParameter("insertedBy", insertedBy);
query.setParameter("deleted", "true");
@@ -122,7 +123,7 @@
String hql = "SELECT c FROM FlvRecording c ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
List<FlvRecording> flvRecordings =
query.getResultList();
@@ -143,7 +144,7 @@
"AND r.externalRoomType LIKE
:externalRoomType " +
"AND c.deleted <> :deleted ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("externalRoomType",
externalRoomType);
query.setParameter("deleted", "true");
@@ -167,7 +168,7 @@
"AND (c.parentFileExplorerItemId IS NULL OR
c.parentFileExplorerItemId = 0) " +
"ORDER BY c.isFolder DESC, c.fileName ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("deleted", "true");
List<FlvRecording> flvRecordingList =
query.getResultList();
@@ -188,7 +189,7 @@
"AND (c.parentFileExplorerItemId IS NULL OR
c.parentFileExplorerItemId = 0) " +
"ORDER BY c.isFolder DESC, c.fileName ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("organization_id", organization_id);
query.setParameter("deleted", "true");
@@ -210,7 +211,7 @@
"AND (c.parentFileExplorerItemId IS NULL OR
c.parentFileExplorerItemId = 0) " +
"ORDER BY c.isFolder DESC, c.fileName ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("deleted", "true");
query.setParameter("ownerId",ownerId);
@@ -232,7 +233,7 @@
"AND c.parentFileExplorerItemId =
:parentFileExplorerItemId " +
"ORDER BY c.isFolder DESC, c.fileName ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("deleted", "true");
query.setParameter("ownerId",ownerId);
query.setParameter("parentFileExplorerItemId",
parentFileExplorerItemId);
@@ -254,7 +255,7 @@
"AND c.room_id = :room_id " +
"ORDER BY c.isFolder DESC, c.fileName ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("deleted", "true");
query.setParameter("room_id",room_id);
@@ -275,7 +276,7 @@
"AND c.parentFileExplorerItemId =
:parentFileExplorerItemId " +
"ORDER BY c.isFolder DESC, c.fileName ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);
query.setParameter("deleted", "true");
query.setParameter("parentFileExplorerItemId",
parentFileExplorerItemId);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDataDaoImpl.java
Sat Dec 17 23:46:26 2011
@@ -6,9 +6,10 @@
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import
org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,8 @@
@Transactional
public class FlvRecordingMetaDataDaoImpl {
- private static final Logger log =
Red5LoggerFactory.getLogger(FlvRecordingMetaDataDaoImpl.class);
+ private static final Logger log =
Red5LoggerFactory.getLogger(FlvRecordingMetaDataDaoImpl.class,
+ ScopeApplicationAdapter.webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
@@ -29,12 +31,12 @@
String hql = "SELECT c FROM FlvRecordingMetaData c " +
"WHERE c.flvRecordingMetaDataId =
:flvRecordingMetaDataId";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecordingMetaData> query = em.createQuery(hql,
FlvRecordingMetaData.class);
query.setParameter("flvRecordingMetaDataId",
flvRecordingMetaDataId);
FlvRecordingMetaData flvRecordingMetaData = null;
try {
- flvRecordingMetaData = (FlvRecordingMetaData)
query.getSingleResult();
+ flvRecordingMetaData = query.getSingleResult();
} catch (NoResultException ex) {
}
@@ -53,7 +55,7 @@
"WHERE c.flvRecording.flvRecordingId =
:flvRecordingId " +
"AND c.deleted <> :deleted ";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecordingMetaData> query = em.createQuery(hql,
FlvRecordingMetaData.class);
query.setParameter("flvRecordingId", flvRecordingId);
query.setParameter("deleted", "true");
@@ -78,7 +80,7 @@
"(c.isAudioOnly = true OR (c.isAudioOnly = false AND c.isVideoOnly =
false))" +
")";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecordingMetaData> query = em.createQuery(hql,
FlvRecordingMetaData.class);
query.setParameter("flvRecordingId", flvRecordingId);
List<FlvRecordingMetaData> flvRecordingMetaDatas =
query.getResultList();
@@ -98,7 +100,7 @@
"WHERE c.flvRecording.flvRecordingId =
:flvRecordingId " +
"AND c.isScreenData = true";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecordingMetaData> query = em.createQuery(hql,
FlvRecordingMetaData.class);
query.setParameter("flvRecordingId", flvRecordingId);
List<FlvRecordingMetaData> flvRecordingMetaDatas =
query.getResultList();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDeltaDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingMetaDeltaDaoImpl.java
Sat Dec 17 23:46:26 2011
@@ -4,9 +4,10 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import
org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +19,8 @@
@Transactional
public class FlvRecordingMetaDeltaDaoImpl {
- private static final Logger log =
Red5LoggerFactory.getLogger(FlvRecordingMetaDeltaDaoImpl.class);
+ private static final Logger log =
Red5LoggerFactory.getLogger(FlvRecordingMetaDeltaDaoImpl.class,
+ ScopeApplicationAdapter.webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -28,7 +30,7 @@
String hql = "SELECT c FROM FlvRecordingMetaDelta c " +
"WHERE c.flvRecordingMetaDataId =
:flvRecordingMetaDataId";
- Query query = em.createQuery(hql);
+ TypedQuery<FlvRecordingMetaDelta> query = em.createQuery(hql,
FlvRecordingMetaDelta.class);
query.setParameter("flvRecordingMetaDataId",
flvRecordingMetaDataId);
List<FlvRecordingMetaDelta> flvRecordingMetaDeltas =
query.getResultList();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java
Wed Nov 30 09:22:42 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/BaseConverter.java
Sat Dec 17 23:46:26 2011
@@ -111,12 +111,20 @@
return argv_full_sox;
}
- protected void stripAudioFirstPass(FlvRecording flvRecording,
List<HashMap<String, String>> returnLog, List<String> listOfFullWaveFiles,
String streamFolderName) {
- try {
- List<FlvRecordingMetaData> metaDataList =
flvRecordingMetaDataDaoImpl
-
.getFlvRecordingMetaDataAudioFlvsByRecording(flvRecording
- .getFlvRecordingId());
-
+ protected void stripAudioFirstPass(FlvRecording flvRecording,
+ List<HashMap<String, String>> returnLog,
+ List<String> listOfFullWaveFiles, String
streamFolderName) {
+ List<FlvRecordingMetaData> metaDataList =
flvRecordingMetaDataDaoImpl
+
.getFlvRecordingMetaDataAudioFlvsByRecording(flvRecording
+ .getFlvRecordingId());
+ stripAudioFirstPass(flvRecording, returnLog, listOfFullWaveFiles,
streamFolderName, metaDataList);
+ }
+
+ protected void stripAudioFirstPass(FlvRecording flvRecording,
+ List<HashMap<String, String>> returnLog,
+ List<String> listOfFullWaveFiles, String
streamFolderName,
+ List<FlvRecordingMetaData> metaDataList) {
+ try {
// Init variables
log.debug("### meta Data Number - " +
metaDataList.size());
log.debug("###################################################");
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Wed Nov 30 09:22:42 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Sat Dec 17 23:46:26 2011
@@ -23,7 +23,6 @@
import org.springframework.beans.factory.annotation.Autowired;
public class FlvInterviewConverter extends BaseConverter {
- private int initCutSeconds = 0;
private int leftSideLoud = 1;
private int rightSideLoud = 1;
private Integer leftSideTime = 0;
@@ -43,13 +42,8 @@
@Autowired
private GenerateThumbs generateThumbs;
- private String FFMPEG_MAP_PARAM = ":";
-
public void startReConversion(Long flvRecordingId, Integer leftSideLoud,
Integer rightSideLoud, Integer leftSideTime, Integer
rightSideTime) {
- if (isUseOldStyleFfmpegMap()) {
- FFMPEG_MAP_PARAM = ".";
- }
log.debug("++++++++++++ leftSideLoud :: " + leftSideLoud);
log.debug("++++++++++++ rightSideLoud :: " + rightSideLoud);
@@ -62,6 +56,8 @@
log.debug("++++++++++++ this.leftSideLoud :: " +
this.leftSideLoud);
log.debug("++++++++++++ this.rightSideLoud :: " +
this.rightSideLoud);
+ log.debug("++++++++++++ this.leftSideTime :: " +
this.leftSideTime);
+ log.debug("++++++++++++ this.rightSideTime :: " +
this.rightSideTime);
startConversion(flvRecordingId, true);
}
@@ -131,7 +127,7 @@
.getFlvRecordingId());
stripAudioFirstPass(flvRecording, returnLog,
listOfFullWaveFiles,
- streamFolderName);
+ streamFolderName, metaDataList);
try {
// Merge Wave to Full Length
String streamFolderGeneralName = getStreamFolderName();
@@ -646,13 +642,13 @@
Process proc = rt.exec(cmd);
InputStream stderr = proc.getErrorStream();
- InputStreamReader isr = new InputStreamReader(stderr);
- BufferedReader br = new BufferedReader(isr);
+ BufferedReader br = new BufferedReader(new
InputStreamReader(stderr));
String line = null;
String error = "";
while ((line = br.readLine()) != null) {
error += line;
}
+ br.close();
returnMap.put("error", error);
int exitVal = proc.waitFor();
returnMap.put("exitValue", "" + exitVal);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverterTask.java
Wed Nov 30 09:22:42 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverterTask.java
Sat Dec 17 23:46:26 2011
@@ -1,5 +1,7 @@
package org.openmeetings.app.data.flvrecord.converter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -7,17 +9,13 @@
import org.slf4j.Logger;
public class FlvInterviewConverterTask {
-
private static final Logger log =
Red5LoggerFactory.getLogger(FlvInterviewConverterTask.class,
ScopeApplicationAdapter.webAppRootKey);
- //Spring loaded
+ @Autowired
+ @Qualifier("openmeetings.TaskExecutor")
private TaskExecutor taskExecutor;
+ @Autowired
private FlvInterviewConverter flvInterviewConverter;
-
- public FlvInterviewConverterTask(TaskExecutor taskExecutor,
FlvInterviewConverter flvInterviewConverter) {
- this.taskExecutor = taskExecutor;
- this.flvInterviewConverter = flvInterviewConverter;
- }
public void startConversionThread(final Long flvRecordingId) {
try {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewReConverterTask.java
Wed Nov 30 09:22:42 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewReConverterTask.java
Sat Dec 17 23:46:26 2011
@@ -3,23 +3,20 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
public class FlvInterviewReConverterTask {
-
private static final Logger log = Red5LoggerFactory.getLogger(
FlvInterviewReConverterTask.class,
ScopeApplicationAdapter.webAppRootKey);
- // Spring loaded
+ @Autowired
+ @Qualifier("openmeetings.TaskExecutor")
private TaskExecutor taskExecutor;
+ @Autowired
private FlvInterviewConverter flvInterviewConverter;
-
- public FlvInterviewReConverterTask(TaskExecutor taskExecutor,
- FlvInterviewConverter flvInterviewConverter) {
- this.taskExecutor = taskExecutor;
- this.flvInterviewConverter = flvInterviewConverter;
- }
public void startConversionThread(final Long flvRecordingId,
final Integer leftSideLoud, final Integer rightSideLoud,
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverterTask.java
Wed Nov 30 09:22:42 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverterTask.java
Sat Dec 17 23:46:26 2011
@@ -1,5 +1,7 @@
package org.openmeetings.app.data.flvrecord.converter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -10,14 +12,11 @@
private static final Logger log =
Red5LoggerFactory.getLogger(FlvRecorderConverterTask.class,
ScopeApplicationAdapter.webAppRootKey);
- //Spring loaded
+ @Autowired
+ @Qualifier("openmeetings.TaskExecutor")
private TaskExecutor taskExecutor;
+ @Autowired
private FlvRecorderConverter flvRecorderConverter;
-
- public FlvRecorderConverterTask(TaskExecutor taskExecutor,
FlvRecorderConverter flvRecorderConverter) {
- this.taskExecutor = taskExecutor;
- this.flvRecorderConverter = flvRecorderConverter;
- }
public void startConversionThread(final Long flvRecordingId) {
try {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamScreenListener.java
Sat Dec 17 23:46:26 2011
@@ -20,8 +20,6 @@
private int startTimeStamp = -1;
- private long byteCount = 0;
-
private Date startedSessionScreenTimeDate = null;
private long initialDelta = 0;
@@ -84,8 +82,6 @@
if (data.limit() == 0) {
return;
}
-
- this.byteCount += data.limit();
if (startTimeStamp == -1) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamTranscodingListener.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamTranscodingListener.java
Sat Dec 17 23:46:26 2011
@@ -16,7 +16,6 @@
import org.red5.io.ITag;
import org.red5.io.ITagWriter;
import org.red5.io.StreamableFileFactory;
-import org.red5.io.flv.impl.FLVWriter;
import org.red5.io.flv.impl.Tag;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IScope;
@@ -360,9 +359,6 @@
log.debug("#################### -start- closeStream
########################");
log.debug("#################### -start- closeStream
########################");
- FLVWriter flvWriter = (FLVWriter) writer;
- //log.debug("duration:
"+flvWriter.getDuration());
- //log.debug(writer.getClass().getName());
writer.close();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/logs/ConferenceLogTypeDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/logs/ConferenceLogTypeDaoImpl.java
Sat Dec 17 23:46:26 2011
@@ -5,7 +5,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.persistence.beans.logs.ConferenceLogType;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -43,7 +43,7 @@
String hql = "select a from ConferenceLogType a " +
"WHERE a.eventType = :eventType ";
- Query query = em.createQuery(hql);
+ TypedQuery<ConferenceLogType> query = em.createQuery(hql,
ConferenceLogType.class);
query.setParameter("eventType",eventType);
//Seems like this does throw an error sometimes cause it does not
return a unique Result
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
