openjpegdec: Reject stripes for now

They're not implemented.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/979>

diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json
index 521d78d..5aa2ebf 100644 (file)
--- a/docs/plugins/gst_plugins_cache.json
+++ b/docs/plugins/gst_plugins_cache.json
@@ -1,4 +1,4 @@
-{
+       {
     "accurip": {
         "description": "Computes an AccurateRip CRC",
         "elements": {
@@ -217932,7 +217932,7 @@
                 "long-name": "OpenJPEG JPEG2000 decoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "image/x-j2c:\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)YCbCr-4:1:0, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\nimage/x-jpc:\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)YCbCr-4:1:0, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\nimage/jp2:\n",
+                        "caps": "image/x-j2c:\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\nimage/x-jpc:\n      alignment: frame\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)YCbCr-4:1:0, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\nimage/jp2:\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -217983,7 +217983,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "image/x-j2c:\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n num-components: [ 1, 4 ]\n    num-stripes: [ 1, 2147483647 ]\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)YCbCr-4:1:0, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\n     colorspace: { (string)sRGB, (string)sYUV, (string)GRAY }\nimage/x-jpc:\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n num-components: [ 1, 4 ]\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)YCbCr-4:1:0, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\n     colorspace: { (string)sRGB, (string)sYUV, (string)GRAY }\nimage/jp2:\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n",
+                        "caps": "image/x-j2c:\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n num-components: [ 1, 4 ]\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)YCbCr-4:1:0, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\n     colorspace: { (string)sRGB, (string)sYUV, (string)GRAY }\nimage/x-jpc:\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n num-components: [ 1, 4 ]\n    num-stripes: [ 1, 2147483647 ]\n      alignment: { (string)frame, (string)stripe }\n       sampling: { (string)RGB, (string)BGR, (string)RGBA, (string)BGRA, (string)YCbCr-4:4:4, (string)YCbCr-4:2:2, (string)YCbCr-4:2:0, (string)YCbCr-4:1:1, (string)GRAYSCALE, (string)YCbCrA-4:4:4:4 }\n     colorspace: { (string)sRGB, (string)sYUV, (string)GRAY }\nimage/jp2:\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -230150,4 +230150,4 @@
         "tracers": {},
         "url": "Unknown package origin"
     }
-}
\ No newline at end of file
+}

diff --git a/ext/openjpeg/gstopenjpegdec.c b/ext/openjpeg/gstopenjpegdec.c
index e8dd9ae..f3dbd5c 100644 (file)
--- a/ext/openjpeg/gstopenjpegdec.c
+++ b/ext/openjpeg/gstopenjpegdec.c
@@ -69,7 +69,8 @@ static GstStaticPadTemplate gst_openjpeg_dec_sink_template =
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("image/x-j2c, "
         GST_JPEG2000_SAMPLING_LIST "; "
-        "image/x-jpc, " GST_JPEG2000_SAMPLING_LIST "; " "image/jp2")
+        "image/x-jpc, alignment=(string) frame,"
+        GST_JPEG2000_SAMPLING_LIST "; " "image/jp2")
     );
 
 static GstStaticPadTemplate gst_openjpeg_dec_src_template =