summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2021-05-28 09:54:12 -0400
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2021-06-02 13:28:18 -0400
commitbe83a52db953850ffccbb3868dd660e2aa129e5f (patch)
tree99529a4afc9c793e918f4f081682fe8e5994b199
parent21c90afd9242ab14d880bd9cfdf82caf89924351 (diff)
jpegenc: Remove arbitrary encoding size limitation
The encoder is happy to encode with sizes less then 16x16, so remove this arbitrary limitation. This also fixes the fact the sink and src template caps disagree. Fixes #888 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/998>
-rw-r--r--docs/gst_plugins_cache.json2
-rw-r--r--ext/jpeg/gstjpegenc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/gst_plugins_cache.json b/docs/gst_plugins_cache.json
index 8745b9309..a826c415a 100644
--- a/docs/gst_plugins_cache.json
+++ b/docs/gst_plugins_cache.json
@@ -8606,7 +8606,7 @@
"presence": "always"
},
"src": {
- "caps": "image/jpeg:\n width: [ 16, 65535 ]\n height: [ 16, 65535 ]\n framerate: [ 0/1, 2147483647/1 ]\n sof-marker: { (int)0, (int)1, (int)2, (int)4, (int)9 }\n",
+ "caps": "image/jpeg:\n width: [ 1, 65535 ]\n height: [ 1, 65535 ]\n framerate: [ 0/1, 2147483647/1 ]\n sof-marker: { (int)0, (int)1, (int)2, (int)4, (int)9 }\n",
"direction": "src",
"presence": "always"
}
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index 323d7953a..8a4c43b48 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -113,8 +113,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("image/jpeg, "
- "width = (int) [ 16, 65535 ], "
- "height = (int) [ 16, 65535 ], "
+ "width = (int) [ 1, 65535 ], "
+ "height = (int) [ 1, 65535 ], "
"framerate = (fraction) [ 0/1, MAX ], "
"sof-marker = (int) { 0, 1, 2, 4, 9 }")
);