summaryrefslogtreecommitdiff
path: root/src/post/planar
diff options
context:
space:
mode:
Diffstat (limited to 'src/post/planar')
-rw-r--r--src/post/planar/boxblur.c12
-rw-r--r--src/post/planar/denoise3d.c12
-rw-r--r--src/post/planar/eq.c12
-rw-r--r--src/post/planar/eq2.c12
-rw-r--r--src/post/planar/expand.c6
-rw-r--r--src/post/planar/invert.c12
-rwxr-xr-xsrc/post/planar/pp.c10
-rw-r--r--src/post/planar/unsharp.c12
8 files changed, 44 insertions, 44 deletions
diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index 5f0764239..5b94c1230 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.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: boxblur.c,v 1.9 2003/11/01 18:34:22 miguelfreitas Exp $
+ * $Id: boxblur.c,v 1.10 2003/11/11 18:44:59 f1rmb Exp $
*
* mplayer's boxblur
* Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
@@ -194,7 +194,7 @@ static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs,
pthread_mutex_init (&this->lock, NULL);
- port = post_intercept_video_port(&this->post, video_target[0]);
+ port = _x_post_intercept_video_port(&this->post, video_target[0]);
/* replace with our own get_frame function */
port->port.open = boxblur_open;
port->port.get_frame = boxblur_get_frame;
@@ -306,7 +306,7 @@ static vo_frame_t *boxblur_get_frame(xine_video_port_t *port_gen, uint32_t width
frame = port->original_port->get_frame(port->original_port,
width, height, ratio, format, flags);
- post_intercept_video_frame(frame, port);
+ _x_post_intercept_video_frame(frame, port);
/* replace with our own draw function */
frame->draw = boxblur_draw;
/* decoders should not copy the frames, since they won't be displayed */
@@ -411,7 +411,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream)
int cw, ch;
int skip;
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
if( !frame->bad_frame ) {
@@ -424,7 +424,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream)
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
- extra_info_merge(yv12_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -442,7 +442,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream)
frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
- extra_info_merge(out_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(out_frame->extra_info, frame->extra_info);
out_frame->pts = frame->pts;
out_frame->duration = frame->duration;
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index dc5441486..fe76e2a6c 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.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: denoise3d.c,v 1.9 2003/11/01 18:34:22 miguelfreitas Exp $
+ * $Id: denoise3d.c,v 1.10 2003/11/11 18:44:59 f1rmb Exp $
*
* mplayer's denoise3d
* Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org>
@@ -231,7 +231,7 @@ static post_plugin_t *denoise3d_open_plugin(post_class_t *class_gen, int inputs,
pthread_mutex_init (&this->lock, NULL);
- port = post_intercept_video_port(&this->post, video_target[0]);
+ port = _x_post_intercept_video_port(&this->post, video_target[0]);
/* replace with our own get_frame function */
port->port.open = denoise3d_open;
port->port.get_frame = denoise3d_get_frame;
@@ -345,7 +345,7 @@ static vo_frame_t *denoise3d_get_frame(xine_video_port_t *port_gen, uint32_t wid
frame = port->original_port->get_frame(port->original_port,
width, height, ratio, format, flags);
- post_intercept_video_frame(frame, port);
+ _x_post_intercept_video_frame(frame, port);
/* replace with our own draw function */
frame->draw = denoise3d_draw;
/* decoders should not copy the frames, since they won't be displayed */
@@ -425,7 +425,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream)
int cw, ch;
int skip;
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
if( !frame->bad_frame ) {
@@ -438,7 +438,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream)
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
- extra_info_merge(yv12_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -456,7 +456,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream)
frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
- extra_info_merge(out_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(out_frame->extra_info, frame->extra_info);
out_frame->pts = frame->pts;
out_frame->duration = frame->duration;
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index be8deb704..2077e2a26 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.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: eq.c,v 1.8 2003/11/01 18:34:22 miguelfreitas Exp $
+ * $Id: eq.c,v 1.9 2003/11/11 18:44:59 f1rmb Exp $
*
* mplayer's eq (soft video equalizer)
* Copyright (C) Richard Felker
@@ -288,7 +288,7 @@ static post_plugin_t *eq_open_plugin(post_class_t *class_gen, int inputs,
pthread_mutex_init (&this->lock, NULL);
- port = post_intercept_video_port(&this->post, video_target[0]);
+ port = _x_post_intercept_video_port(&this->post, video_target[0]);
/* replace with our own get_frame function */
port->port.open = eq_open;
port->port.get_frame = eq_get_frame;
@@ -430,7 +430,7 @@ static vo_frame_t *eq_get_frame(xine_video_port_t *port_gen, uint32_t width,
frame = port->original_port->get_frame(port->original_port,
width, height, ratio, format, flags);
- post_intercept_video_frame(frame, port);
+ _x_post_intercept_video_frame(frame, port);
/* replace with our own draw function */
frame->draw = eq_draw;
/* decoders should not copy the frames, since they won't be displayed */
@@ -461,7 +461,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream)
vo_frame_t *yv12_frame;
int skip;
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
if( !frame->bad_frame &&
((this->params.brightness != 0) || (this->params.contrast != 0)) ) {
@@ -474,7 +474,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream)
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
- extra_info_merge(yv12_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -492,7 +492,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream)
frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
- extra_info_merge(out_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(out_frame->extra_info, frame->extra_info);
out_frame->pts = frame->pts;
out_frame->duration = frame->duration;
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index ee765f382..0cea3276e 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.10 2003/11/01 18:34:22 miguelfreitas Exp $
+ * $Id: eq2.c,v 1.11 2003/11/11 18:44:59 f1rmb Exp $
*
* mplayer's eq2 (soft video equalizer)
* Software equalizer (brightness, contrast, gamma, saturation)
@@ -482,7 +482,7 @@ static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs,
pthread_mutex_init (&this->lock, NULL);
- port = post_intercept_video_port(&this->post, video_target[0]);
+ 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;
@@ -632,7 +632,7 @@ static vo_frame_t *eq2_get_frame(xine_video_port_t *port_gen, uint32_t width,
frame = port->original_port->get_frame(port->original_port,
width, height, ratio, format, flags);
- post_intercept_video_frame(frame, port);
+ _x_post_intercept_video_frame(frame, port);
/* replace with our own draw function */
frame->draw = eq2_draw;
/* decoders should not copy the frames, since they won't be displayed */
@@ -665,7 +665,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
int skip;
int i;
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
if( !frame->bad_frame &&
(eq2->param[0].adjust || eq2->param[1].adjust || eq2->param[2].adjust) ) {
@@ -678,7 +678,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
- extra_info_merge(yv12_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -695,7 +695,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
- extra_info_merge(out_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(out_frame->extra_info, frame->extra_info);
out_frame->pts = frame->pts;
out_frame->duration = frame->duration;
diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c
index db9436e51..9f3cda2cf 100644
--- a/src/post/planar/expand.c
+++ b/src/post/planar/expand.c
@@ -183,7 +183,7 @@ static post_plugin_t *expand_open_plugin(post_class_t *class_gen, int inputs,
this->frames_prealloc = NULL;
this->num_frames = 0;
- port = post_intercept_video_port(&this->post, video_target[0]);
+ port = _x_post_intercept_video_port(&this->post, video_target[0]);
/* replace with our own get_frame function */
port->port.open = expand_open;
port->port.get_frame = expand_get_frame;
@@ -437,7 +437,7 @@ static video_overlay_manager_t *expand_get_overlay_manager(xine_video_port_t *po
if (!this->overlay_manager) {
/* create a new overlay manager to intercept */
- this->overlay_manager = post_intercept_overlay_manager(&this->post,
+ this->overlay_manager = _x_post_intercept_overlay_manager(&this->post,
port->original_port->get_overlay_manager(port->original_port));
/* replace with our own add_event function */
this->overlay_manager->manager.add_event = expand_overlay_add_event;
@@ -467,7 +467,7 @@ static int expand_draw(vo_frame_t *frame, xine_stream_t *stream)
original_frame->pts = frame->pts;
original_frame->duration = frame->duration;
original_frame->bad_frame = frame->bad_frame;
- extra_info_merge(original_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(original_frame->extra_info, frame->extra_info);
skip = original_frame->draw(original_frame, stream);
frame->vpts = original_frame->vpts;
return skip;
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index db8851260..ba0db55c4 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.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: invert.c,v 1.14 2003/10/22 20:38:10 komadori Exp $
+ * $Id: invert.c,v 1.15 2003/11/11 18:44:59 f1rmb Exp $
*/
/*
@@ -96,7 +96,7 @@ static post_plugin_t *invert_open_plugin(post_class_t *class_gen, int inputs,
return NULL;
}
- port = post_intercept_video_port(this, video_target[0]);
+ port = _x_post_intercept_video_port(this, video_target[0]);
/* replace with our own get_frame function */
port->port.open = invert_open;
port->port.get_frame = invert_get_frame;
@@ -199,7 +199,7 @@ static vo_frame_t *invert_get_frame(xine_video_port_t *port_gen, uint32_t width,
frame = port->original_port->get_frame(port->original_port,
width, height, ratio, format, flags);
- post_intercept_video_frame(frame, port);
+ _x_post_intercept_video_frame(frame, port);
/* replace with our own draw function */
frame->draw = invert_draw;
/* decoders should not copy the frames, since they won't be displayed */
@@ -228,7 +228,7 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream)
inverted_frame->pts = frame->pts;
inverted_frame->duration = frame->duration;
inverted_frame->bad_frame = frame->bad_frame;
- extra_info_merge(inverted_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(inverted_frame->extra_info, frame->extra_info);
switch (inverted_frame->format) {
case XINE_IMGFMT_YUY2:
@@ -253,13 +253,13 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream)
default:
printf("invert: cannot handle image format %d\n", frame->format);
inverted_frame->free(inverted_frame);
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
return frame->draw(frame, stream);
}
skip = inverted_frame->draw(inverted_frame, stream);
inverted_frame->free(inverted_frame);
frame->vpts = inverted_frame->vpts;
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
return skip;
}
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 13ee9e02e..fe847211e 100755
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.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: pp.c,v 1.1 2003/11/07 18:37:34 miguelfreitas Exp $
+ * $Id: pp.c,v 1.2 2003/11/11 18:44:59 f1rmb Exp $
*
* plugin for ffmpeg libpostprocess
*/
@@ -228,7 +228,7 @@ static post_plugin_t *pp_open_plugin(post_class_t *class_gen, int inputs,
pthread_mutex_init (&this->lock, NULL);
- port = post_intercept_video_port(&this->post, video_target[0]);
+ port = _x_post_intercept_video_port(&this->post, video_target[0]);
/* replace with our own get_frame function */
port->port.open = pp_open;
port->port.get_frame = pp_get_frame;
@@ -351,7 +351,7 @@ static vo_frame_t *pp_get_frame(xine_video_port_t *port_gen, uint32_t width,
width, height, ratio, format, flags);
if( format == XINE_IMGFMT_YV12 || format == XINE_IMGFMT_YUY2 ) {
- post_intercept_video_frame(frame, port);
+ _x_post_intercept_video_frame(frame, port);
/* replace with our own draw function */
frame->draw = pp_draw;
/* decoders should not copy the frames, since they won't be displayed */
@@ -381,14 +381,14 @@ static int pp_draw(vo_frame_t *frame, xine_stream_t *stream)
int skip;
int pp_flags;
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
if( !frame->bad_frame ) {
out_frame = port->original_port->get_frame(port->original_port,
frame->width, frame->height, frame->ratio, frame->format, frame->flags | VO_BOTH_FIELDS);
- extra_info_merge(out_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(out_frame->extra_info, frame->extra_info);
out_frame->pts = frame->pts;
out_frame->duration = frame->duration;
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index 30784fa2b..65ebba954 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.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: unsharp.c,v 1.10 2003/11/02 12:57:27 miguelfreitas Exp $
+ * $Id: unsharp.c,v 1.11 2003/11/11 18:44:59 f1rmb Exp $
*
* mplayer's unsharp
* Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com>
@@ -329,7 +329,7 @@ static post_plugin_t *unsharp_open_plugin(post_class_t *class_gen, int inputs,
pthread_mutex_init (&this->lock, NULL);
- port = post_intercept_video_port(&this->post, video_target[0]);
+ port = _x_post_intercept_video_port(&this->post, video_target[0]);
/* replace with our own get_frame function */
port->port.open = unsharp_open;
port->port.get_frame = unsharp_get_frame;
@@ -464,7 +464,7 @@ static vo_frame_t *unsharp_get_frame(xine_video_port_t *port_gen, uint32_t width
frame = port->original_port->get_frame(port->original_port,
width, height, ratio, format, flags);
- post_intercept_video_frame(frame, port);
+ _x_post_intercept_video_frame(frame, port);
/* replace with our own draw function */
frame->draw = unsharp_draw;
/* decoders should not copy the frames, since they won't be displayed */
@@ -494,7 +494,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream)
vo_frame_t *yv12_frame;
int skip;
- post_restore_video_frame(frame, port);
+ _x_post_restore_video_frame(frame, port);
if( !frame->bad_frame &&
(this->priv.lumaParam.amount || this->priv.chromaParam.amount) ) {
@@ -508,7 +508,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream)
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
- extra_info_merge(yv12_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info);
yuy2_to_yv12(frame->base[0], frame->pitches[0],
yv12_frame->base[0], yv12_frame->pitches[0],
@@ -526,7 +526,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream)
frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
- extra_info_merge(out_frame->extra_info, frame->extra_info);
+ _x_extra_info_merge(out_frame->extra_info, frame->extra_info);
out_frame->pts = frame->pts;
out_frame->duration = frame->duration;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 21:31:14 +0000