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

[767/906] glimagesink: Remove GValue usage for fraction handling

Browse Source
This commit is contained in:
Sebastian Dröge 2013-07-16 14:22:53 +02:00 committed by Matthew Waters
parent 10ca3beee6
commit d64c1aab28
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gst/gl/gstglimagesink.c
View File

@ -224,8 +224,8 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_PIXEL_ASPECT_RATIO, g_object_class_install_property (gobject_class, PROP_PIXEL_ASPECT_RATIO,
g_param_spec_string ("pixel-aspect-ratio", "Pixel Aspect Ratio", gst_param_spec_fraction ("pixel-aspect-ratio", "Pixel Aspect Ratio",
"The pixel aspect ratio of the device", "1/1", "The pixel aspect ratio of the device", 0, 1, G_MAXINT, 1, 0, 1,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_set_metadata (element_class, "OpenGL video sink", gst_element_class_set_metadata (element_class, "OpenGL video sink",
@ -259,7 +259,8 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink)
glimage_sink->clientDrawCallback = NULL; glimage_sink->clientDrawCallback = NULL;
glimage_sink->client_data = NULL; glimage_sink->client_data = NULL;
glimage_sink->keep_aspect_ratio = FALSE; glimage_sink->keep_aspect_ratio = FALSE;
glimage_sink->par = NULL; glimage_sink->par_n = 0;
glimage_sink->par_d = 1;
} }
static void static void
@ -301,13 +302,8 @@ gst_glimage_sink_set_property (GObject * object, guint prop_id,
} }
case PROP_PIXEL_ASPECT_RATIO: case PROP_PIXEL_ASPECT_RATIO:
{ {
g_free (glimage_sink->par); glimage_sink->par_n = gst_value_get_fraction_numerator (value);
glimage_sink->par = g_new0 (GValue, 1); glimage_sink->par_d = gst_value_get_fraction_denominator (value);
g_value_init (glimage_sink->par, GST_TYPE_FRACTION);
if (!g_value_transform (value, glimage_sink->par)) {
g_warning ("Could not transform string to aspect ratio");
gst_value_set_fraction (glimage_sink->par, 1, 1);
}
break; break;
} }
default: default:
@ -325,11 +321,6 @@ gst_glimage_sink_finalize (GObject * object)
glimage_sink = GST_GLIMAGE_SINK (object); glimage_sink = GST_GLIMAGE_SINK (object);
if (glimage_sink->par) {
g_free (glimage_sink->par);
glimage_sink->par = NULL;
}
if (glimage_sink->pool) { if (glimage_sink->pool) {
gst_object_unref (glimage_sink->pool); gst_object_unref (glimage_sink->pool);
glimage_sink->pool = NULL; glimage_sink->pool = NULL;
@ -358,13 +349,7 @@ gst_glimage_sink_get_property (GObject * object, guint prop_id,
g_value_set_boolean (value, glimage_sink->keep_aspect_ratio); g_value_set_boolean (value, glimage_sink->keep_aspect_ratio);
break; break;
case PROP_PIXEL_ASPECT_RATIO: case PROP_PIXEL_ASPECT_RATIO:
if (!glimage_sink->par) { gst_value_set_fraction (value, glimage_sink->par_n, glimage_sink->par_d);
glimage_sink->par = g_new0 (GValue, 1);
g_value_init (glimage_sink->par, GST_TYPE_FRACTION);
gst_value_set_fraction (glimage_sink->par, 1, 1);
}
if (!g_value_transform (glimage_sink->par, value))
g_warning ("Could not transform string to aspect ratio");
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -593,9 +578,9 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
par_n = 1; par_n = 1;
/* get display's PAR */ /* get display's PAR */
if (glimage_sink->par) { if (glimage_sink->par_n != 0 && glimage_sink->par_d != 0) {
display_par_n = gst_value_get_fraction_numerator (glimage_sink->par); display_par_n = glimage_sink->par_n;
display_par_d = gst_value_get_fraction_denominator (glimage_sink->par); display_par_d = glimage_sink->par_d;
} else { } else {
display_par_n = 1; display_par_n = 1;
display_par_d = 1; display_par_d = 1;

2
gst/gl/gstglimagesink.h
View File

@ -71,7 +71,7 @@ struct _GstGLImageSink
volatile gint to_quit; volatile gint to_quit;
gboolean keep_aspect_ratio; gboolean keep_aspect_ratio;
GValue *par; gint par_n, par_d;
GstBufferPool *pool; GstBufferPool *pool;