openjpegdec: allow multithread decoding only in subframe mode

To avoid mis-ordered frames, allow multithread decoding only in
subframe mode.

Fixes #1786

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4275>

diff --git a/subprojects/gst-plugins-bad/ext/openjpeg/gstopenjpegdec.c b/subprojects/gst-plugins-bad/ext/openjpeg/gstopenjpegdec.c
index 4909d9a..6962134 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/openjpeg/gstopenjpegdec.c
+++ b/subprojects/gst-plugins-bad/ext/openjpeg/gstopenjpegdec.c
@@ -217,10 +217,14 @@ gst_openjpeg_dec_start (GstVideoDecoder * decoder)
 
   GST_DEBUG_OBJECT (self, "Starting");
   self->available_threads = self->max_slice_threads;
-  if (self->available_threads)
-    self->decode_frame = gst_openjpeg_dec_decode_frame_multiple;
-  else
-    self->decode_frame = gst_openjpeg_dec_decode_frame_single;
+  self->decode_frame = gst_openjpeg_dec_decode_frame_single;
+  if (self->available_threads) {
+    if (gst_video_decoder_get_subframe_mode (decoder))
+      self->decode_frame = gst_openjpeg_dec_decode_frame_multiple;
+    else
+      GST_INFO_OBJECT (self,
+          "Multiple threads decoding only available in subframe mode.");
+  }
 
   return TRUE;
 }