mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3dvideosink: Rename keep-aspect-ratio to force-aspect-ratio and default to TRUE

Browse source 
For consistency with other video sinks.
This commit is contained in:
Sebastian Dröge 2012-12-22 11:34:43 +01:00
parent 5ea516d735
commit 872dc5feb6
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/d3dvideosink/d3dhelpers.c
View file

@ -685,7 +685,7 @@ d3d_get_render_coordinates (GstD3DVideoSink * sink, gint in_x, gint in_y,
goto end; goto end;
/* Convert window coordinates to source frame pixel coordinates */ /* Convert window coordinates to source frame pixel coordinates */
if (sink->keep_aspect_ratio) { if (sink->force_aspect_ratio) {
GstVideoRectangle tmp = { 0, 0, 0, 0 } GstVideoRectangle tmp = { 0, 0, 0, 0 }
, dst = { , dst = {
0, 0, 0, 0}; 0, 0, 0, 0};
@ -1557,7 +1557,7 @@ d3d_stretch_and_copy (GstD3DVideoSink * sink, LPDIRECT3DSURFACE9 back_buffer)
render_rect = sink->d3d.render_rect; render_rect = sink->d3d.render_rect;
if (sink->keep_aspect_ratio) { if (sink->force_aspect_ratio) {
gint window_width; gint window_width;
gint window_height; gint window_height;
GstVideoRectangle src; GstVideoRectangle src;

18
sys/d3dvideosink/d3dvideosink.c
View file

@ -29,14 +29,14 @@
enum enum
{ {
PROP_0, PROP_0,
PROP_KEEP_ASPECT_RATIO, PROP_FORCE_ASPECT_RATIO,
PROP_CREATE_RENDER_WINDOW, PROP_CREATE_RENDER_WINDOW,
PROP_STREAM_STOP_ON_CLOSE, PROP_STREAM_STOP_ON_CLOSE,
PROP_ENABLE_NAVIGATION_EVENTS, PROP_ENABLE_NAVIGATION_EVENTS,
PROP_LAST PROP_LAST
}; };
#define DEFAULT_KEEP_ASPECT_RATIO FALSE #define DEFAULT_FORCE_ASPECT_RATIO TRUE
#define DEFAULT_CREATE_RENDER_WINDOW TRUE #define DEFAULT_CREATE_RENDER_WINDOW TRUE
#define DEFAULT_STREAM_STOP_ON_CLOSE TRUE #define DEFAULT_STREAM_STOP_ON_CLOSE TRUE
#define DEFAULT_ENABLE_NAVIGATION_EVENTS TRUE #define DEFAULT_ENABLE_NAVIGATION_EVENTS TRUE
@ -123,10 +123,10 @@ gst_d3dvideosink_class_init (GstD3DVideoSinkClass * klass)
/* Add properties */ /* Add properties */
g_object_class_install_property (G_OBJECT_CLASS (klass), g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_KEEP_ASPECT_RATIO, g_param_spec_boolean ("force-aspect-ratio", PROP_FORCE_ASPECT_RATIO, g_param_spec_boolean ("force-aspect-ratio",
"Force aspect ratio", "Force aspect ratio",
"When enabled, scaling will respect original aspect ratio", "When enabled, scaling will respect original aspect ratio",
DEFAULT_KEEP_ASPECT_RATIO, (GParamFlags) G_PARAM_READWRITE)); DEFAULT_FORCE_ASPECT_RATIO, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_CREATE_RENDER_WINDOW, g_param_spec_boolean ("create-render-window", PROP_CREATE_RENDER_WINDOW, g_param_spec_boolean ("create-render-window",
"Create render window", "Create render window",
@ -173,7 +173,7 @@ gst_d3dvideosink_init (GstD3DVideoSink * sink)
gst_value_set_fraction (&sink->par, 1, 1); gst_value_set_fraction (&sink->par, 1, 1);
/* Init Properties */ /* Init Properties */
sink->keep_aspect_ratio = DEFAULT_KEEP_ASPECT_RATIO; sink->force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
sink->create_internal_window = DEFAULT_CREATE_RENDER_WINDOW; sink->create_internal_window = DEFAULT_CREATE_RENDER_WINDOW;
sink->stream_stop_on_close = DEFAULT_STREAM_STOP_ON_CLOSE; sink->stream_stop_on_close = DEFAULT_STREAM_STOP_ON_CLOSE;
sink->enable_navigation_events = DEFAULT_ENABLE_NAVIGATION_EVENTS; sink->enable_navigation_events = DEFAULT_ENABLE_NAVIGATION_EVENTS;
@ -205,8 +205,8 @@ gst_d3dvideosink_set_property (GObject * object, guint prop_id,
GstD3DVideoSink *sink = GST_D3DVIDEOSINK (object); GstD3DVideoSink *sink = GST_D3DVIDEOSINK (object);
switch (prop_id) { switch (prop_id) {
case PROP_KEEP_ASPECT_RATIO: case PROP_FORCE_ASPECT_RATIO:
sink->keep_aspect_ratio = g_value_get_boolean (value); sink->force_aspect_ratio = g_value_get_boolean (value);
break; break;
case PROP_CREATE_RENDER_WINDOW: case PROP_CREATE_RENDER_WINDOW:
sink->create_internal_window = g_value_get_boolean (value); sink->create_internal_window = g_value_get_boolean (value);
@ -230,8 +230,8 @@ gst_d3dvideosink_get_property (GObject * object, guint prop_id, GValue * value,
GstD3DVideoSink *sink = GST_D3DVIDEOSINK (object); GstD3DVideoSink *sink = GST_D3DVIDEOSINK (object);
switch (prop_id) { switch (prop_id) {
case PROP_KEEP_ASPECT_RATIO: case PROP_FORCE_ASPECT_RATIO:
g_value_set_boolean (value, sink->keep_aspect_ratio); g_value_set_boolean (value, sink->force_aspect_ratio);
break; break;
case PROP_CREATE_RENDER_WINDOW: case PROP_CREATE_RENDER_WINDOW:
g_value_set_boolean (value, sink->create_internal_window); g_value_set_boolean (value, sink->create_internal_window);