WIP more decklink work

2 files changed, 27 insertions, 20 deletions

diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
index 18dc03878..7da4a5950 100644
--- a/sys/decklink/gstdecklink.cpp
+++ b/sys/decklink/gstdecklink.cpp
@@ -471,7 +471,7 @@ gst_decklink_video_format_from_type (BMDPixelFormat pf)
     if (formats[i].format == pf)
       return formats[i].vformat;
   }
-  g_assert_not_reached ();
+  GST_WARNING ("Unknown pixel format 0x%x", pf);
   return GST_VIDEO_FORMAT_UNKNOWN;
 }
 
diff --git a/sys/decklink/gstdecklinkvideosrc.cpp b/sys/decklink/gstdecklinkvideosrc.cpp
index 18291efcf..ed0c47481 100644
--- a/sys/decklink/gstdecklinkvideosrc.cpp
+++ b/sys/decklink/gstdecklinkvideosrc.cpp
@@ -912,25 +912,32 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
 
       vf = gst_decklink_video_format_from_type (vanc_frame->GetPixelFormat ());
 
-      GST_DEBUG_OBJECT (self, "Have ancillary data ?");
-      // FIXME : We are blindly assuming that:
-      //   1) The first active video line is 22
-      //   2) That there is only one field
-      for (fi = 1; fi < 22; fi++) {
-        if (vanc_frame->GetBufferForVerticalBlankingLine (fi,
-                (void **) &vancdata) == S_OK) {
-          GstVideoAncillary gstanc;
-          if (parser == NULL)
-            parser = gst_video_vbi_parser_new (vf, mode->width);
-          GST_DEBUG_OBJECT (self, "Might have data on line %d", fi);
-          gst_video_vbi_parser_add_line (parser, vancdata);
-          while (gst_video_vbi_parser_get_ancillary (parser, &gstanc) == GST_VIDEO_VBI_PARSER_RESULT_OK) {
-	    if (GST_VIDEO_ANCILLARY_DID16 (&gstanc) == GST_VIDEO_ANCILLARY_DID16_S334_EIA_708) {
-	      GST_DEBUG_OBJECT (self, "Adding CEA-708 CDP meta to buffer");
-	      GST_MEMDUMP_OBJECT (self, "CDP", gstanc.data, gstanc.data_count);
-	      gst_buffer_add_video_caption_meta (*buffer, GST_VIDEO_CAPTION_TYPE_CEA708_CDP, gstanc.data, gstanc.data_count);
-	    }
-	  }
+      if (vf != GST_VIDEO_FORMAT_UNKNOWN) {
+        GST_DEBUG_OBJECT (self, "Checking for ancillary data in VBI");
+        // FIXME : We are blindly assuming that:
+        //   1) The first active video line is 22
+        //   2) That there is only one field
+        for (fi = 1; fi < 22; fi++) {
+          if (vanc_frame->GetBufferForVerticalBlankingLine (fi,
+                  (void **) &vancdata) == S_OK) {
+            GstVideoAncillary gstanc;
+            if (parser == NULL)
+              parser = gst_video_vbi_parser_new (vf, mode->width);
+            GST_DEBUG_OBJECT (self, "Might have data on line %d", fi);
+            gst_video_vbi_parser_add_line (parser, vancdata);
+            while (gst_video_vbi_parser_get_ancillary (parser,
+                    &gstanc) == GST_VIDEO_VBI_PARSER_RESULT_OK) {
+              if (GST_VIDEO_ANCILLARY_DID16 (&gstanc) ==
+                  GST_VIDEO_ANCILLARY_DID16_S334_EIA_708) {
+                GST_DEBUG_OBJECT (self, "Adding CEA-708 CDP meta to buffer");
+                GST_MEMDUMP_OBJECT (self, "CDP", gstanc.data,
+                    gstanc.data_count);
+                gst_buffer_add_video_caption_meta (*buffer,
+                    GST_VIDEO_CAPTION_TYPE_CEA708_CDP, gstanc.data,
+                    gstanc.data_count);
+              }
+            }
+          }
         }
       }
       vanc_frame->Release ();