inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:

Browse Source 
33789: ALF-12714 Avoid warning for null date properties when converting metadata extracted properties to Content Model ones (other types produce no warning, was only a date issue)
   33796: ALF-12714 FFMpeg can do video thumbnails for 3GPP files, can turn them into MP4 Video. Also, enable Audio MP4 -> MP3 transformation.
   33798: ALF-12714 Mark M4A/M4B (MP4 Audio) as audio based


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2012-02-09 12:19:56 +00:00
parent c3b86192d6
commit c1da83b23d
3 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
config/alfresco/extension/video-thumbnail-context.xml.sample
View File

@@ -91,6 +91,22 @@
<value>image/jpeg</value> <value>image/jpeg</value>
</property> </property>
</bean> </bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype">
<value>video/3gpp</value>
</property>
<property name="targetMimetype">
<value>image/jpeg</value>
</property>
</bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype">
<value>video/3gpp2</value>
</property>
<property name="targetMimetype">
<value>image/jpeg</value>
</property>
</bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails"> <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype"> <property name="sourceMimetype">
<value>video/mpeg2</value> <value>video/mpeg2</value>

46
config/alfresco/extension/video-transformation-context.xml.sample
View File

@@ -86,6 +86,22 @@
<value>video/x-flv</value> <value>video/x-flv</value>
</property> </property>
</bean> </bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype">
<value>video/3gpp</value>
</property>
<property name="targetMimetype">
<value>video/x-flv</value>
</property>
</bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype">
<value>video/3gpp2</value>
</property>
<property name="targetMimetype">
<value>video/x-flv</value>
</property>
</bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails"> <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype"> <property name="sourceMimetype">
<value>video/mpeg2</value> <value>video/mpeg2</value>
@@ -259,6 +275,22 @@
<value>video/mp4</value> <value>video/mp4</value>
</property> </property>
</bean> </bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype">
<value>video/3gpp</value>
</property>
<property name="targetMimetype">
<value>video/mp4</value>
</property>
</bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype">
<value>video/3gpp2</value>
</property>
<property name="targetMimetype">
<value>video/mp4</value>
</property>
</bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails"> <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype"> <property name="sourceMimetype">
<value>video/x-ms-asf</value> <value>video/x-ms-asf</value>
@@ -389,6 +421,14 @@
<value>audio/mpeg</value> <value>audio/mpeg</value>
</property> </property>
</bean> </bean>
<bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails">
<property name="sourceMimetype">
<value>audio/mp4</value>
</property>
<property name="targetMimetype">
<value>audio/mpeg</value>
</property>
</bean>
</list> </list>
</property> </property>
<property name="mimetypeService"> <property name="mimetypeService">
@@ -407,4 +447,10 @@
<ref bean="transformer.worker.ffmpeg.mp4"/> <ref bean="transformer.worker.ffmpeg.mp4"/>
</property> </property>
</bean> </bean>
<bean id="transformer.ffmpeg.mp3" class="org.alfresco.repo.content.transform.ProxyContentTransformer" parent="baseContentTransformer">
<property name="worker">
<ref bean="transformer.worker.ffmpeg.mp3"/>
</property>
</bean>
</beans> </beans>

4
source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
View File

@@ -823,6 +823,10 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
{ {
convertedPropertyValue = makeDate((String) propertyValue); convertedPropertyValue = makeDate((String) propertyValue);
} }
else if (propertyValue == null)
{
convertedPropertyValue = null;
}
else else
{ {
if (logger.isWarnEnabled()) if (logger.isWarnEnabled())