Commit f2a9e65e authored by gbazin's avatar gbazin
Browse files

* modules/video_filter/*: use p_vout->fmt_in/out.

parent a5f23e84
......@@ -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" );
......
......@@ -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" );
......
......@@ -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" );
......
......@@ -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) );
......
......@@ -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'):
......
......@@ -2,7 +2,7 @@
* motiondetect.c : Motion detect video effect plugin for vlc
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id: $
* $Id$
*
* Authors: Jrme Decoodt <djc@videolan.org>
*
......@@ -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" );
......
......@@ -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 );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment