From 01fc474ac2a273aef4266bf1fd8019ece4638bd7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 22 Apr 2019 15:42:12 +0300 Subject: [PATCH] decklink: Allow VANC to be used for all modes --- sys/decklink/gstdecklink.cpp | 8 ++++---- sys/decklink/gstdecklink.h | 1 - sys/decklink/gstdecklinkvideosrc.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp index 920d04f..464b0de 100644 --- a/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp @@ -250,10 +250,10 @@ gst_decklink_audio_channels_get_type (void) return (GType) id; } -#define NTSC 10, 11, false, "bt601", FALSE -#define PAL 12, 11, true, "bt601", FALSE -#define HD 1, 1, true, "bt709", TRUE -#define UHD 1, 1, true, "bt2020", TRUE +#define NTSC 10, 11, false, "bt601" +#define PAL 12, 11, true, "bt601" +#define HD 1, 1, true, "bt709" +#define UHD 1, 1, true, "bt2020" static const GstDecklinkMode modes[] = { {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC}, // default is ntsc diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h index bfddf77..2cd5b1b 100644 --- a/sys/decklink/gstdecklink.h +++ b/sys/decklink/gstdecklink.h @@ -205,7 +205,6 @@ struct _GstDecklinkMode { int par_d; gboolean tff; const gchar *colorimetry; - gboolean vanc; }; const GstDecklinkMode * gst_decklink_get_mode (GstDecklinkModeEnum e); diff --git a/sys/decklink/gstdecklinkvideosrc.cpp b/sys/decklink/gstdecklinkvideosrc.cpp index 8c22702..b7bade4 100644 --- a/sys/decklink/gstdecklinkvideosrc.cpp +++ b/sys/decklink/gstdecklinkvideosrc.cpp @@ -1129,7 +1129,7 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer) // If we have a format that supports VANC and we are asked to extract CC, // then do it here. - if (self->output_cc && mode->vanc && !self->no_signal) + if (self->output_cc && !self->no_signal) extract_cc_from_vbi (self, buffer, vf); if (f.no_signal) -- 2.7.4