vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width,
p_vout->p_sys->p_win->i_height,
&i_index, &i_index,
- &p_vout->output.i_width, &p_vout->output.i_height );
+ &p_vout->fmt_out.i_visible_width,
+ &p_vout->fmt_out.i_visible_height );
- /* Assume we have square pixels */
- p_vout->output.i_aspect = p_vout->output.i_width
- * VOUT_ASPECT_FACTOR / p_vout->output.i_height;
+ p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
+
+ p_vout->output.i_width = p_vout->fmt_out.i_width =
+ p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_width /
+ p_vout->fmt_in.i_visible_width;
+ p_vout->output.i_height = p_vout->fmt_out.i_height =
+ p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_height /
+ p_vout->fmt_in.i_visible_height;
+ p_vout->fmt_out.i_x_offset =
+ p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_x_offset /
+ p_vout->fmt_in.i_visible_width;
+ p_vout->fmt_out.i_y_offset =
+ p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_y_offset /
+ p_vout->fmt_in.i_visible_height;
+
+ p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_sar_den = 1;
+ p_vout->output.i_aspect = p_vout->fmt_out.i_aspect =
+ p_vout->fmt_out.i_width * VOUT_ASPECT_FACTOR /p_vout->fmt_out.i_height;
+
+ msg_Dbg( p_vout, "x11 image size %ix%i (%i,%i,%ix%i)",
+ p_vout->fmt_out.i_width, p_vout->fmt_out.i_height,
+ p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height );
#endif
/* Try to initialize up to MAX_DIRECTBUFFERS direct buffers */
XShmPutImage( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->video_window,
p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image,
- 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/,
- p_vout->output.i_width, p_vout->output.i_height,
+ p_vout->fmt_out.i_x_offset,
+ p_vout->fmt_out.i_y_offset,
+ 0 /*dest_x*/, 0 /*dest_y*/,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height,
False /* Don't put True here ! */ );
# endif
}
XPutImage( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->video_window,
p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image,
- 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/,
- p_vout->output.i_width, p_vout->output.i_height );
+ p_vout->fmt_out.i_x_offset,
+ p_vout->fmt_out.i_y_offset,
+ 0 /*dest_x*/, 0 /*dest_y*/,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height );
#endif
}
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
-#ifndef MODULE_NAME_IS_x11
if( p_vout->i_changes & VOUT_CROP_CHANGE ||
p_vout->i_changes & VOUT_ASPECT_CHANGE )
{
p_vout->fmt_out.i_sar_num = p_vout->fmt_in.i_sar_num;
p_vout->fmt_out.i_sar_den = p_vout->fmt_in.i_sar_den;
p_vout->output.i_aspect = p_vout->fmt_in.i_aspect;
+
p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
-#endif
/*
* Size change