1 files changed, 36 insertions, 141 deletions

diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index e4db57b24..005fc07db 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.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: eq2.c,v 1.12 2003/12/07 15:33:26 miguelfreitas Exp $
+ * $Id: eq2.c,v 1.13 2004/01/07 19:52:42 mroi Exp $
  *
  * mplayer's eq2 (soft video equalizer)
  * Software equalizer (brightness, contrast, gamma, saturation)
@@ -308,10 +308,9 @@ struct post_plugin_eq2_s {
   post_plugin_t post;
 
   /* private data */
-  xine_video_port_t *vo_port;
-  xine_stream_t     *stream;
-
   eq2_parameters_t   params;
+  xine_post_in_t     params_input;
+  
   vf_eq2_t           eq2;
 
   pthread_mutex_t    lock;
@@ -387,12 +386,6 @@ static xine_post_api_t post_api = {
   get_help,
 };
 
-typedef struct post_eq2_out_s post_eq2_out_t;
-struct post_eq2_out_s {
-  xine_post_out_t  xine_out;
-
-  post_plugin_eq2_t *plugin;
-};
 
 /* plugin class functions */
 static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs,
@@ -405,17 +398,12 @@ static void           eq2_class_dispose(post_class_t *class_gen);
 /* plugin instance functions */
 static void           eq2_dispose(post_plugin_t *this_gen);
 
-/* rewire function */
-static int            eq2_rewire(xine_post_out_t *output, void *data);
-
 /* replaced video_port functions */
 static int            eq2_get_property(xine_video_port_t *port_gen, int property);
 static int            eq2_set_property(xine_video_port_t *port_gen, int property, int value);
-static void           eq2_open(xine_video_port_t *port_gen, xine_stream_t *stream);
-static vo_frame_t    *eq2_get_frame(xine_video_port_t *port_gen, uint32_t width, 
-				       uint32_t height, double ratio, 
-				       int format, int flags);
-static void           eq2_close(xine_video_port_t *port_gen, xine_stream_t *stream);
+
+/* frame intercept check */
+static int            eq2_intercept_frame(post_video_port_t *port, vo_frame_t *frame);
 
 /* replaced vo_frame functions */
 static int            eq2_draw(vo_frame_t *frame, xine_stream_t *stream);
@@ -441,23 +429,20 @@ static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target)
 {
-  post_plugin_eq2_t *this = (post_plugin_eq2_t *)malloc(sizeof(post_plugin_eq2_t));
-  xine_post_in_t            *input = (xine_post_in_t *)malloc(sizeof(xine_post_in_t));
-  xine_post_in_t            *input_api = (xine_post_in_t *)malloc(sizeof(xine_post_in_t));
-  post_eq2_out_t    *output = (post_eq2_out_t *)malloc(sizeof(post_eq2_out_t));
+  post_plugin_eq2_t *this = (post_plugin_eq2_t *)xine_xmalloc(sizeof(post_plugin_eq2_t));
+  post_in_t         *input;
+  xine_post_in_t    *input_api;
+  post_out_t        *output;
   post_video_port_t *port;
-  vf_eq2_t *eq2;
+  vf_eq2_t          *eq2;
   int i;
   
-  if (!this || !input || !input_api || !output || !video_target || !video_target[0]) {
+  if (!this || !video_target || !video_target[0]) {
     free(this);
-    free(input);
-    free(input_api);
-    free(output);
     return NULL;
   }
-
-  this->stream = NULL;
+  
+  _x_post_init(&this->post, 0, 1);
 
   eq2 = &this->eq2;
   for (i = 0; i < 3; i++) {
@@ -480,42 +465,24 @@ static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs,
   eq2->ggamma = this->params.ggamma = 1.0;
   eq2->bgamma = this->params.bgamma = 1.0;
 
-  pthread_mutex_init (&this->lock, NULL);
+  pthread_mutex_init(&this->lock, NULL);
   
-  port = _x_post_intercept_video_port(&this->post, video_target[0]);
-  /* replace with our own get_frame function */
-  port->port.open         = eq2_open;
-  port->port.get_frame    = eq2_get_frame;
-  port->port.close        = eq2_close;
-  port->port.get_property = eq2_get_property;
-  port->port.set_property = eq2_set_property;
+  port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
+  port->new_port.get_property = eq2_get_property;
+  port->new_port.set_property = eq2_set_property;
+  port->intercept_frame       = eq2_intercept_frame;
+  port->new_frame->draw       = eq2_draw;
   
-  input->name = "video";
-  input->type = XINE_POST_DATA_VIDEO;
-  input->data = (xine_video_port_t *)&port->port;
-
+  input_api       = &this->params_input;
   input_api->name = "parameters";
   input_api->type = XINE_POST_DATA_PARAMETERS;
   input_api->data = &post_api;
+  xine_list_append_content(this->post.input, input_api);
 
+  input->xine_in.name     = "video";
   output->xine_out.name   = "eqd video";
-  output->xine_out.type   = XINE_POST_DATA_VIDEO;
-  output->xine_out.data   = (xine_video_port_t **)&port->original_port;
-  output->xine_out.rewire = eq2_rewire;
-  output->plugin          = this;
-  
-  this->post.xine_post.audio_input    = (xine_audio_port_t **)malloc(sizeof(xine_audio_port_t *));
-  this->post.xine_post.audio_input[0] = NULL;
-  this->post.xine_post.video_input    = (xine_video_port_t **)malloc(sizeof(xine_video_port_t *) * 2);
-  this->post.xine_post.video_input[0] = &port->port;
-  this->post.xine_post.video_input[1] = NULL;
   
-  this->post.input  = xine_list_new();
-  this->post.output = xine_list_new();
-  
-  xine_list_append_content(this->post.input, input);
-  xine_list_append_content(this->post.input, input_api);
-  xine_list_append_content(this->post.output, output);
+  this->post.xine_post.video_input[0] = &port->new_port;
   
   this->post.dispose = eq2_dispose;
 
@@ -543,43 +510,14 @@ static void eq2_class_dispose(post_class_t *class_gen)
 static void eq2_dispose(post_plugin_t *this_gen)
 {
   post_plugin_eq2_t *this = (post_plugin_eq2_t *)this_gen;
-  post_eq2_out_t *output = (post_eq2_out_t *)xine_list_first_content(this->post.output);
-  xine_video_port_t *port = *(xine_video_port_t **)output->xine_out.data;
-
-  if (this->stream)
-    port->close(port, this->stream);
-
-  free(this->post.xine_post.audio_input);
-  free(this->post.xine_post.video_input);
-  free(xine_list_first_content(this->post.input));
-  free(xine_list_next_content(this->post.input));
-  free(xine_list_first_content(this->post.output));
-  xine_list_free(this->post.input);
-  xine_list_free(this->post.output);
-  free(this);
-}
-
-
-static int eq2_rewire(xine_post_out_t *output_gen, void *data)
-{
-  post_eq2_out_t *output = (post_eq2_out_t *)output_gen;
-  xine_video_port_t *old_port = *(xine_video_port_t **)output_gen->data;
-  xine_video_port_t *new_port = (xine_video_port_t *)data;
-  
-  if (!data)
-    return 0;
 
-  if (output->plugin->stream) {
-    /* register our stream at the new output port */
-    old_port->close(old_port, output->plugin->stream);
-    new_port->open(new_port, output->plugin->stream);
+  if (_x_post_dispose(this_gen)) {
+    pthread_mutex_destroy(&this->lock);
+    free(this);
   }
-  /* reconnect ourselves */
-  *(xine_video_port_t **)output_gen->data = new_port;
-
-  return 1;
 }
 
+
 static int eq2_get_property(xine_video_port_t *port_gen, int property) {
   post_video_port_t *port = (post_video_port_t *)port_gen;
   post_plugin_eq2_t *this = (post_plugin_eq2_t *)port->post;
@@ -614,48 +552,12 @@ static int eq2_set_property(xine_video_port_t *port_gen, int property, int value
     return port->original_port->set_property(port->original_port, property, value);
 }
 
-static void eq2_open(xine_video_port_t *port_gen, xine_stream_t *stream)
-{
-  post_video_port_t *port = (post_video_port_t *)port_gen;
-  post_plugin_eq2_t *this = (post_plugin_eq2_t *)port->post;
-  this->stream = stream;
-  port->original_port->open(port->original_port, stream);
-}
 
-static vo_frame_t *eq2_get_frame(xine_video_port_t *port_gen, uint32_t width, 
-				    uint32_t height, double ratio, 
-				    int format, int flags)
+static int eq2_intercept_frame(post_video_port_t *port, vo_frame_t *frame)
 {
-  post_video_port_t *port = (post_video_port_t *)port_gen;
-  vo_frame_t        *frame;
-
-  frame = port->original_port->get_frame(port->original_port,
-    width, height, ratio, format, flags);
-
-  _x_post_intercept_video_frame(frame, port);
-  if( format == XINE_IMGFMT_YV12 || format == XINE_IMGFMT_YUY2 ) {
-    /* replace with our own draw function */
-    frame->draw = eq2_draw;
-    /* decoders should not copy the frames, since they won't be displayed */
-    frame->proc_slice = NULL;
-    frame->proc_frame = NULL;
-  }
-
-  return frame;
+  return (frame->format == XINE_IMGFMT_YV12 || frame->format == XINE_IMGFMT_YUY2);
 }
 
-static void eq2_close(xine_video_port_t *port_gen, xine_stream_t *stream)
-{
-  post_video_port_t *port = (post_video_port_t *)port_gen;
-  post_plugin_eq2_t *this = (post_plugin_eq2_t *)port->post;
-
-  this->stream = NULL;
-  
-  port->original_port->close(port->original_port, stream);
-}
-
-
-
 
 static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
 {
@@ -667,8 +569,6 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
   int skip;
   int i;
 
-  _x_post_restore_video_frame(frame, port);
-
   if( !frame->bad_frame &&
       (eq2->param[0].adjust || eq2->param[1].adjust || eq2->param[2].adjust) ) {
 
@@ -678,9 +578,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
       yv12_frame = port->original_port->get_frame(port->original_port,
         frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
   
-      yv12_frame->pts = frame->pts;
-      yv12_frame->duration = frame->duration;
-      _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info);
+      _x_post_frame_copy_up(frame, yv12_frame);
   
       yuy2_to_yv12(frame->base[0], frame->pitches[0],
                    yv12_frame->base[0], yv12_frame->pitches[0],
@@ -696,11 +594,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
     out_frame = port->original_port->get_frame(port->original_port,
       frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
 
-  
-    _x_extra_info_merge(out_frame->extra_info, frame->extra_info);
-  
-    out_frame->pts = frame->pts;
-    out_frame->duration = frame->duration;
+    _x_post_frame_copy_up(frame, out_frame);
 
     pthread_mutex_lock (&this->lock);
 
@@ -722,15 +616,16 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
 
     skip = out_frame->draw(out_frame, stream);
   
-    frame->vpts = out_frame->vpts;
+    _x_post_frame_copy_down(frame, out_frame);
 
     out_frame->free(out_frame);
     yv12_frame->free(yv12_frame);
 
   } else {
-    skip = frame->draw(frame, stream);
+    _x_post_frame_copy_up(frame, frame->next);
+    skip = frame->next->draw(frame->next, stream);
+    _x_post_frame_copy_down(frame, frame->next);
   }
 
-  
   return skip;
 }