[FFmpeg-devel] [PATCH v2 2/4] avdevice/decklink: add sqd configure
Marton Balint
cus at passwd.hu
Sat Aug 7 20:22:45 EEST 2021
On Fri, 6 Aug 2021, lance.lmwang at gmail.com wrote:
> From: Limin Wang <lance.lmwang at gmail.com>
>
> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> ---
> doc/outdevs.texi | 4 ++++
> libavdevice/decklink_common.cpp | 11 +++++++++++
> libavdevice/decklink_common_c.h | 1 +
> libavdevice/decklink_enc_c.c | 1 +
> 4 files changed, 17 insertions(+)
>
> diff --git a/doc/outdevs.texi b/doc/outdevs.texi
> index dd55904..c4c1eba 100644
> --- a/doc/outdevs.texi
> +++ b/doc/outdevs.texi
> @@ -210,6 +210,10 @@ Sets the video link configuration on the used output. Must be @samp{unset}, @sam
> @samp{dual}, @samp{quad}.
> Defaults to @samp{unset}.
>
> + at item sqd
> +If set to @option{true}, Quad-link SDI is output in Square Division Quad Split mode.
> +Defaults to @option{false}.
Please add an unset mode (-1) for this option and make that the default.
User may not want to override the default configuration.
> +
> @end table
>
> @subsection Examples
> diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
> index d7b4829..bb69a54 100644
> --- a/libavdevice/decklink_common.cpp
> +++ b/libavdevice/decklink_common.cpp
> @@ -221,6 +221,17 @@ int ff_decklink_set_configs(AVFormatContext *avctx,
> av_log(avctx, AV_LOG_WARNING, "Setting link configuration failed.\n");
> else
> av_log(avctx, AV_LOG_VERBOSE, "Successfully set link configuration: 0x%x.\n", ctx->link);
> + if (ctx->link == bmdLinkConfigurationQuadLink && cctx->sqd) {
> +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a0b0400
> + res = ctx->cfg->SetFlag(bmdDeckLinkConfigQuadLinkSDIVideoOutputSquareDivisionSplit, cctx->sqd);
> + if (res != S_OK)
> + av_log(avctx, AV_LOG_WARNING, "Setting SquareDivisionSplit failed.\n");
> + else
> + av_log(avctx, AV_LOG_VERBOSE, "Successfully set SquareDivisionSplit.\n");
> +#else
> + av_log(avctx, AV_LOG_VERBOSE, "Unable to set SquareDivisionSplit, require version of SDK >= 10.11.4.\n");
Just bump the SDK version requirement in configure, 10.11.4 is only
slightly older than 10.10, and there is no reason to support ancient
versions forever.
Thanks,
Marton
> +#endif
> + }
> }
>
> return 0;
> diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h
> index f37e0c0..fdaa1f9 100644
> --- a/libavdevice/decklink_common_c.h
> +++ b/libavdevice/decklink_common_c.h
> @@ -49,6 +49,7 @@ struct decklink_cctx {
> int audio_depth;
> int duplex_mode;
> int link;
> + int sqd;
> DecklinkPtsSource audio_pts_source;
> DecklinkPtsSource video_pts_source;
> int audio_input;
> diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c
> index d85d540..b26c93b 100644
> --- a/libavdevice/decklink_enc_c.c
> +++ b/libavdevice/decklink_enc_c.c
> @@ -40,6 +40,7 @@ static const AVOption options[] = {
> { "single" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 1 }, 0, 0, ENC, "link"},
> { "dual" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 2 }, 0, 0, ENC, "link"},
> { "quad" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 3 }, 0, 0, ENC, "link"},
> + { "sqd" , "set Square Division" , OFFSET(sqd) , AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC },
> { "timing_offset", "genlock timing pixel offset", OFFSET(timing_offset), AV_OPT_TYPE_INT, { .i64 = INT_MIN }, INT_MIN, INT_MAX, ENC, "timing_offset"},
> { "unset" , NULL , 0 , AV_OPT_TYPE_CONST, { .i64 = INT_MIN }, 0, 0, ENC, "timing_offset"},
> { NULL },
> --
> 1.8.3.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>
More information about the ffmpeg-devel
mailing list