From f2a9e65e077874b804b4ba99542f883cfca9caf4 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Tue, 25 Oct 2005 19:24:21 +0000 Subject: [PATCH] * modules/video_filter/*: use p_vout->fmt_in/out. --- modules/video_filter/clone.c | 10 ++-------- modules/video_filter/distort.c | 10 ++-------- modules/video_filter/invert.c | 10 ++-------- modules/video_filter/logo.c | 10 ++-------- modules/video_filter/motionblur.c | 10 ++-------- modules/video_filter/motiondetect.c | 12 +++--------- modules/video_filter/transform.c | 27 ++++++++++++++------------- 7 files changed, 27 insertions(+), 62 deletions(-) diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index 78533feaa3..108ee84cb2 100644 --- a/modules/video_filter/clone.c +++ b/modules/video_filter/clone.c @@ -214,14 +214,8 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; - - fmt.i_width = fmt.i_visible_width = p_vout->render.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->render.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->render.i_chroma; - fmt.i_aspect = p_vout->render.i_aspect; - fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; /* Try to open the real video output */ msg_Dbg( p_vout, "spawning the real video outputs" ); diff --git a/modules/video_filter/distort.c b/modules/video_filter/distort.c index e370ea35a0..61bd9f4dd3 100644 --- a/modules/video_filter/distort.c +++ b/modules/video_filter/distort.c @@ -174,14 +174,8 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; - - fmt.i_width = fmt.i_visible_width = p_vout->render.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->render.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->render.i_chroma; - fmt.i_aspect = p_vout->render.i_aspect; - fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; /* Try to open the real video output */ msg_Dbg( p_vout, "spawning the real video output" ); diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c index 05ccb93b26..e79ce2373f 100644 --- a/modules/video_filter/invert.c +++ b/modules/video_filter/invert.c @@ -120,14 +120,8 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; - - fmt.i_width = fmt.i_visible_width = p_vout->render.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->render.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->render.i_chroma; - fmt.i_aspect = p_vout->render.i_aspect; - fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; /* Try to open the real video output */ msg_Dbg( p_vout, "spawning the real video output" ); diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index 19b34bf2d3..aaa3c6b147 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -220,14 +220,8 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; - - fmt.i_width = fmt.i_visible_width = p_vout->render.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->render.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->render.i_chroma; - fmt.i_aspect = p_vout->render.i_aspect; - fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; /* Load the video blending filter */ p_sys->p_blend = vlc_object_create( p_vout, sizeof(filter_t) ); diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index bd93662cc5..df36717c52 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -148,6 +148,8 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; break; default: @@ -157,14 +159,6 @@ static int Init( vout_thread_t *p_vout ) msg_Dbg( p_vout, "spawning the real video output" ); - fmt.i_width = fmt.i_visible_width = p_vout->output.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->output.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->output.i_chroma; - fmt.i_aspect = p_vout->output.i_aspect; - fmt.i_sar_num = p_vout->output.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; - switch( p_vout->render.i_chroma ) { case VLC_FOURCC('I','4','2','0'): diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c index e0f65805eb..b744333e5c 100644 --- a/modules/video_filter/motiondetect.c +++ b/modules/video_filter/motiondetect.c @@ -2,7 +2,7 @@ * motiondetect.c : Motion detect video effect plugin for vlc ***************************************************************************** * Copyright (C) 2005 the VideoLAN team - * $Id: $ + * $Id$ * * Authors: Jérôme Decoodt * @@ -222,14 +222,8 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; - - fmt.i_width = fmt.i_visible_width = p_vout->render.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->render.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->render.i_chroma; - fmt.i_aspect = p_vout->render.i_aspect; - fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; /* Try to open the real video output */ msg_Dbg( p_vout, "spawning the real video output" ); diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index 5886f41569..72cddfa7f8 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -189,26 +189,27 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; - - fmt.i_width = fmt.i_visible_width = p_vout->render.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->render.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->render.i_chroma; - fmt.i_aspect = p_vout->render.i_aspect; - fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; /* Try to open the real video output */ msg_Dbg( p_vout, "spawning the real video output" ); if( p_vout->p_sys->b_rotation ) { - fmt.i_width = fmt.i_visible_width = p_vout->render.i_height; - fmt.i_height = fmt.i_visible_height = p_vout->render.i_width; + fmt.i_width = p_vout->fmt_out.i_height; + fmt.i_visible_width = p_vout->fmt_out.i_visible_height; + fmt.i_x_offset = p_vout->fmt_out.i_y_offset; + + fmt.i_height = p_vout->fmt_out.i_width; + fmt.i_visible_height = p_vout->fmt_out.i_visible_width; + fmt.i_y_offset = p_vout->fmt_out.i_x_offset; + fmt.i_aspect = VOUT_ASPECT_FACTOR * - (uint64_t)VOUT_ASPECT_FACTOR / p_vout->render.i_aspect; - fmt.i_sar_num = VOUT_ASPECT_FACTOR; - fmt.i_sar_den = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; + (uint64_t)VOUT_ASPECT_FACTOR / fmt.i_aspect; + + fmt.i_sar_num = p_vout->fmt_out.i_sar_den; + fmt.i_sar_den = p_vout->fmt_out.i_sar_num; p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt ); } -- 2.39.2