mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

mxfmetadata: Set field-order correctly for interlaced video

Browse source
This commit is contained in:
Sebastian Dröge 2017-07-05 13:59:12 +03:00
parent 1e646472e7
commit 4706447ddc
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/mxf/mxfmetadata.c
View file

@ -4968,6 +4968,14 @@ void mxf_metadata_generic_picture_essence_descriptor_set_caps
|| self->frame_layout == 4) { || self->frame_layout == 4) {
height *= 2; height *= 2;
gst_caps_set_simple (caps, "interlaced", G_TYPE_BOOLEAN, TRUE, NULL); gst_caps_set_simple (caps, "interlaced", G_TYPE_BOOLEAN, TRUE, NULL);
if (self->field_dominance == 2) {
gst_caps_set_simple (caps, "field-order", G_TYPE_STRING,
"bottom-field-first", NULL);
} else {
gst_caps_set_simple (caps, "field-order", G_TYPE_STRING,
"top-field-first", NULL);
}
} }
if (width == 0 || height == 0) { if (width == 0 || height == 0) {
@ -5014,6 +5022,7 @@ gboolean
MXFMetadataFileDescriptor *f = (MXFMetadataFileDescriptor *) self; MXFMetadataFileDescriptor *f = (MXFMetadataFileDescriptor *) self;
GstStructure *s; GstStructure *s;
gboolean interlaced = FALSE; gboolean interlaced = FALSE;
const gchar *field_order = NULL;
g_return_val_if_fail (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR g_return_val_if_fail (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR
(self), FALSE); (self), FALSE);
@ -5021,10 +5030,16 @@ gboolean
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
if (!gst_structure_get_boolean (s, "interlaced", &interlaced) || !interlaced) if (!gst_structure_get_boolean (s, "interlaced", &interlaced) || !interlaced) {
self->frame_layout = 0; self->frame_layout = 0;
else } else {
self->frame_layout = 3; self->frame_layout = 3;
field_order = gst_structure_get_string (s, "field-order");
if (!field_order || strcmp (field_order, "top-field-first") == 0)
self->field_dominance = 1;
else
self->field_dominance = 2;
}
if (!gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d)) { if (!gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d)) {
GST_ERROR ("Invalid framerate"); GST_ERROR ("Invalid framerate");