Commit e5db2673 authored by Jan Schmidt's avatar Jan Schmidt

matroska-demux: Use gst_video_multiview_guess_half_aspect()

Use the gst_video_multiview_guess_half_aspect() utility function
to set the half-aspect flag (or not) on stereoscopic frame-packed
videos.
parent b7cbfe1f
......@@ -5202,14 +5202,6 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
videocontext->display_width * videocontext->pixel_height,
videocontext->display_height * videocontext->pixel_width, NULL);
}
if (videocontext->multiview_mode != GST_VIDEO_MULTIVIEW_MODE_NONE) {
gst_caps_set_simple (caps,
"multiview-mode", G_TYPE_STRING,
gst_video_multiview_mode_to_caps_string
(videocontext->multiview_mode), "multiview-flags",
GST_TYPE_VIDEO_MULTIVIEW_FLAGSET, videocontext->multiview_flags,
GST_FLAG_SET_MASK_EXACT, NULL);
}
if (videocontext->default_fps > 0.0) {
gint fps_n, fps_d;
......@@ -5239,6 +5231,20 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
gst_structure_set (structure, "interlace-mode", G_TYPE_STRING,
"mixed", NULL);
}
if (videocontext->multiview_mode != GST_VIDEO_MULTIVIEW_MODE_NONE) {
if (gst_video_multiview_guess_half_aspect (videocontext->multiview_mode,
videocontext->pixel_width, videocontext->pixel_height,
videocontext->display_width * videocontext->pixel_height,
videocontext->display_height * videocontext->pixel_width)) {
videocontext->multiview_flags |= GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT;
}
gst_caps_set_simple (caps,
"multiview-mode", G_TYPE_STRING,
gst_video_multiview_mode_to_caps_string
(videocontext->multiview_mode), "multiview-flags",
GST_TYPE_VIDEO_MULTIVIEW_FLAGSET, videocontext->multiview_flags,
GST_FLAG_SET_MASK_EXACT, NULL);
}
caps = gst_caps_simplify (caps);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment