4 files changed, 352 insertions, 73 deletions

diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 8cef3753c..ff4f69cbc 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -39,8 +39,10 @@ endif
 
 xineplug_vo_out_dxr3_la_SOURCES = \
 	dxr3_mpeg_encoders.c \
+	ffmpeg_encoder.c \
 	dxr3_spu_encoder.c \
 	dxr3_scr.c \
 	video_out_dxr3.c 
 
-xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
+xineplug_vo_out_dxr3_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS) $(FFMPEG_CFLAGS)
+xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(AVUTIL_LIBS) $(FFMPEG_LDFLAGS) -lm
diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c
index 19ff8b81d..2ccc05e49 100644
--- a/src/dxr3/dxr3_mpeg_encoders.c
+++ b/src/dxr3/dxr3_mpeg_encoders.c
@@ -44,6 +44,9 @@
 #include <math.h>
 #include <unistd.h>
 
+/* libavutil from FFmpeg */
+#include <mem.h>
+
 #define LOG_MODULE "dxr3_mpeg_encoder"
 /* #define LOG_VERBOSE */
 /* #define LOG */
@@ -99,7 +102,7 @@ typedef struct {
   char              *buffer;  /* temporary buffer for mpeg data */
                               /* temporary buffer for YUY2->YV12 conversion */
   uint8_t           *out[3];  /* aligned buffer for YV12 data */
-  uint8_t           *buf;     /* unaligned YV12 buffer */
+  uint8_t           *buf;     /* base address of YV12 buffer */
 } fame_data_t;
 
 /* helper function */
@@ -107,13 +110,6 @@ static int fame_prepare_frame(fame_data_t *this, dxr3_driver_t *drv,
                               dxr3_frame_t *frame);
 #endif
 
-/* initialization function */
-int        dxr3_lavc_init(dxr3_driver_t *drv, plugin_node_t *node);
-
-/* close function from encoder api */
-static int lavc_on_close(dxr3_driver_t *drv);
-
-
 #ifdef HAVE_LIBRTE
 int dxr3_rte_init(dxr3_driver_t *drv)
 {
@@ -337,8 +333,7 @@ static int fame_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
   fame_parameters_t init_fp = FAME_PARAMETERS_INITIALIZER;
   double fps;
 
-  if (this->buf) free(this->buf);  
-  this->buf = 0;
+  av_freep(&this->buf);  
   this->out[0] = this->out[1] = this->out[2] = 0;
   
   /* if YUY2 and dimensions changed, we need to re-allocate the
@@ -346,8 +341,7 @@ static int fame_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
   if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
     int image_size = frame->vo_frame.width * frame->oheight;
 
-    this->out[0] = xine_xmalloc_aligned(16, image_size * 3/2, 
-      (void *)&this->buf);
+    this->out[0] = this->buf = av_mallocz(image_size * 3/2);
     this->out[1] = this->out[0] + image_size; 
     this->out[2] = this->out[1] + image_size/4; 
 
@@ -537,33 +531,3 @@ static int fame_prepare_frame(fame_data_t *this, dxr3_driver_t *drv, dxr3_frame_
   return 1;
 }
 #endif
-
-
-int dxr3_lavc_init(dxr3_driver_t *drv, plugin_node_t *node)
-{
-  void *ffmpeg;
-  int (*init)(dxr3_driver_t *);
-  int result;
-  
-  ffmpeg = dlopen(node->file->filename, RTLD_LAZY);
-  if (!ffmpeg) return 0;
-  
-  init = dlsym(ffmpeg, "dxr3_encoder_init");
-  if (!init) return 0;
-  
-  result = init(drv);
-  /* the close function is implemented here, because it will call dlclose()
-   * and that should not be done be the library we are closing... */
-  drv->enc->on_close = lavc_on_close;
-  drv->enc->handle   = ffmpeg;
-  return result;
-}
-
-static int lavc_on_close(dxr3_driver_t *drv)
-{
-  drv->enc->on_unneeded(drv);
-  dlclose(drv->enc->handle);
-  free(drv->enc);
-  drv->enc = NULL;
-  return 1;
-}
diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c
new file mode 100644
index 000000000..d9ee921cc
--- /dev/null
+++ b/src/dxr3/ffmpeg_encoder.c
@@ -0,0 +1,333 @@
+/* 
+ * Copyright (C) 2000-2004 the xine project
+ * 
+ * This file is part of xine, a unix video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ */
+ 
+/* mpeg encoders for the dxr3 video out plugin. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <math.h>
+
+#define LOG_MODULE "dxr3_mpeg_encoder"
+/* #define LOG_VERBOSE */
+/* #define LOG */
+
+#include "video_out_dxr3.h"
+
+#include <avcodec.h>
+
+/* buffer size for encoded mpeg1 stream; will hold one intra frame 
+ * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */
+#define DEFAULT_BUFFER_SIZE 512*1024
+
+
+/* functions required by encoder api */
+static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame);
+static int lavc_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame);
+static int lavc_on_unneeded(dxr3_driver_t *drv);
+
+/*encoder structure*/
+typedef struct lavc_data_s {
+  encoder_data_t     encoder_data;
+  AVCodecContext     *context;         /* handle for encoding */
+  int                width, height;    /* width and height of the video frame */
+  uint8_t            *ffmpeg_buffer;   /* lavc buffer */
+  AVFrame            *picture;         /* picture to be encoded */
+  uint8_t            *out[3];          /* aligned buffer for YV12 data */
+  uint8_t            *buf;     /* base address of YV12 buffer */
+} lavc_data_t;
+
+
+int dxr3_lavc_init(dxr3_driver_t *drv)
+{
+  lavc_data_t* this;
+  avcodec_init();
+
+  avcodec_register_all();  
+  lprintf("lavc init , version %x\n", avcodec_version());
+  this = xine_xmalloc(sizeof(lavc_data_t));
+  if (!this) return 0;
+
+  this->encoder_data.type             = ENC_LAVC;
+  this->encoder_data.on_update_format = lavc_on_update_format;
+  this->encoder_data.on_frame_copy    = NULL;
+  this->encoder_data.on_display_frame = lavc_on_display_frame;
+  this->encoder_data.on_unneeded      = lavc_on_unneeded;
+  this->context                       = 0;
+  
+  drv->enc = &this->encoder_data;
+  drv->enc->on_close = dxr3_lavc_close;
+  return 1;
+}
+
+static int dxr3_lavc_close(dxr3_driver_t *drv) {
+  drv->enc->on_unneeded(drv);
+  free(drv->enc);
+  drv->enc = NULL;
+
+  return 1;
+}
+
+/* helper function */
+static int lavc_prepare_frame(lavc_data_t *this, dxr3_driver_t *drv, dxr3_frame_t *frame);
+
+static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
+{
+  lavc_data_t *this = (lavc_data_t *)drv->enc;
+  AVCodec *codec;
+  unsigned char use_quantizer;
+  
+  if (this->context) {
+    avcodec_close(this->context);
+    free(this->context);
+    free(this->picture);
+    this->context = NULL;
+    this->picture = NULL;
+  }
+  
+  /* if YUY2 and dimensions changed, we need to re-allocate the
+   * internal YV12 buffer */
+  if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
+    int image_size = frame->vo_frame.pitches[0] * frame->oheight;
+
+    this->out[0] = this->buf = av_mallocz(image_size * 3/2);
+    this->out[1] = this->out[0] + image_size; 
+    this->out[2] = this->out[1] + image_size/4; 
+
+    /* fill with black (yuv 16,128,128) */
+    memset(this->out[0], 16, image_size);
+    memset(this->out[1], 128, image_size/4);
+    memset(this->out[2], 128, image_size/4);
+    lprintf("Using YUY2->YV12 conversion\n");  
+  }
+  
+  /* resolution must be a multiple of two */
+  if ((frame->vo_frame.pitches[0] % 2 != 0) || (frame->oheight % 2 != 0)) {
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG, 
+      "dxr3_mpeg_encoder: lavc only handles video dimensions which are multiples of 2\n");
+    return 0;
+  }
+
+  /* get mpeg codec handle */
+  codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO);
+  if (!codec) {
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
+      "dxr3_mpeg_encoder: lavc MPEG1 codec not found\n");
+    return 0;
+  }
+  lprintf("lavc MPEG1 encoder found.\n");
+
+  this->width  = frame->vo_frame.pitches[0];
+  this->height = frame->oheight;
+
+  this->context = avcodec_alloc_context();
+  if (!this->context) {
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
+      "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
+    return 0;
+  } 
+  this->picture = avcodec_alloc_frame();
+  if (!this->picture) {
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
+      "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
+    return 0;
+  }
+
+  /* mpeg1 encoder only support YUV420P */
+  this->context->pix_fmt = PIX_FMT_YUVJ420P;
+  
+  /* put sample parameters */
+  this->context->bit_rate = drv->class->xine->config->register_range(drv->class->xine->config,
+    "dxr3.encoding.lavc_bitrate", 10000, 1000, 20000,
+    _("libavcodec mpeg output bitrate (kbit/s)"),
+    _("The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+      "Higher values will increase quality and CPU usage.\n"
+      "This setting is only considered, when constant quality mode is disabled."), 10, NULL, NULL);
+    this->context->bit_rate *= 1000; /* config in kbit/s, libavcodec wants bit/s */
+    
+  use_quantizer = drv->class->xine->config->register_bool(drv->class->xine->config,
+    "dxr3.encoding.lavc_quantizer", 1,
+    _("constant quality mode"),
+    _("When enabled, libavcodec will use a constant quality mode by dynamically "
+      "compressing the images based on their complexity. When disabled, libavcodec "
+      "will use constant bitrate mode."), 10, NULL, NULL);
+
+  if (use_quantizer) {        
+    this->context->qmin = drv->class->xine->config->register_range(drv->class->xine->config,
+    "dxr3.encoding.lavc_qmin", 1, 1, 10,
+    _("minimum compression"),
+    _("The minimum compression to apply to an image in constant quality mode."),
+    10, NULL, NULL);
+     
+    this->context->qmax = drv->class->xine->config->register_range(drv->class->xine->config,
+    "dxr3.encoding.lavc_qmax", 2, 1, 20,
+    _("maximum quantizer"),
+    _("The maximum compression to apply to an image in constant quality mode."),
+    10, NULL, NULL);  
+  }
+
+  lprintf("lavc -> bitrate %d  \n", this->context->bit_rate);
+
+  this->context->width  = frame->vo_frame.pitches[0];
+  this->context->height = frame->oheight;
+
+  this->context->gop_size = 0; /*intra frames only */
+  this->context->me_method = ME_ZERO; /*motion estimation type*/
+  
+  this->context->time_base.den = 90000;
+  if (frame->vo_frame.duration > 90000 / 24)
+    this->context->time_base.num = 90000 / 24;
+  else if (frame->vo_frame.duration < 90000 / 60)
+    this->context->time_base.num = 90000 / 60;
+  else
+    this->context->time_base.num = frame->vo_frame.duration;
+  /* ffmpeg can complain about illegal framerates, but since this seems no
+   * problem for the DXR3, we just tell ffmpeg to be more lax with */
+  this->context->strict_std_compliance = -1;
+  
+  /* open avcodec */
+  if (avcodec_open(this->context, codec) < 0) {
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG, "dxr3_mpeg_encoder: could not open codec\n");
+    return 0;
+  }
+  lprintf("dxr3_mpeg_encoder: lavc MPEG1 codec opened.\n");
+  
+  if (!this->ffmpeg_buffer)
+    this->ffmpeg_buffer = (unsigned char *)malloc(DEFAULT_BUFFER_SIZE); /* why allocate more than needed ?! */
+  if (!this->ffmpeg_buffer) {
+    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
+      "dxr3_mpeg_encoder: Couldn't allocate temp buffer for mpeg data\n");
+    return 0;
+  }
+
+  return 1;
+}
+
+static int lavc_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame)
+{
+  int size;
+  lavc_data_t* this = (lavc_data_t *)drv->enc;
+  ssize_t written;
+	
+  if (frame->vo_frame.bad_frame) return 1;
+    /* ignore old frames */
+  if ((frame->vo_frame.pitches[0] != this->context->width) || (frame->oheight != this->context->height)) {
+	frame->vo_frame.free(&frame->vo_frame);
+    lprintf("LAVC ignoring frame !!!\n");
+    return 1;
+  }
+
+  /* prepare frame for conversion, handles YUY2 -> YV12 conversion when necessary */
+  lavc_prepare_frame(this, drv, frame);
+
+  /* do the encoding */
+  size = avcodec_encode_video(this->context, this->ffmpeg_buffer, DEFAULT_BUFFER_SIZE, this->picture);
+
+  frame->vo_frame.free(&frame->vo_frame);
+
+  if (size < 0) {
+      xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
+        "dxr3_mpeg_encoder: encoding failed\n");
+      return 0;
+  }
+
+  written = write(drv->fd_video, this->ffmpeg_buffer, size);
+  if (written < 0) {
+      xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
+        "dxr3_mpeg_encoder: video device write failed (%s)\n", strerror(errno));
+      return 0;
+    }
+  if (written != size)
+      xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
+        "dxr3_mpeg_encoder: Could only write %zd of %d mpeg bytes.\n", written, size);
+  return 1;
+}
+
+static int lavc_on_unneeded(dxr3_driver_t *drv)
+{
+  lavc_data_t *this = (lavc_data_t *)drv->enc;
+  lprintf("flushing buffers\n");
+  if (this->context) {
+    avcodec_close(this->context);
+    free(this->context);
+    free(this->picture);
+    this->context = NULL;
+    this->picture = NULL;
+  }
+  return 1;
+}
+
+static int lavc_prepare_frame(lavc_data_t *this, dxr3_driver_t *drv, dxr3_frame_t *frame)
+{
+  int i, j, w2;
+  uint8_t *yuy2;
+	
+  if (frame->vo_frame.bad_frame) return 1;
+
+  if (frame->vo_frame.format == XINE_IMGFMT_YUY2) {
+    /* need YUY2->YV12 conversion */
+    if (!(this->out[0] && this->out[1] && this->out[2]) ) {
+      lprintf("Internal YV12 buffer not created.\n");
+      return 0;
+    }
+    this->picture->data[0] = this->out[0] +  frame->vo_frame.pitches[0]      *  drv->top_bar;		/* y */
+    this->picture->data[1] = this->out[1] + (frame->vo_frame.pitches[0] / 2) * (drv->top_bar / 2);	/* u */
+    this->picture->data[2] = this->out[2] + (frame->vo_frame.pitches[0] / 2) * (drv->top_bar / 2);	/* v */
+    yuy2 = frame->vo_frame.base[0];
+    w2 = frame->vo_frame.pitches[0] / 2;
+    for (i = 0; i < frame->vo_frame.height; i += 2) {
+      for (j = 0; j < w2; j++) {
+        /* packed YUV 422 is: Y[i] U[i] Y[i+1] V[i] */
+        *(this->picture->data[0]++) = *(yuy2++);
+        *(this->picture->data[1]++) = *(yuy2++);
+        *(this->picture->data[0]++) = *(yuy2++);
+        *(this->picture->data[2]++) = *(yuy2++);
+      }
+      /* down sampling */
+      for (j = 0; j < w2; j++) {
+        /* skip every second line for U and V */
+        *(this->picture->data[0]++) = *(yuy2++);
+        yuy2++;
+        *(this->picture->data[0]++) = *(yuy2++);
+        yuy2++;
+      }
+    }
+    /* reset for encoder */
+    this->picture->data[0] = this->out[0];
+    this->picture->data[1] = this->out[1];
+    this->picture->data[2] = this->out[2];
+  }
+  else { /* YV12 **/  
+	this->picture->data[0] = frame->real_base[0];
+    this->picture->data[1] = frame->real_base[1];
+    this->picture->data[2] = frame->real_base[2];
+  }
+  this->picture->linesize[0] = this->context->width;
+  this->picture->linesize[1] = this->context->width / 2;
+  this->picture->linesize[2] = this->context->width / 2;
+  return 1;
+}
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 69b2d3eed..20cee345b 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -286,21 +286,8 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
 #if LOG_VID
   printf("video_out_dxr3: Supported mpeg encoders: ");
 #endif
-  /* check, if ffmpeg plugin is available by looking through plugin
-   * catalog; catalog mutex is already locked here, since this is open_plugin() */
-  node = NULL;
-  plugin_list = class->xine->plugin_catalog->plugin_lists[PLUGIN_VIDEO_DECODER - 1];
-  list_size = xine_sarray_size(plugin_list);
-  for (list_id = 0; list_id < list_size; list_id++) {
-    node = xine_sarray_get (plugin_list, list_id);
-    if (strcasecmp(node->info->id, "ffmpegvideo") == 0) {
-      available_encoders[encoder++] = "libavcodec";
-#if LOG_VID
-      printf("libavcodec, ");
-#endif
-      break;
-    }
-  }
+  available_encoders[encoder++] = "libavcodec";
+  printf("libavcodec, ");
 #ifdef HAVE_LIBFAME
   available_encoders[encoder++] = "fame";
 #if LOG_VID
@@ -576,7 +563,7 @@ static void dxr3_frame_dispose(vo_frame_t *frame_gen)
 {
   dxr3_frame_t *frame = (dxr3_frame_t *)frame_gen;
   
-  if (frame->mem) free(frame->mem);
+  av_free(frame->mem);
   pthread_mutex_destroy(&frame_gen->mutex);
   free(frame);
 }
@@ -616,12 +603,9 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge
       frame->aspect         = XINE_VO_ASPECT_ANAMORPHIC;
     frame->pan_scan         = flags & VO_PAN_SCAN_FLAG;
     
-    if (frame->mem) {
-      free(frame->mem);
-      frame->mem = NULL;
-      frame->real_base[0] = frame->real_base[1] = frame->real_base[2] = NULL;
-      frame_gen->base[0] = frame_gen->base[1] = frame_gen->base[2] = NULL;
-    }
+    av_freep(&frame->mem);
+    frame->real_base[0] = frame->real_base[1] = frame->real_base[2] = NULL;
+    frame_gen->base[0] = frame_gen->base[1] = frame_gen->base[2] = NULL;
     
     return;
   }
@@ -706,10 +690,7 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge
   /* if dimensions changed, we need to re-allocate frame memory */
   if ((frame->vo_frame.width != width) || (frame->vo_frame.height != height) || 
       (frame->oheight != oheight) || (frame->vo_frame.format != format)) {
-    if (frame->mem) {
-      free (frame->mem);
-      frame->mem = NULL;
-    }
+    av_freep(&frame->mem);
     
     if (format == XINE_IMGFMT_YUY2) {
       int i, image_size;
@@ -720,8 +701,7 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge
       
       /* planar format, only base[0] */
       /* add one extra line for field swap stuff */
-      frame->real_base[0] = xine_xmalloc_aligned(16, image_size + frame->vo_frame.pitches[0],
-        &frame->mem);
+      frame->real_base[0] = frame->mem = av_mallocz(image_size + frame->vo_frame.pitches[0]);
 
       /* don't use first line */
       frame->real_base[0] += frame->vo_frame.pitches[0];
@@ -748,8 +728,8 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge
       image_size_v = frame->vo_frame.pitches[2] * ((oheight + 1) / 2);
 
       /* add one extra line for field swap stuff */
-      frame->real_base[0] = xine_xmalloc_aligned(16, image_size_y + frame->vo_frame.pitches[0] +
-        image_size_u + image_size_v, &frame->mem);
+      frame->real_base[0] = frame->mem = av_mallocz(image_size_y + frame->vo_frame.pitches[0] +
+						    image_size_u + image_size_v);
 
       /* don't use first line */
       frame->real_base[0] += frame->vo_frame.pitches[0];