summaryrefslogtreecommitdiff
path: root/src/post/planar
diff options
context:
space:
mode:
Diffstat (limited to 'src/post/planar')
-rw-r--r--src/post/planar/boxblur.c14
-rw-r--r--src/post/planar/denoise3d.c14
-rw-r--r--src/post/planar/eq.c14
-rw-r--r--src/post/planar/eq2.c14
-rw-r--r--src/post/planar/expand.c2
-rw-r--r--src/post/planar/invert.c12
-rw-r--r--src/post/planar/planar.c20
-rwxr-xr-xsrc/post/planar/pp.c18
-rw-r--r--src/post/planar/unsharp.c14
9 files changed, 61 insertions, 61 deletions
diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index f85b6ad31..34117915f 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: boxblur.c,v 1.12 2004/01/07 19:52:42 mroi Exp $
+ * $Id: boxblur.c,v 1.13 2004/04/17 19:54:32 mroi Exp $
*
* mplayer's boxblur
* Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
@@ -322,7 +322,7 @@ static int boxblur_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);
- _x_post_frame_copy_up(frame, yv12_frame);
+ _x_post_frame_copy_down(frame, yv12_frame);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -339,7 +339,7 @@ static int boxblur_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_post_frame_copy_up(frame, out_frame);
+ _x_post_frame_copy_down(frame, out_frame);
pthread_mutex_lock (&this->lock);
@@ -368,15 +368,15 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream)
skip = out_frame->draw(out_frame, stream);
- _x_post_frame_copy_down(frame, out_frame);
+ _x_post_frame_copy_up(frame, out_frame);
out_frame->free(out_frame);
yv12_frame->free(yv12_frame);
} else {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
}
return skip;
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index e4d8d65b2..3f69468e8 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: denoise3d.c,v 1.12 2004/01/07 19:52:42 mroi Exp $
+ * $Id: denoise3d.c,v 1.13 2004/04/17 19:54:32 mroi Exp $
*
* mplayer's denoise3d
* Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org>
@@ -352,7 +352,7 @@ static int denoise3d_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);
- _x_post_frame_copy_up(frame, yv12_frame);
+ _x_post_frame_copy_down(frame, yv12_frame);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -369,7 +369,7 @@ static int denoise3d_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_post_frame_copy_up(frame, out_frame);
+ _x_post_frame_copy_down(frame, out_frame);
pthread_mutex_lock (&this->lock);
@@ -400,7 +400,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream)
skip = out_frame->draw(out_frame, stream);
- _x_post_frame_copy_down(frame, out_frame);
+ _x_post_frame_copy_up(frame, out_frame);
out_frame->free(out_frame);
@@ -414,9 +414,9 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream)
yv12_frame->free(yv12_frame);
} else {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
}
return skip;
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index 7925d3e31..e28a71192 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: eq.c,v 1.11 2004/01/07 19:52:42 mroi Exp $
+ * $Id: eq.c,v 1.12 2004/04/17 19:54:32 mroi Exp $
*
* mplayer's eq (soft video equalizer)
* Copyright (C) Richard Felker
@@ -373,7 +373,7 @@ static int eq_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);
- _x_post_frame_copy_up(frame, yv12_frame);
+ _x_post_frame_copy_down(frame, yv12_frame);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -390,7 +390,7 @@ static int eq_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_post_frame_copy_up(frame, out_frame);
+ _x_post_frame_copy_down(frame, out_frame);
pthread_mutex_lock (&this->lock);
@@ -407,15 +407,15 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream)
skip = out_frame->draw(out_frame, stream);
- _x_post_frame_copy_down(frame, out_frame);
+ _x_post_frame_copy_up(frame, out_frame);
out_frame->free(out_frame);
yv12_frame->free(yv12_frame);
} else {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
}
return skip;
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index 005fc07db..6badc61d9 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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.13 2004/01/07 19:52:42 mroi Exp $
+ * $Id: eq2.c,v 1.14 2004/04/17 19:54:32 mroi Exp $
*
* mplayer's eq2 (soft video equalizer)
* Software equalizer (brightness, contrast, gamma, saturation)
@@ -578,7 +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);
- _x_post_frame_copy_up(frame, yv12_frame);
+ _x_post_frame_copy_down(frame, yv12_frame);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -594,7 +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_post_frame_copy_up(frame, out_frame);
+ _x_post_frame_copy_down(frame, out_frame);
pthread_mutex_lock (&this->lock);
@@ -616,15 +616,15 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
skip = out_frame->draw(out_frame, stream);
- _x_post_frame_copy_down(frame, out_frame);
+ _x_post_frame_copy_up(frame, out_frame);
out_frame->free(out_frame);
yv12_frame->free(yv12_frame);
} else {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
}
return skip;
diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c
index 41ab10227..9e9a51515 100644
--- a/src/post/planar/expand.c
+++ b/src/post/planar/expand.c
@@ -49,7 +49,7 @@
* - this frame is given to the decoder, which paints its image inside
* - when the decoder draws the frame, the post plugin architecture
* will automatically restore the old pointers
- * This way, the decoder (or any other post plugin down the tree) will only
+ * This way, the decoder (or any other post plugin up the tree) will only
* see the frame area between the black bars and by that modify the
* enlarged version directly. No need for later copying.
*/
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index 613565aa8..77f7c54d1 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: invert.c,v 1.19 2004/01/07 19:52:42 mroi Exp $
+ * $Id: invert.c,v 1.20 2004/04/17 19:54:32 mroi Exp $
*/
/*
@@ -129,15 +129,15 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream)
int size, i, skip;
if (frame->bad_frame) {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
return skip;
}
inverted_frame = port->original_port->get_frame(port->original_port,
frame->width, frame->height, frame->ratio, frame->format, frame->flags | VO_BOTH_FIELDS);
- _x_post_frame_copy_up(frame, inverted_frame);
+ _x_post_frame_copy_down(frame, inverted_frame);
switch (inverted_frame->format) {
case XINE_IMGFMT_YUY2:
@@ -161,7 +161,7 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream)
break;
}
skip = inverted_frame->draw(inverted_frame, stream);
- _x_post_frame_copy_down(frame, inverted_frame);
+ _x_post_frame_copy_up(frame, inverted_frame);
inverted_frame->free(inverted_frame);
return skip;
diff --git a/src/post/planar/planar.c b/src/post/planar/planar.c
index 2abcb5ea0..07db7a4e5 100644
--- a/src/post/planar/planar.c
+++ b/src/post/planar/planar.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: planar.c,v 1.7 2004/01/07 19:52:42 mroi Exp $
+ * $Id: planar.c,v 1.8 2004/04/17 19:54:32 mroi Exp $
*
* catalog for planar post plugins
*/
@@ -52,13 +52,13 @@ post_info_t pp_special_info = { XINE_POST_TYPE_VIDEO_FILTER };
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_POST, 8, "expand", XINE_VERSION_CODE, &expand_special_info, &expand_init_plugin },
- { PLUGIN_POST, 8, "invert", XINE_VERSION_CODE, &invert_special_info, &invert_init_plugin },
- { PLUGIN_POST, 8, "eq", XINE_VERSION_CODE, &eq_special_info, &eq_init_plugin },
- { PLUGIN_POST, 8, "denoise3d", XINE_VERSION_CODE, &denoise3d_special_info, &denoise3d_init_plugin },
- { PLUGIN_POST, 8, "boxblur", XINE_VERSION_CODE, &boxblur_special_info, &boxblur_init_plugin },
- { PLUGIN_POST, 8, "eq2", XINE_VERSION_CODE, &eq2_special_info, &eq2_init_plugin },
- { PLUGIN_POST, 8, "unsharp", XINE_VERSION_CODE, &unsharp_special_info, &unsharp_init_plugin },
- { PLUGIN_POST, 8, "pp", XINE_VERSION_CODE, &pp_special_info, &pp_init_plugin },
+ { PLUGIN_POST, 9, "expand", XINE_VERSION_CODE, &expand_special_info, &expand_init_plugin },
+ { PLUGIN_POST, 9, "invert", XINE_VERSION_CODE, &invert_special_info, &invert_init_plugin },
+ { PLUGIN_POST, 9, "eq", XINE_VERSION_CODE, &eq_special_info, &eq_init_plugin },
+ { PLUGIN_POST, 9, "denoise3d", XINE_VERSION_CODE, &denoise3d_special_info, &denoise3d_init_plugin },
+ { PLUGIN_POST, 9, "boxblur", XINE_VERSION_CODE, &boxblur_special_info, &boxblur_init_plugin },
+ { PLUGIN_POST, 9, "eq2", XINE_VERSION_CODE, &eq2_special_info, &eq2_init_plugin },
+ { PLUGIN_POST, 9, "unsharp", XINE_VERSION_CODE, &unsharp_special_info, &unsharp_init_plugin },
+ { PLUGIN_POST, 9, "pp", XINE_VERSION_CODE, &pp_special_info, &pp_init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 95fcfb4f1..11b67dfd6 100755
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: pp.c,v 1.5 2004/01/07 19:52:42 mroi Exp $
+ * $Id: pp.c,v 1.6 2004/04/17 19:54:32 mroi Exp $
*
* plugin for ffmpeg libpostprocess
*/
@@ -287,7 +287,7 @@ static int pp_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);
- _x_post_frame_copy_up(frame, yv12_frame);
+ _x_post_frame_copy_down(frame, yv12_frame);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -303,7 +303,7 @@ static int pp_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_post_frame_copy_up(frame, out_frame);
+ _x_post_frame_copy_down(frame, out_frame);
pthread_mutex_lock (&this->lock);
@@ -342,20 +342,20 @@ static int pp_draw(vo_frame_t *frame, xine_stream_t *stream)
if(this->pp_mode) {
skip = out_frame->draw(out_frame, stream);
- _x_post_frame_copy_down(frame, out_frame);
+ _x_post_frame_copy_up(frame, out_frame);
} else {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
}
out_frame->free(out_frame);
yv12_frame->free(yv12_frame);
} else {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
}
return skip;
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index 31359f500..786d7d387 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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: unsharp.c,v 1.13 2004/01/07 19:52:42 mroi Exp $
+ * $Id: unsharp.c,v 1.14 2004/04/17 19:54:32 mroi Exp $
*
* mplayer's unsharp
* Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com>
@@ -404,7 +404,7 @@ static int unsharp_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);
- _x_post_frame_copy_up(frame, yv12_frame);
+ _x_post_frame_copy_down(frame, yv12_frame);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -421,7 +421,7 @@ static int unsharp_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_post_frame_copy_up(frame, out_frame);
+ _x_post_frame_copy_down(frame, out_frame);
pthread_mutex_lock (&this->lock);
@@ -455,15 +455,15 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream)
skip = out_frame->draw(out_frame, stream);
- _x_post_frame_copy_down(frame, out_frame);
+ _x_post_frame_copy_up(frame, out_frame);
out_frame->free(out_frame);
yv12_frame->free(yv12_frame);
} else {
- _x_post_frame_copy_up(frame, frame->next);
- skip = frame->next->draw(frame->next, stream);
_x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
+ _x_post_frame_copy_up(frame, frame->next);
}
return skip;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 13:35:58 +0000