/*****************************************************************************
* transform.c : transform image module for vlc
*****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2004 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
{
int i_index;
picture_t *p_pic;
+ video_format_t fmt = {0};
I_OUTPUTPICTURES = 0;
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;
/* Try to open the real video output */
msg_Dbg( p_vout, "spawning the real video output" );
if( p_vout->p_sys->b_rotation )
{
- p_vout->p_sys->p_vout = vout_Create( p_vout,
- p_vout->render.i_height, p_vout->render.i_width,
- p_vout->render.i_chroma,
- (uint64_t)VOUT_ASPECT_FACTOR
- * (uint64_t)VOUT_ASPECT_FACTOR
- / (uint64_t)p_vout->render.i_aspect );
- }
- else
- {
- p_vout->p_sys->p_vout = vout_Create( p_vout,
- p_vout->render.i_width, p_vout->render.i_height,
- p_vout->render.i_chroma, p_vout->render.i_aspect );
+ 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 / 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 );
+
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{
for( ; p_in < p_in_end ; )
{
p_in_end -= p_pic->p[i_index].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in_end,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in_end,
p_pic->p[i_index].i_visible_pitch );
p_out += p_pic->p[i_index].i_pitch;
}