diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/mxf/mxfjpeg2000.c | 9 |
2 files changed, 13 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2008-12-01 Sebastian Dröge <sebastian.droege@collabora.co.uk> + * 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. + +2008-12-01 Sebastian Dröge <sebastian.droege@collabora.co.uk> + * ext/jp2k/gstjasperdec.c: (gst_jasper_dec_sink_setcaps): * ext/jp2k/gstjasperenc.c: (gst_jasper_enc_reset), (gst_jasper_enc_set_src_caps), (gst_jasper_enc_init_encoder), 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 { |