mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin2: Proxy the force-aspect-ratio property of video sinks

Browse source 
Fixes bug #678020.

Conflicts:

	gst/playback/gstplaybin2.c
This commit is contained in:
Sebastian Dröge 2012-06-14 09:32:35 +02:00
parent 32db1ea168
commit ecb22ebd63
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/playback/gstplaybin2.c
View file

@ -390,6 +390,7 @@ struct _GstPlayBin
guint64 buffer_duration; /* When buffering, the max buffer duration (ns) */ guint64 buffer_duration; /* When buffering, the max buffer duration (ns) */
guint buffer_size; /* When buffering, the max buffer size (bytes) */ guint buffer_size; /* When buffering, the max buffer size (bytes) */
gboolean force_aspect_ratio;
/* our play sink */ /* our play sink */
GstPlaySink *playsink; GstPlaySink *playsink;
@ -521,6 +522,7 @@ enum
PROP_BUFFER_DURATION, PROP_BUFFER_DURATION,
PROP_AV_OFFSET, PROP_AV_OFFSET,
PROP_RING_BUFFER_MAX_SIZE, PROP_RING_BUFFER_MAX_SIZE,
PROP_FORCE_ASPECT_RATIO,
PROP_LAST PROP_LAST
}; };
@ -872,7 +874,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* GstQueue2:ring-buffer-max-size * GstPlayBin:ring-buffer-max-size
* *
* The maximum size of the ring buffer in bytes. If set to 0, the ring * The maximum size of the ring buffer in bytes. If set to 0, the ring
* buffer is disabled. Default 0. * buffer is disabled. Default 0.
@ -886,6 +888,18 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
0, G_MAXUINT, DEFAULT_RING_BUFFER_MAX_SIZE, 0, G_MAXUINT, DEFAULT_RING_BUFFER_MAX_SIZE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstPlayBin::force-aspect-ratio:
*
* Requests the video sink to enforce the video display aspect ratio.
*
* Since: 0.10.37
*/
g_object_class_install_property (gobject_klass, PROP_FORCE_ASPECT_RATIO,
g_param_spec_boolean ("force-aspect-ratio", "Force Aspect Ratio",
"When enabled, scaling will respect original aspect ratio", TRUE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* GstPlayBin::about-to-finish * GstPlayBin::about-to-finish
* @playbin: a #GstPlayBin * @playbin: a #GstPlayBin
@ -1396,6 +1410,8 @@ gst_play_bin_init (GstPlayBin * playbin)
playbin->buffer_duration = DEFAULT_BUFFER_DURATION; playbin->buffer_duration = DEFAULT_BUFFER_DURATION;
playbin->buffer_size = DEFAULT_BUFFER_SIZE; playbin->buffer_size = DEFAULT_BUFFER_SIZE;
playbin->ring_buffer_max_size = DEFAULT_RING_BUFFER_MAX_SIZE; playbin->ring_buffer_max_size = DEFAULT_RING_BUFFER_MAX_SIZE;
playbin->force_aspect_ratio = TRUE;
} }
static void static void
@ -2138,6 +2154,10 @@ gst_play_bin_set_property (GObject * object, guint prop_id,
case PROP_RING_BUFFER_MAX_SIZE: case PROP_RING_BUFFER_MAX_SIZE:
playbin->ring_buffer_max_size = g_value_get_uint64 (value); playbin->ring_buffer_max_size = g_value_get_uint64 (value);
break; break;
case PROP_FORCE_ASPECT_RATIO:
g_object_set (playbin->playsink, "force-aspect-ratio",
g_value_get_boolean (value), NULL);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -2334,6 +2354,13 @@ gst_play_bin_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_RING_BUFFER_MAX_SIZE: case PROP_RING_BUFFER_MAX_SIZE:
g_value_set_uint64 (value, playbin->ring_buffer_max_size); g_value_set_uint64 (value, playbin->ring_buffer_max_size);
break; break;
case PROP_FORCE_ASPECT_RATIO:{
gboolean v;
g_object_get (playbin->playsink, "force-aspect-ratio", &v, NULL);
g_value_set_boolean (value, v);
break;
}
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;