cbl-2026-05-14

.indent_cpp_list

@@ -14,6 +14,7 @@ subprojects/gst-plugins-bad/sys/d3d11
 subprojects/gst-plugins-bad/sys/d3d12
 subprojects/gst-plugins-bad/sys/dwrite
 subprojects/gst-plugins-bad/sys/hip
+^(subprojects/gst-plugins-bad/sys/decklink2/)+(\w)+([^/])+(cpp$)
 subprojects/gst-plugins-bad/sys/mediafoundation
 subprojects/gst-plugins-bad/sys/nvcodec
 ^(subprojects/gst-plugins-bad/sys/qsv/)+(\w)+([^/])+(cpp$)

subprojects/gst-libav/ext/libav/gstavviddec.c

@@ -2136,9 +2136,10 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
       GstVideoInfo *info = &ffmpegdec->output_state->info;
       if (vmeta->width != GST_VIDEO_INFO_WIDTH (info) ||
           vmeta->height != GST_VIDEO_INFO_HEIGHT (info)) {
-        g_error ("video meta uses %dx%d instead of %dx%d",
+        GST_ERROR_OBJECT (ffmpegdec, "video meta uses %dx%d instead of %dx%d",
             vmeta->width, vmeta->height, GST_VIDEO_INFO_WIDTH (info),
             GST_VIDEO_INFO_HEIGHT (info));
+        GST_VIDEO_CODEC_FRAME_SET_DECODE_ONLY (output_frame);
       }
     }
   }

subprojects/gst-plugins-bad/gst/closedcaption/gstccconverter.c

@@ -1566,14 +1566,20 @@ can_generate_output (GstCCConverter * self)
 
   /* compute the relative frame count for each */
   if (!gst_util_fraction_multiply (self->in_fps_d, self->in_fps_n,
-          self->input_frames, 1, &input_frame_n, &input_frame_d))
-    /* we should never overflow */
-    g_assert_not_reached ();
+          self->input_frames, 1, &input_frame_n, &input_frame_d)) {
+    GST_ERROR_OBJECT (self,
+        "Couldn't get input rate, fps: %d/%d, input frames %d",
+        self->in_fps_n, self->in_fps_d, self->input_frames);
+    return FALSE;
+  }
 
   if (!gst_util_fraction_multiply (self->out_fps_d, self->out_fps_n,
-          self->output_frames, 1, &output_frame_n, &output_frame_d))
-    /* we should never overflow */
-    g_assert_not_reached ();
+          self->output_frames, 1, &output_frame_n, &output_frame_d)) {
+    GST_ERROR_OBJECT (self,
+        "Couldn't get output rate, fps: %d/%d, output frames %d",
+        self->out_fps_n, self->out_fps_d, self->output_frames);
+    return FALSE;
+  }
 
   output_time_cmp = gst_util_fraction_compare (input_frame_n, input_frame_d,
       output_frame_n, output_frame_d);

subprojects/gst-plugins-bad/gst/closedcaption/gstccextractor.c

@@ -45,8 +45,11 @@ enum
 {
   PROP_0,
   PROP_REMOVE_CAPTION_META,
+  PROP_FORCE_EXPOSE_CAPTION_PAD,
 };
 
+#define DEFAULT_FORCE_EXPOSE_CAPTION_PAD FALSE
+
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
@@ -112,6 +115,23 @@ gst_cc_extractor_class_init (GstCCExtractorClass * klass)
           "Remove caption meta from outgoing video buffers", FALSE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstCCExtractor:force-expose-caption-pad
+   *
+   * Exposes caption pad on the first buffer even if caption meta is not
+   * attached on the buffer. When this mode is used, user should configure
+   * ccconverter element so that downstream can handle any caption type update.
+   *
+   * Since: 1.22
+   */
+  g_object_class_install_property (gobject_class, PROP_FORCE_EXPOSE_CAPTION_PAD,
+      g_param_spec_boolean ("force-expose-caption-pad",
+          "Force expose caption pad",
+          "Force expose caption pad on the first buffer",
+          DEFAULT_FORCE_EXPOSE_CAPTION_PAD,
+          G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+          G_PARAM_STATIC_STRINGS));
+
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_cc_extractor_change_state);
 
@@ -340,15 +360,9 @@ forward_sticky_events (GstPad * pad, GstEvent ** event, gpointer user_data)
 }
 
 static GstFlowReturn
-gst_cc_extractor_handle_meta (GstCCExtractor * filter, GstBuffer * buf,
-    GstVideoCaptionMeta * meta, GstVideoTimeCodeMeta * tc_meta)
+gst_cc_extractor_ensure_caption_pad (GstCCExtractor * filter,
+    GstVideoCaptionType caption_type)
 {
-  GstBuffer *outbuf = NULL;
-  GstFlowReturn flow;
-
-  GST_DEBUG_OBJECT (filter, "Handling meta");
-
-  /* Check if the meta type matches the configured one */
   if (filter->captionpad == NULL) {
     GST_DEBUG_OBJECT (filter, "Creating new caption pad");
 
@@ -359,24 +373,55 @@ gst_cc_extractor_handle_meta (GstCCExtractor * filter, GstBuffer * buf,
         GST_DEBUG_FUNCPTR (gst_cc_extractor_iterate_internal_links));
     gst_pad_set_active (filter->captionpad, TRUE);
 
-    filter->caption_type = meta->caption_type;
+    /* When force_expose_caption_pad == TRUE */
+    if (caption_type == GST_VIDEO_CAPTION_TYPE_UNKNOWN) {
+      GstCaps *caps = NULL;
 
-    gst_pad_sticky_events_foreach (filter->sinkpad, forward_sticky_events,
-        filter);
+      /* caption type is unknow at this moment. Adds caption pad first and
+       * picks one caption type supported by downstream (if it's linked) */
+      gst_element_add_pad (GST_ELEMENT (filter), filter->captionpad);
+      gst_flow_combiner_add_pad (filter->combiner, filter->captionpad);
 
-    if (!gst_pad_has_current_caps (filter->captionpad)) {
-      GST_ERROR_OBJECT (filter, "Unknown/invalid caption type");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
+      /* caption pad may be linked on pad-added signal, then query downstream */
+      caps = gst_pad_get_allowed_caps (filter->captionpad);
+      if (!caps || gst_caps_is_any (caps)) {
+        gst_clear_caps (&caps);
+        caps = gst_pad_get_pad_template_caps (filter->captionpad);
+      }
+
+      caps = gst_caps_fixate (caps);
+      caption_type = gst_video_caption_type_from_caps (caps);
+      gst_caps_unref (caps);
+
+      if (caption_type == GST_VIDEO_CAPTION_TYPE_UNKNOWN) {
+        GST_ERROR_OBJECT (filter, "Failed to determine CC type");
+        return GST_FLOW_NOT_NEGOTIATED;
+      }
+
+      filter->caption_type = caption_type;
 
-    gst_element_add_pad (GST_ELEMENT (filter), filter->captionpad);
-    gst_flow_combiner_add_pad (filter->combiner, filter->captionpad);
-  } else if (meta->caption_type != filter->caption_type) {
+      gst_pad_sticky_events_foreach (filter->sinkpad, forward_sticky_events,
+          filter);
+    } else {
+      filter->caption_type = caption_type;
+
+      gst_pad_sticky_events_foreach (filter->sinkpad, forward_sticky_events,
+          filter);
+
+      if (!gst_pad_has_current_caps (filter->captionpad)) {
+        GST_ERROR_OBJECT (filter, "Unknown/invalid caption type");
+        return GST_FLOW_NOT_NEGOTIATED;
+      }
+
+      gst_element_add_pad (GST_ELEMENT (filter), filter->captionpad);
+      gst_flow_combiner_add_pad (filter->combiner, filter->captionpad);
+    }
+  } else if (caption_type != filter->caption_type) {
     GstCaps *caption_caps =
-        create_caps_from_caption_type (meta->caption_type, &filter->video_info);
+        create_caps_from_caption_type (caption_type, &filter->video_info);
 
     GST_DEBUG_OBJECT (filter, "Caption type changed from %d to %d",
-        filter->caption_type, meta->caption_type);
+        filter->caption_type, caption_type);
     if (caption_caps == NULL) {
       GST_ERROR_OBJECT (filter, "Unknown/invalid caption type");
       return GST_FLOW_NOT_NEGOTIATED;
@@ -385,9 +430,25 @@ gst_cc_extractor_handle_meta (GstCCExtractor * filter, GstBuffer * buf,
     gst_pad_push_event (filter->captionpad, gst_event_new_caps (caption_caps));
     gst_caps_unref (caption_caps);
 
-    filter->caption_type = meta->caption_type;
+    filter->caption_type = caption_type;
   }
 
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_cc_extractor_handle_meta (GstCCExtractor * filter, GstBuffer * buf,
+    GstVideoCaptionMeta * meta, GstVideoTimeCodeMeta * tc_meta)
+{
+  GstBuffer *outbuf = NULL;
+  GstFlowReturn flow;
+
+  GST_DEBUG_OBJECT (filter, "Handling meta");
+
+  flow = gst_cc_extractor_ensure_caption_pad (filter, meta->caption_type);
+  if (flow != GST_FLOW_OK)
+    return flow;
+
   GST_DEBUG_OBJECT (filter,
       "Creating new buffer of size %" G_GSIZE_FORMAT " bytes", meta->size);
   /* Extract caption data into new buffer with identical buffer timestamps */
@@ -428,6 +489,9 @@ gst_cc_extractor_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
   gboolean had_cc_meta = FALSE;
   gpointer iter = NULL;
 
+  if (filter->force_expose_caption_pad)
+    flow = gst_cc_extractor_ensure_caption_pad (filter, filter->caption_type);
+
   tc_meta = gst_buffer_get_video_time_code_meta (buf);
 
   while ((cc_meta =
@@ -513,6 +577,9 @@ gst_cc_extractor_set_property (GObject * object, guint prop_id,
     case PROP_REMOVE_CAPTION_META:
       filter->remove_caption_meta = g_value_get_boolean (value);
       break;
+    case PROP_FORCE_EXPOSE_CAPTION_PAD:
+      filter->force_expose_caption_pad = g_value_get_boolean (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -529,6 +596,9 @@ gst_cc_extractor_get_property (GObject * object, guint prop_id, GValue * value,
     case PROP_REMOVE_CAPTION_META:
       g_value_set_boolean (value, filter->remove_caption_meta);
       break;
+    case PROP_FORCE_EXPOSE_CAPTION_PAD:
+      g_value_set_boolean (value, filter->force_expose_caption_pad);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;

subprojects/gst-plugins-bad/gst/closedcaption/gstccextractor.h

@@ -52,6 +52,7 @@ struct _GstCCExtractor
   GstFlowCombiner *combiner;
 
   gboolean remove_caption_meta;
+  gboolean force_expose_caption_pad;
 };
 
 struct _GstCCExtractorClass

subprojects/gst-plugins-bad/gst/closedcaption/gstline21dec.c

@@ -490,6 +490,7 @@ gst_line_21_decoder_scan (GstLine21Decoder * self, GstVideoFrame * frame)
   gint i;
   vbi_sliced sliced[52];
   gboolean found = FALSE;
+  gboolean dual_lines = TRUE;
   guint8 *data;
 
   if (self->mode == GST_LINE_21_DECODER_MODE_DROP &&
@@ -511,13 +512,14 @@ gst_line_21_decoder_scan (GstLine21Decoder * self, GstVideoFrame * frame)
   for (; i < self->max_line_probes && i < GST_VIDEO_FRAME_HEIGHT (frame); i++) {
     gint n_lines;
     data = get_video_data (self, frame, i);
-    /* Scan until we get n_lines == 2 */
+    /* Scan until we get n_lines == 2 (or 1 if only 1 line present) */
     n_lines = vbi_raw_decode (&self->zvbi_decoder, data, sliced);
     GST_DEBUG_OBJECT (self, "i:%d n_lines:%d", i, n_lines);
-    if (n_lines == 2) {
-      GST_DEBUG_OBJECT (self, "Found 2 CC lines at offset %d", i);
+    if (n_lines == 2 || n_lines == 1) {
+      GST_DEBUG_OBJECT (self, "Found %d CC lines at offset %d", n_lines, i);
       self->line21_offset = i;
       found = TRUE;
+      dual_lines = n_lines == 2;
       break;
     } else if (i == self->line21_offset) {
       /* Otherwise if this was the previously probed line offset,
@@ -550,9 +552,11 @@ gst_line_21_decoder_scan (GstLine21Decoder * self, GstVideoFrame * frame)
     ccdata[0] |= (base_line1 < i ? i - base_line1 : 0) & 0x1f;
     ccdata[1] = sliced[0].data[0];
     ccdata[2] = sliced[0].data[1];
-    ccdata[3] |= (base_line2 < i ? i - base_line2 : 0) & 0x1f;
-    ccdata[4] = sliced[1].data[0];
-    ccdata[5] = sliced[1].data[1];
+    if (dual_lines) {
+      ccdata[3] |= (base_line2 < i ? i - base_line2 : 0) & 0x1f;
+      ccdata[4] = sliced[1].data[0];
+      ccdata[5] = sliced[1].data[1];
+    }
     gst_buffer_add_video_caption_meta (frame->buffer,
         GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A, ccdata, 6);
     GST_TRACE_OBJECT (self,

subprojects/gst-plugins-bad/gst/meson.build

@@ -12,6 +12,7 @@ foreach plugin : ['accurip', 'adpcmdec', 'adpcmenc', 'aiff', 'asfmux',
                   'rawparse', 'removesilence', 'rist', 'rtmp2', 'rtp', 'sdp',
                   'segmentclip', 'siren', 'smooth', 'speed', 'subenc', 'switchbin',
                   'tensordecoders', 'timecode', 'transcode', 'unixfd', 'videofilters',
+                  'streamselector',
                   'videoframe_audiolevel', 'videoparsers', 'videosignal',
                   'vmnc']
   subdir(plugin)