diff options
Diffstat (limited to 'libass/ass_render.c')
| -rw-r--r-- | libass/ass_render.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c index 8c249e0..b1cfd1a 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -76,7 +76,7 @@ typedef struct { int use_margins; // 0 - place all subtitles inside original frame // 1 - use margins for placing toptitles and subtitles double aspect; // frame aspect ratio, d_width / d_height. - double pixel_ratio; // pixel ratio of the source image + double storage_aspect; // pixel ratio of the source image ass_hinting_t hinting; char *default_font; @@ -3162,7 +3162,7 @@ void ass_set_frame_size(ass_renderer_t *priv, int w, int h) priv->settings.frame_height = h; if (priv->settings.aspect == 0.) { priv->settings.aspect = ((double) w) / h; - priv->settings.pixel_ratio = ((double) w) / h; + priv->settings.storage_aspect = ((double) w) / h; } ass_reconfigure(priv); } @@ -3187,11 +3187,11 @@ void ass_set_use_margins(ass_renderer_t *priv, int use) priv->settings.use_margins = use; } -void ass_set_aspect_ratio(ass_renderer_t *priv, double ar, double par) +void ass_set_aspect_ratio(ass_renderer_t *priv, double dar, double sar) { - if (priv->settings.aspect != ar || priv->settings.pixel_ratio != par) { - priv->settings.aspect = ar; - priv->settings.pixel_ratio = par; + if (priv->settings.aspect != dar || priv->settings.storage_aspect != sar) { + priv->settings.aspect = dar; + priv->settings.storage_aspect = sar; ass_reconfigure(priv); } } @@ -3293,7 +3293,7 @@ ass_start_frame(ass_renderer_t *render_priv, ass_track_t *track, // PAR correction render_priv->font_scale_x = render_priv->settings.aspect / - render_priv->settings.pixel_ratio; + render_priv->settings.storage_aspect; render_priv->prev_images_root = render_priv->images_root; render_priv->images_root = 0; |