}
}
- /* Check for cropping changes */
- if( p_vout->fmt_out.i_x_offset != p_vout->fmt_in.i_x_offset ||
- p_vout->fmt_out.i_y_offset != p_vout->fmt_in.i_y_offset ||
- p_vout->fmt_out.i_visible_width != p_vout->fmt_in.i_visible_width ||
- p_vout->fmt_out.i_visible_height != p_vout->fmt_in.i_visible_height )
+ /* Check for cropping / aspect changes */
+ if( p_vout->i_changes & VOUT_CROP_CHANGE ||
+ p_vout->i_changes & VOUT_ASPECT_CHANGE )
{
+ p_vout->i_changes &= ~VOUT_CROP_CHANGE;
+ p_vout->i_changes &= ~VOUT_ASPECT_CHANGE;
+
p_vout->fmt_out.i_x_offset = p_vout->fmt_in.i_x_offset;
p_vout->fmt_out.i_y_offset = p_vout->fmt_in.i_y_offset;
p_vout->fmt_out.i_visible_width = p_vout->fmt_in.i_visible_width;
p_vout->fmt_out.i_visible_height = p_vout->fmt_in.i_visible_height;
+ p_vout->fmt_out.i_aspect = p_vout->fmt_in.i_aspect;
+ 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;
E_(DirectXUpdateRects)( p_vout, VLC_TRUE );
}
vlc_mutex_unlock( &p_vout->p_sys->lock );
}
- /* Check for cropping changes */
- if( p_vout->fmt_out.i_x_offset != p_vout->fmt_in.i_x_offset ||
- p_vout->fmt_out.i_y_offset != p_vout->fmt_in.i_y_offset ||
- p_vout->fmt_out.i_visible_width != p_vout->fmt_in.i_visible_width ||
- p_vout->fmt_out.i_visible_height != p_vout->fmt_in.i_visible_height )
+ /* Check for cropping / aspect changes */
+ if( p_vout->i_changes & VOUT_CROP_CHANGE ||
+ p_vout->i_changes & VOUT_ASPECT_CHANGE )
{
+ p_vout->i_changes &= ~VOUT_CROP_CHANGE;
+ p_vout->i_changes &= ~VOUT_ASPECT_CHANGE;
+
p_vout->fmt_out.i_x_offset = p_vout->fmt_in.i_x_offset;
p_vout->fmt_out.i_y_offset = p_vout->fmt_in.i_y_offset;
p_vout->fmt_out.i_visible_width = p_vout->fmt_in.i_visible_width;
p_vout->fmt_out.i_visible_height = p_vout->fmt_in.i_visible_height;
+ p_vout->fmt_out.i_aspect = p_vout->fmt_in.i_aspect;
+ 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;
E_(DirectXUpdateRects)( p_vout, VLC_TRUE );
}
p_vout->fmt_in.i_visible_width;
p_vout->fmt_out.i_visible_height = p_sys->p_vout->fmt_in.i_visible_height =
p_vout->fmt_in.i_visible_height;
+ p_vout->fmt_out.i_aspect = p_sys->p_vout->fmt_in.i_aspect =
+ p_vout->fmt_in.i_aspect;
+ p_vout->fmt_out.i_sar_num = p_sys->p_vout->fmt_in.i_sar_num =
+ p_vout->fmt_in.i_sar_num;
+ p_vout->fmt_out.i_sar_den = p_sys->p_vout->fmt_in.i_sar_den =
+ p_vout->fmt_in.i_sar_den;
+ p_vout->output.i_aspect = p_vout->fmt_in.i_aspect;
p_sys->p_vout->i_changes = p_vout->i_changes;
i_ret = p_sys->p_vout->pf_manage( p_sys->p_vout );