From c1da83b23d381fc550eba2e16ffadf5e9f06da6f Mon Sep 17 00:00:00 2001
From: Nick Burch <nick.burch@quanticate.com>
Date: Thu, 9 Feb 2012 12:19:56 +0000
Subject: [PATCH] Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:    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
---
 .../video-thumbnail-context.xml.sample        | 16 +++++++
 .../video-transformation-context.xml.sample   | 46 +++++++++++++++++++
 .../AbstractMappingMetadataExtracter.java     |  4 ++
 3 files changed, 66 insertions(+)

diff --git a/config/alfresco/extension/video-thumbnail-context.xml.sample b/config/alfresco/extension/video-thumbnail-context.xml.sample
index ef03f3f3a4..b403668ded 100644
--- a/config/alfresco/extension/video-thumbnail-context.xml.sample
+++ b/config/alfresco/extension/video-thumbnail-context.xml.sample
@@ -91,6 +91,22 @@
             <value>image/jpeg</value>
           </property>
         </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">
           <property name="sourceMimetype">
             <value>video/mpeg2</value>
diff --git a/config/alfresco/extension/video-transformation-context.xml.sample b/config/alfresco/extension/video-transformation-context.xml.sample
index 72a080adb8..22c4efd767 100644
--- a/config/alfresco/extension/video-transformation-context.xml.sample
+++ b/config/alfresco/extension/video-transformation-context.xml.sample
@@ -86,6 +86,22 @@
             <value>video/x-flv</value>
           </property>
         </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">
           <property name="sourceMimetype">
             <value>video/mpeg2</value>
@@ -259,6 +275,22 @@
             <value>video/mp4</value>
           </property>
         </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">
           <property name="sourceMimetype">
             <value>video/x-ms-asf</value>
@@ -389,6 +421,14 @@
             <value>audio/mpeg</value>
           </property>
         </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>
     </property>
     <property name="mimetypeService">
@@ -407,4 +447,10 @@
       <ref bean="transformer.worker.ffmpeg.mp4"/>
     </property>
   </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>
diff --git a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
index 84aac3d5f3..f9e4d0ed49 100644
--- a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
@@ -823,6 +823,10 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
                     {
                         convertedPropertyValue = makeDate((String) propertyValue);
                     }
+                    else if (propertyValue == null)
+                    {
+                        convertedPropertyValue = null;
+                    }
                     else
                     {
                         if (logger.isWarnEnabled())