vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_INIT);
vout_statistic_Init(&vout->p->statistic);
- vout->p->i_par_num =
- vout->p->i_par_den = 1;
vout_snapshot_Init(&vout->p->snapshot);
cfg->display.width = display_width > 0 ? display_width : 0;
cfg->display.height = display_height > 0 ? display_height : 0;
cfg->is_display_filled = var_CreateGetBool(vout, "autoscale");
- cfg->display.sar.num = 1; /* TODO monitor AR */
- cfg->display.sar.den = 1;
+ unsigned msar_num, msar_den;
+ if (var_InheritURational(vout, &msar_num, &msar_den, "monitor-par") ||
+ msar_num <= 0 || msar_den <= 0) {
+ msar_num = 1;
+ msar_den = 1;
+ }
+ cfg->display.sar.num = msar_num;
+ cfg->display.sar.den = msar_den;
unsigned zoom_den = 1000;
unsigned zoom_num = zoom_den * var_CreateGetFloat(vout, "scale");
vlc_ureduce(&zoom_num, &zoom_den, zoom_num, zoom_den, 0);
void vout_IntfInit( vout_thread_t *p_vout )
{
vlc_value_t val, text, old_val;
- bool b_force_par = false;
char *psz_buf;
int i;
/* Monitor pixel aspect-ratio */
var_Create( p_vout, "monitor-par", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_vout, "monitor-par", &val );
- if( val.psz_string && *val.psz_string )
- {
- char *psz_parser = strchr( val.psz_string, ':' );
- unsigned int i_aspect_num = 0, i_aspect_den = 0;
- float i_aspect = 0;
- if( psz_parser )
- {
- i_aspect_num = strtol( val.psz_string, 0, 10 );
- i_aspect_den = strtol( ++psz_parser, 0, 10 );
- }
- else
- {
- i_aspect = us_atof( val.psz_string );
- vlc_ureduce( &i_aspect_num, &i_aspect_den,
- i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 );
- }
- if( !i_aspect_num || !i_aspect_den ) i_aspect_num = i_aspect_den = 1;
-
- p_vout->p->i_par_num = i_aspect_num;
- p_vout->p->i_par_den = i_aspect_den;
-
- vlc_ureduce( &p_vout->p->i_par_num, &p_vout->p->i_par_den,
- p_vout->p->i_par_num, p_vout->p->i_par_den, 0 );
-
- msg_Dbg( p_vout, "overriding monitor pixel aspect-ratio: %i:%i",
- p_vout->p->i_par_num, p_vout->p->i_par_den );
- b_force_par = true;
- }
- free( val.psz_string );
/* Aspect-ratio object var */
var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND |
var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
var_Get( p_vout, "aspect-ratio", &old_val );
- if( (old_val.psz_string && *old_val.psz_string) || b_force_par )
+ if( (old_val.psz_string && *old_val.psz_string) )
var_TriggerCallback( p_vout, "aspect-ratio" );
free( old_val.psz_string );