FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

assrender: render the subtitles with the proper aspect

Browse Source 
This bumps the libass version requirement to 0.10.2.

https://bugzilla.gnome.org/show_bug.cgi?id=753824
This commit is contained in:
Arnaud Vrac 2015-08-19 13:44:35 +02:00 committed by Sebastian Dröge
parent ebf2a00926
commit 31c6902373
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1837,7 +1837,7 @@ if test "x$BUILD_EXTERNAL" = "xyes"; then
dnl *** assrender *** dnl *** assrender ***
translit(dnm, m, l) AM_CONDITIONAL(USE_ASSRENDER, true) translit(dnm, m, l) AM_CONDITIONAL(USE_ASSRENDER, true)
AG_GST_CHECK_FEATURE(ASSRENDER, [ASS/SSA renderer], assrender, [ AG_GST_CHECK_FEATURE(ASSRENDER, [ASS/SSA renderer], assrender, [
PKG_CHECK_MODULES(ASSRENDER, libass >= 0.9.4, [ PKG_CHECK_MODULES(ASSRENDER, libass >= 0.10.2, [
HAVE_ASSRENDER="yes" ], [ HAVE_ASSRENDER="yes" ], [
HAVE_ASSRENDER="no" HAVE_ASSRENDER="no"
]) ])

24
ext/assrender/gstassrender.c
View File

@ -184,7 +184,6 @@ gst_ass_render_class_init (GstAssRenderClass * klass)
"Sebastian Dröge <sebastian.droege@collabora.co.uk>"); "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
} }
#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00907000
static void static void
_libass_message_cb (gint level, const gchar * fmt, va_list args, _libass_message_cb (gint level, const gchar * fmt, va_list args,
gpointer render) gpointer render)
@ -204,7 +203,6 @@ _libass_message_cb (gint level, const gchar * fmt, va_list args,
g_free (message); g_free (message);
} }
#endif
static void static void
gst_ass_render_init (GstAssRender * render) gst_ass_render_init (GstAssRender * render)
@ -256,9 +254,7 @@ gst_ass_render_init (GstAssRender * render)
g_mutex_init (&render->ass_mutex); g_mutex_init (&render->ass_mutex);
render->ass_library = ass_library_init (); render->ass_library = ass_library_init ();
#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00907000
ass_set_message_cb (render->ass_library, _libass_message_cb, render); ass_set_message_cb (render->ass_library, _libass_message_cb, render);
#endif
ass_set_extract_fonts (render->ass_library, 1); ass_set_extract_fonts (render->ass_library, 1);
render->ass_renderer = ass_renderer_init (render->ass_library); render->ass_renderer = ass_renderer_init (render->ass_library);
@ -784,8 +780,6 @@ gst_ass_render_setcaps_video (GstPad * pad, GstAssRender * render,
{ {
GstQuery *query; GstQuery *query;
gboolean ret = FALSE; gboolean ret = FALSE;
gint par_n = 1, par_d = 1;
gdouble dar;
GstVideoInfo info; GstVideoInfo info;
gboolean attach = FALSE; gboolean attach = FALSE;
gboolean caps_has_meta = TRUE; gboolean caps_has_meta = TRUE;
@ -866,25 +860,15 @@ gst_ass_render_setcaps_video (GstPad * pad, GstAssRender * render,
g_mutex_lock (&render->ass_mutex); g_mutex_lock (&render->ass_mutex);
ass_set_frame_size (render->ass_renderer, render->width, render->height); ass_set_frame_size (render->ass_renderer, render->width, render->height);
ass_set_storage_size (render->ass_renderer,
dar = (((gdouble) par_n) * ((gdouble) render->width)) render->info.width, render->info.height);
/ (((gdouble) par_d) * ((gdouble) render->height)); ass_set_pixel_aspect (render->ass_renderer,
#if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00907000 (gdouble) render->info.par_n / (gdouble) render->info.par_d);
ass_set_aspect_ratio (render->ass_renderer, dar);
#else
ass_set_aspect_ratio (render->ass_renderer,
dar, ((gdouble) render->width) / ((gdouble) render->height));
#endif
ass_set_font_scale (render->ass_renderer, 1.0); ass_set_font_scale (render->ass_renderer, 1.0);
ass_set_hinting (render->ass_renderer, ASS_HINTING_LIGHT); ass_set_hinting (render->ass_renderer, ASS_HINTING_LIGHT);
#if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00907000
ass_set_fonts (render->ass_renderer, "Arial", "sans-serif");
ass_set_fonts (render->ass_renderer, NULL, "Sans");
#else
ass_set_fonts (render->ass_renderer, "Arial", "sans-serif", 1, NULL, 1); ass_set_fonts (render->ass_renderer, "Arial", "sans-serif", 1, NULL, 1);
ass_set_fonts (render->ass_renderer, NULL, "Sans", 1, NULL, 1); ass_set_fonts (render->ass_renderer, NULL, "Sans", 1, NULL, 1);
#endif
ass_set_margins (render->ass_renderer, 0, 0, 0, 0); ass_set_margins (render->ass_renderer, 0, 0, 0, 0);
ass_set_use_margins (render->ass_renderer, 0); ass_set_use_margins (render->ass_renderer, 0);
g_mutex_unlock (&render->ass_mutex); g_mutex_unlock (&render->ass_mutex);