mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 00:06:36 +00:00
d3dvideosink: Remove non-sense display PAR handling
This has to be implemented properly at some point
This commit is contained in:
parent
020da4c577
commit
c6763c2bbb
2 changed files with 2 additions and 18 deletions
|
@ -91,8 +91,6 @@ static GstFlowReturn gst_d3dvideosink_show_frame (GstVideoSink * vsink,
|
||||||
G_DEFINE_TYPE_WITH_CODE (GstD3DVideoSink, gst_d3dvideosink, GST_TYPE_VIDEO_SINK,
|
G_DEFINE_TYPE_WITH_CODE (GstD3DVideoSink, gst_d3dvideosink, GST_TYPE_VIDEO_SINK,
|
||||||
_do_init);
|
_do_init);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_d3dvideosink_class_init (GstD3DVideoSinkClass * klass)
|
gst_d3dvideosink_class_init (GstD3DVideoSinkClass * klass)
|
||||||
{
|
{
|
||||||
|
@ -138,13 +136,6 @@ gst_d3dvideosink_class_init (GstD3DVideoSinkClass * klass)
|
||||||
"If the render window is closed stop stream",
|
"If the render window is closed stop stream",
|
||||||
DEFAULT_STREAM_STOP_ON_CLOSE,
|
DEFAULT_STREAM_STOP_ON_CLOSE,
|
||||||
(GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
(GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||||
#if 0
|
|
||||||
g_object_class_install_property (G_OBJECT_CLASS (klass),
|
|
||||||
PROP_PIXEL_ASPECT_RATIO, g_param_spec_string ("pixel-aspect-ratio",
|
|
||||||
"Pixel Aspect Ratio",
|
|
||||||
"The pixel aspect ratio of the device", "1/1",
|
|
||||||
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
|
|
||||||
#endif
|
|
||||||
g_object_class_install_property (G_OBJECT_CLASS (klass),
|
g_object_class_install_property (G_OBJECT_CLASS (klass),
|
||||||
PROP_ENABLE_NAVIGATION_EVENTS,
|
PROP_ENABLE_NAVIGATION_EVENTS,
|
||||||
g_param_spec_boolean ("enable-navigation-events",
|
g_param_spec_boolean ("enable-navigation-events",
|
||||||
|
@ -171,9 +162,6 @@ gst_d3dvideosink_init (GstD3DVideoSink * sink)
|
||||||
|
|
||||||
d3d_class_init (sink);
|
d3d_class_init (sink);
|
||||||
|
|
||||||
g_value_init (&sink->par, GST_TYPE_FRACTION);
|
|
||||||
gst_value_set_fraction (&sink->par, 1, 1);
|
|
||||||
|
|
||||||
/* Init Properties */
|
/* Init Properties */
|
||||||
sink->force_aspect_ratio = DEFAULT_FORCE_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;
|
||||||
|
@ -200,7 +188,6 @@ gst_d3dvideosink_finalize (GObject * gobject)
|
||||||
G_OBJECT_CLASS (gst_d3dvideosink_parent_class)->finalize (gobject);
|
G_OBJECT_CLASS (gst_d3dvideosink_parent_class)->finalize (gobject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_d3dvideosink_set_property (GObject * object, guint prop_id,
|
gst_d3dvideosink_set_property (GObject * object, guint prop_id,
|
||||||
const GValue * value, GParamSpec * pspec)
|
const GValue * value, GParamSpec * pspec)
|
||||||
|
@ -545,7 +532,7 @@ gst_d3dvideosink_set_caps (GstBaseSink * bsink, GstCaps * caps)
|
||||||
GstCaps *sink_caps;
|
GstCaps *sink_caps;
|
||||||
gint video_width, video_height;
|
gint video_width, video_height;
|
||||||
gint video_par_n, video_par_d; /* video's PAR */
|
gint video_par_n, video_par_d; /* video's PAR */
|
||||||
gint display_par_n, display_par_d; /* display's PAR */
|
gint display_par_n = 1, display_par_d = 1; /* display's PAR */
|
||||||
guint num, den;
|
guint num, den;
|
||||||
gchar *tmp = NULL;
|
gchar *tmp = NULL;
|
||||||
|
|
||||||
|
@ -586,9 +573,7 @@ gst_d3dvideosink_set_caps (GstBaseSink * bsink, GstCaps * caps)
|
||||||
* convert video width and height to a display width and height
|
* convert video width and height to a display width and height
|
||||||
* using wd / hd = wv / hv * PARv / PARd */
|
* using wd / hd = wv / hv * PARv / PARd */
|
||||||
|
|
||||||
/* get video's PAR */
|
/* TODO: Get display PAR */
|
||||||
display_par_n = gst_value_get_fraction_numerator (&sink->par);
|
|
||||||
display_par_d = gst_value_get_fraction_denominator (&sink->par);
|
|
||||||
|
|
||||||
if (!gst_video_calculate_display_ratio (&num, &den, video_width,
|
if (!gst_video_calculate_display_ratio (&num, &den, video_width,
|
||||||
video_height, video_par_n, video_par_d, display_par_n, display_par_d))
|
video_height, video_par_n, video_par_d, display_par_n, display_par_d))
|
||||||
|
|
|
@ -71,7 +71,6 @@ struct _GstD3DVideoSink
|
||||||
|
|
||||||
GstCaps * supported_caps;
|
GstCaps * supported_caps;
|
||||||
|
|
||||||
GValue par;
|
|
||||||
GstVideoFormat format;
|
GstVideoFormat format;
|
||||||
GstVideoInfo info;
|
GstVideoInfo info;
|
||||||
GstVideoFormatDetails fmt_details;
|
GstVideoFormatDetails fmt_details;
|
||||||
|
|
Loading…
Reference in a new issue