From 0818d7b41d94bfe28ad7c02c8345d6511df88673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 1 Dec 2008 15:50:40 +0000 Subject: gst/mxf/mxfjpeg2000.c: Use new image/x-jpc caps for the raw JPEG2000 codestream. Original commit message from CVS: * gst/mxf/mxfjpeg2000.c: (mxf_jpeg2000_create_caps): Use new image/x-jpc caps for the raw JPEG2000 codestream. For now assume sRGB as colorspace, has to be read from the descriptor somehow later. --- gst/mxf/mxfjpeg2000.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gst') diff --git a/gst/mxf/mxfjpeg2000.c b/gst/mxf/mxfjpeg2000.c index 5b3611bb..ae627dc4 100644 --- a/gst/mxf/mxfjpeg2000.c +++ b/gst/mxf/mxfjpeg2000.c @@ -106,8 +106,8 @@ mxf_jpeg2000_create_caps (MXFMetadataGenericPackage * package, p = (MXFMetadataGenericPictureEssenceDescriptor *) track->descriptor[i]; f = track->descriptor[i]; break; - } else if (((MXFMetadataGenericDescriptor *) track-> - descriptor[i])->is_file_descriptor + } else if (((MXFMetadataGenericDescriptor *) track->descriptor[i])-> + is_file_descriptor && ((MXFMetadataGenericDescriptor *) track->descriptor[i])->type != MXF_METADATA_MULTIPLE_DESCRIPTOR) { f = track->descriptor[i]; @@ -122,7 +122,10 @@ mxf_jpeg2000_create_caps (MXFMetadataGenericPackage * package, *handler = mxf_jpeg2000_handle_essence_element; /* TODO: What about other field values? */ - caps = gst_caps_new_simple ("image/x-j2c", "fields", G_TYPE_INT, 1, NULL); + /* FIXME: For now assume sRGB but get the correct value from the descriptor */ + caps = + gst_caps_new_simple ("image/x-jpc", "fields", G_TYPE_INT, 1, "fourcc", + GST_TYPE_FOURCC, GST_MAKE_FOURCC ('s', 'R', 'G', 'B'), NULL); if (p) { mxf_metadata_generic_picture_essence_descriptor_set_caps (p, caps); } else { -- cgit v1.2.1