summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHarm van der Heijden <hrm@users.sourceforge.net>2001-12-01 19:36:30 +0000
committerHarm van der Heijden <hrm@users.sourceforge.net>2001-12-01 19:36:30 +0000
commit3f21970a5e492485c175fd4da841684045d55549 (patch)
tree329f623a15c50f012920a343c8176618be05da09 /src
parent9872ea4c7e58bb6aadeba619a8d6872e7f7b78b8 (diff)
downloadxine-lib-3f21970a5e492485c175fd4da841684045d55549.tar.gz
xine-lib-3f21970a5e492485c175fd4da841684045d55549.tar.bz2
removed some testing stuff
CVS patchset: 1151 CVS date: 2001/12/01 19:36:30
Diffstat (limited to 'src')
-rw-r--r--src/dxr3/dxr3_vo_encoder.c13
-rw-r--r--src/dxr3/dxr3_vo_encoder.h6
2 files changed, 9 insertions, 10 deletions
diff --git a/src/dxr3/dxr3_vo_encoder.c b/src/dxr3/dxr3_vo_encoder.c
index 62ab46e07..242941268 100644
--- a/src/dxr3/dxr3_vo_encoder.c
+++ b/src/dxr3/dxr3_vo_encoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_vo_encoder.c,v 1.8 2001/12/01 19:32:44 hrm Exp $
+ * $Id: dxr3_vo_encoder.c,v 1.9 2001/12/01 19:36:30 hrm Exp $
*
* mpeg1 encoding video out plugin for the dxr3.
*
@@ -111,6 +111,11 @@
* At the moment libffmpeg's encoder output is pretty crappy, with weird
* ghost effects left and right of objects. At the moment using a fixed
* quantizer value. Somewhat more cpu intensive than libfame.
+ *
+ ***** Update 1/12/2001 by Harm
+ * some support for mp1e encoder. Needs the raw-input patch for mp1e to
+ * be functional. I'm sending that patch to the mp1e guys at zapping.sf.net,
+ * it might be in the next version...
*/
/* encoder specific config/setup stuff *
@@ -512,12 +517,6 @@ static void dxr3_frame_copy(vo_frame_t *frame_gen, uint8_t **src)
#endif
#if USE_MP1E
size = frame->width*this->oheight;
- {
- static x = 0;
- if (!x)
- printf("dxr3enc: writing %d x %d = %d bytes\n", frame->width, this->oheight, size);
- x = 1;
- }
fwrite(y, size, 1, mp1e);
fwrite(u, size/4, 1, mp1e);
fwrite(v, size/4, 1, mp1e);
diff --git a/src/dxr3/dxr3_vo_encoder.h b/src/dxr3/dxr3_vo_encoder.h
index d440a9920..7e8e0173b 100644
--- a/src/dxr3/dxr3_vo_encoder.h
+++ b/src/dxr3/dxr3_vo_encoder.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_vo_encoder.h,v 1.4 2001/12/01 19:32:44 hrm Exp $
+ * $Id: dxr3_vo_encoder.h,v 1.5 2001/12/01 19:36:30 hrm Exp $
*
*/
@@ -36,11 +36,11 @@
#define USE_MAGIC_REGISTER 1
/* select one mpeg encoder out of the three below */
-#define USE_LIBFAME 1
+#define USE_LIBFAME 0
#define USE_FFMPEG 0
-#define USE_MP1E 0
+#define USE_MP1E 1
/*************************************************************************
* Dxr3 Encoding private stuff below - You shouldn't need to change this *