Author: michiel
Date: 2009-11-23 22:48:26 +0100 (Mon, 23 Nov 2009)
New Revision: 39878

Modified:
   openimages/trunk/src/main/webapp/WEB-INF/config/streams/mock_createcaches.xml
Log:
simplified mock config a bit

Modified: 
openimages/trunk/src/main/webapp/WEB-INF/config/streams/mock_createcaches.xml
===================================================================
--- 
openimages/trunk/src/main/webapp/WEB-INF/config/streams/mock_createcaches.xml   
    2009-11-23 21:48:17 UTC (rev 39877)
+++ 
openimages/trunk/src/main/webapp/WEB-INF/config/streams/mock_createcaches.xml   
    2009-11-23 21:48:26 UTC (rev 39878)
@@ -3,19 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xsi:schemaLocation="http://www.mmbase.org/xmlns/createcaches 
http://www.mmbase.org/xmlns/createcaches.xsd";
     >
+  <localhost max_simultaneous_transcoders="1" stage="recognizer"  />
+  <localhost max_simultaneous_transcoders="1" stage="transcoder" />
 
-  <!--
-     Example configuration
-    -->
-  <!--
-  <server max_simultaneous_transcoders="2" host="localhost" port="1679" />
-  -->
-  <localhost max_simultaneous_transcoders="1" />
-  <!--
-  <server max_simultaneous_transcoders="2" host="openbeelden2.tuxic.nl" 
port="1679" />
-  -->
 
-  <recognizer id="recognizer" label="source hi">
+  <recognizer label="source hi"
+              id="recognizer">
     <class name="org.mmbase.streams.transcoders.FFMpegRecognizer">
     </class>
     <loganalyzer name="org.mmbase.streams.transcoders.FFMpegAnalyzer">
@@ -28,13 +21,8 @@
               mimetype="video/*" id="v1" in="recognizer">
     <class name="org.mmbase.streams.transcoders.MockTranscoder">
       <param name="format">mpeg</param>
-      <param name="vcodec">mpeg2video</param>
-      <param name="bitrate">1024k</param>
-      <param name="r">25</param>
-      <param name="acodec">libmp3lame</param>
-      <param name="abitrate">128k</param>
-      <param name="audioChannels">2</param>
-      <param name="async">1</param>
+      <param name="setting">intermediate</param>
+      <param name="delay">10</param>
     </class>
   </transcoder>
 
@@ -43,68 +31,44 @@
       label="lo"
       mimetype="video/*" in="v1" id="v2">
     <class name="org.mmbase.streams.transcoders.MockTranscoder">
-      <param name="videoQuality">5</param>
-      <param name="width">320</param>
-      <param name="height">240</param>
+      <param name="setting">lo</param>
+      <param name="format">ogv</param>
+      <param name="delay">10</param>
     </class>
-    <loganalyzer name="org.mmbase.streams.transcoders.MockAnalyzer">
-      <param name="x">320</param>
-      <param name="y">240</param>
-    </loganalyzer>
   </transcoder>
 
   <transcoder
       label="hi"
       mimetype="video/*" in="v1" id="v3">
     <class name="org.mmbase.streams.transcoders.MockTranscoder">
-      <param name="videoQuality">8</param>
+      <param name="setting">lo</param>
+      <param name="format">ogv</param>
+      <param name="delay">10</param>
     </class>
-    <loganalyzer name="org.mmbase.streams.transcoders.MockAnalyzer">
-      <param name="x">320</param>
-      <param name="y">240</param>
-    </loganalyzer>
   </transcoder>
 
-  <!-- ffmpeg -i video.mpg -f mp4 -vcodec libx264 -r 25 -b 1024k -acodec 
libfaac -ab 128k -ac 2 -async 1 video.mp4 -->
   <transcoder
       label="lo"
       mimetype="video/*" in="v1" id="v4">
     <class name="org.mmbase.streams.transcoders.MockTranscoder">
       <param name="format">mp4</param>
-      <param name="vcodec">libx264</param>
-      <param name="framesPerSecond">25</param>
-      <param name="bitrate">1024k</param>
-      <param name="acodec">libfaac</param>
-      <param name="abitrate">128k</param>
-      <param name="audioChannels">2</param>
-      <param name="async">1</param>
+      <param name="setting">mp4</param>
+      <param name="delay">10</param>
     </class>
-    <loganalyzer name="org.mmbase.streams.transcoders.MockAnalyzer">
-      <param name="x">320</param>
-      <param name="y">240</param>
-    </loganalyzer>
   </transcoder>
 
-  <!-- ffmpeg -i audio.wav -acodec libvorbis -aq 32 -ab 192k audio.ogg -->
   <transcoder mimetype="audio/*" id="a1" in="recognizer">
-    <class name="org.mmbase.streams.transcoders.MockTranscoder">
+    <class name="org.mmbase.streams.transcoders.FFMpegTranscoder">
       <param name="format">ogg</param>
-      <param name="acodec">libvorbis</param>
-      <param name="aq">32</param> <!-- 0-255 (0 = highest quality, 255 = 
lowest) -->
-      <param name="ab">192k</param>
+      <param name="delay">10</param>
     </class>
-    <loganalyzer name="org.mmbase.streams.transcoders.MockAnalyzer" />
   </transcoder>
 
-  <!-- ffmpeg -i audio.wav -acodec libmp3lame -aq 32 -ab 192k audio.mp3 -->
   <transcoder mimetype="audio/*" id="a2" in="recognizer">
     <class name="org.mmbase.streams.transcoders.MockTranscoder">
       <param name="format">mp3</param>
-      <param name="acodec">libmp3lame</param>
-      <param name="aq">32</param>
-      <param name="ab">192k</param>
+      <param name="delay">10</param>
     </class>
-    <loganalyzer name="org.mmbase.streams.transcoders.MockAnalyzer" />
   </transcoder>
 
 </createcaches>

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to