From 88f972411444a00ffa4695b087b2ff9939251e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 16 Apr 2019 13:15:40 +0300 Subject: [PATCH] decklink: Add support for widescreen NTSC/PAL Same as non-widescreen but with a different pixel-aspect-ratio. --- sys/decklink/gstdecklink.cpp | 14 ++++++++++++++ sys/decklink/gstdecklink.h | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp index a366f3ca52..f9be663b33 100644 --- a/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp @@ -46,6 +46,12 @@ gst_decklink_mode_get_type (void) {GST_DECKLINK_MODE_NTSC_P, "NTSC SD 60p", "ntsc-p"}, {GST_DECKLINK_MODE_PAL_P, "PAL SD 50p", "pal-p"}, + {GST_DECKLINK_MODE_NTSC_WIDESCREEN, "NTSC SD 60i Widescreen", "ntsc-widescreen"}, + {GST_DECKLINK_MODE_NTSC2398_WIDESCREEN, "NTSC SD 60i Widescreen (24 fps)", "ntsc2398-widescreen"}, + {GST_DECKLINK_MODE_PAL_WIDESCREEN, "PAL SD 50i Widescreen", "pal-widescreen"}, + {GST_DECKLINK_MODE_NTSC_P_WIDESCREEN, "NTSC SD 60p Widescreen", "ntsc-p-widescreen"}, + {GST_DECKLINK_MODE_PAL_P_WIDESCREEN, "PAL SD 50p Widescreen", "pal-p-widescreen"}, + {GST_DECKLINK_MODE_1080p2398, "HD1080 23.98p", "1080p2398"}, {GST_DECKLINK_MODE_1080p24, "HD1080 24p", "1080p24"}, {GST_DECKLINK_MODE_1080p25, "HD1080 25p", "1080p25"}, @@ -252,6 +258,8 @@ gst_decklink_audio_channels_get_type (void) #define NTSC 10, 11, false, "bt601", FALSE #define PAL 12, 11, true, "bt601", FALSE +#define NTSC_WS 40, 33, false, "bt601", FALSE +#define PAL_WS 16, 11, true, "bt601", FALSE #define HD 1, 1, true, "bt709", TRUE #define UHD 1, 1, true, "bt2020", TRUE @@ -264,6 +272,12 @@ static const GstDecklinkMode modes[] = { {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC}, {bmdModePALp, 720, 576, 25, 1, false, PAL}, + {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC_WS}, + {bmdModeNTSC2398, 720, 486, 24000, 1001, true, NTSC_WS}, + {bmdModePAL, 720, 576, 25, 1, true, PAL_WS}, + {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC_WS}, + {bmdModePALp, 720, 576, 25, 1, false, PAL_WS}, + {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false, HD}, {bmdModeHD1080p24, 1920, 1080, 24, 1, false, HD}, {bmdModeHD1080p25, 1920, 1080, 25, 1, false, HD}, diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h index bfddf77596..7b46c9c71d 100644 --- a/sys/decklink/gstdecklink.h +++ b/sys/decklink/gstdecklink.h @@ -63,6 +63,12 @@ typedef enum { GST_DECKLINK_MODE_NTSC_P, GST_DECKLINK_MODE_PAL_P, + GST_DECKLINK_MODE_NTSC_WIDESCREEN, + GST_DECKLINK_MODE_NTSC2398_WIDESCREEN, + GST_DECKLINK_MODE_PAL_WIDESCREEN, + GST_DECKLINK_MODE_NTSC_P_WIDESCREEN, + GST_DECKLINK_MODE_PAL_P_WIDESCREEN, + GST_DECKLINK_MODE_1080p2398, GST_DECKLINK_MODE_1080p24, GST_DECKLINK_MODE_1080p25,