From 15e52ce95a96a90af0e0ebe45d043a4515cb4dc4 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Tue, 15 Sep 2009 00:00:05 +0000
Subject: [PATCH] revert to 2404

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2488 af16638f-c34d-0410-8cfa-b39d5352b314
---
 bbb-video/.classpath                                |  5 ++---
 bbb-video/build.xml                                 |  6 ++----
 bbb-video/ivy.xml                                   |  6 +++---
 .../bigbluebutton/app/video/VideoAppConstants.java  | 10 +++++-----
 .../bigbluebutton/app/video/VideoTranscoder.java    | 13 ++++++++-----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bbb-video/.classpath b/bbb-video/.classpath
index 13110b1844..ff411a79fa 100644
--- a/bbb-video/.classpath
+++ b/bbb-video/.classpath
@@ -13,8 +13,7 @@
 	<classpathentry kind="lib" path="lib/spring-context-2.5.6.jar"/>
 	<classpathentry kind="lib" path="lib/spring-core-2.5.6.jar"/>
 	<classpathentry kind="lib" path="lib/mina-core-2.0.0-M6.jar"/>
-	<classpathentry kind="lib" path="lib/xuggle-xuggler-3.0.660.jar"/>
-	<classpathentry kind="lib" path="lib/xuggle-xuggler-red5-3.0.662.jar"/>
-	<classpathentry kind="lib" path="lib/jetm-1.2.3.jar"/>
+	<!-- classpathentry kind="lib" path="lib/xuggle-xuggler-3.0.660.jar"/>
+	<classpathentry kind="lib" path="lib/xuggle-xuggler-red5-3.0.662.jar"/ -->
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bbb-video/build.xml b/bbb-video/build.xml
index 18837853e3..a9089f8c13 100644
--- a/bbb-video/build.xml
+++ b/bbb-video/build.xml
@@ -251,10 +251,9 @@
 			<!-- copy the xuggler config per webapp and associated jars -->			
 			<copy todir="${dist.webapps.dir}/@{webapp}/WEB-INF/lib/">
 				<fileset dir="${lib.dir}">
-					<include name="xuggle-xuggler-3.0.660.jar"/>
-					<include name="xuggle-xuggler-red5-3.0.662.jar"/>
+					<!-- include name="xuggle-xuggler-3.0.660.jar"/>
+					<include name="xuggle-xuggler-red5-3.0.662.jar"/ -->
 					<include name="mina-core-2.0.0-M6.jar"/>
-					<include name="jetm-1.2.3.jar"/>
 				</fileset>
 			</copy>		
       	</sequential>
@@ -264,7 +263,6 @@
 		<copy-app name="video">
 			<copy-assets>
 				<logback webapp="video"/>
-				<xuggler webapp="video"/>
 			</copy-assets>
 		</copy-app>
 	</target>
diff --git a/bbb-video/ivy.xml b/bbb-video/ivy.xml
index b5b19c04d1..4f98725b7c 100644
--- a/bbb-video/ivy.xml
+++ b/bbb-video/ivy.xml
@@ -21,10 +21,10 @@
         <dependency org="spring" name="spring-core" rev="2.5.6" />
         
         <!--Xuggler -->
-        <dependency org="com/xuggle" name="xuggle-xuggler" rev="3.0.660" />
-        <dependency org="com/xuggle" name="xuggle-xuggler-red5" rev="3.0.662" />
+        <!-- dependency org="com/xuggle" name="xuggle-xuggler" rev="3.0.660" />
+        <dependency org="com/xuggle" name="xuggle-xuggler-red5" rev="3.0.662" /-->
         <dependency org="org.apache.mina" name="mina-core" rev="2.0.0-M6" />
         
         <dependency org="javax.servlet" name="servlet-api" rev="2.5" />     
     </dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>
diff --git a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoAppConstants.java b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoAppConstants.java
index dbf563bf66..422d45bdcc 100644
--- a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoAppConstants.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoAppConstants.java
@@ -5,12 +5,12 @@ public class VideoAppConstants {
 	public static final int BIT_RATE_TOLERANCE = 50000;
 	public static final int NUM_PICTURES_IN_GROUP = 1;
 	
-	public static final int TILE_WIDTH = 128;
-	public static final int TILE_HEIGHT = 96;
-	
-	public static final int JOINED_WIDTH = TILE_WIDTH*3;
-	public static final int JOINED_HEIGHT = TILE_HEIGHT*3;
+	public static final int JOINED_WIDTH = 160*3;
+	public static final int JOINED_HEIGHT = 120*3;
 	public static final int JOINED_FRAME_RATE = 10;
 	
+	public static final int TILE_WIDTH = 160;
+	public static final int TILE_HEIGHT = 160;
+	
 	public static final String TILE_PREFIX = "small";
 }
diff --git a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoTranscoder.java b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoTranscoder.java
index 9c134788db..cbe37800ea 100644
--- a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoTranscoder.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoTranscoder.java
@@ -17,7 +17,6 @@ import com.xuggle.red5.Transcoder;
 import com.xuggle.red5.VideoPictureListener;
 import com.xuggle.red5.io.BroadcastStream;
 import com.xuggle.xuggler.ICodec;
-import com.xuggle.xuggler.IPixelFormat;
 import com.xuggle.xuggler.ISimpleMediaFile;
 import com.xuggle.xuggler.IVideoPicture;
 import com.xuggle.xuggler.IVideoResampler;
@@ -38,7 +37,7 @@ public class VideoTranscoder {
 					VideoAppConstants.TILE_WIDTH, VideoAppConstants.TILE_HEIGHT);
 
 			IVideoResampler resampler = IVideoResampler.make(VideoAppConstants.TILE_WIDTH, 
-					VideoAppConstants.TILE_HEIGHT, IPixelFormat.Type.YUV420P, 
+					VideoAppConstants.TILE_HEIGHT, picture.getPixelType(), 
 					picture.getWidth(), picture.getHeight(), picture.getPixelType());
 
 			resampler.resample(outPicture, picture);
@@ -102,12 +101,16 @@ public class VideoTranscoder {
 		 * Now let's give aaffmpeg-red5 some information about what we want to transcode as.
 		 */
 		ISimpleMediaFile outputStreamInfo = new SimpleMediaFile();
-		outputStreamInfo.setHasAudio(false);
+		outputStreamInfo.setHasAudio(true);
+		outputStreamInfo.setAudioBitRate(32000);
+		outputStreamInfo.setAudioChannels(1);
+		outputStreamInfo.setAudioSampleRate(22050);
+		outputStreamInfo.setAudioCodec(ICodec.ID.CODEC_ID_MP3);
 		outputStreamInfo.setHasVideo(true);
 		// Unfortunately the Trans-coder needs to know the width and height
 		// you want to output as; even if you don't know yet.
-		outputStreamInfo.setVideoWidth(VideoAppConstants.TILE_WIDTH);
-		outputStreamInfo.setVideoHeight(VideoAppConstants.TILE_HEIGHT);
+		outputStreamInfo.setVideoWidth(320);
+		outputStreamInfo.setVideoHeight(240);
 		outputStreamInfo.setVideoBitRate(320000);
 		outputStreamInfo.setVideoCodec(ICodec.ID.CODEC_ID_FLV1);
 		outputStreamInfo.setVideoGlobalQuality(0);