From patchwork Mon Aug 9 23:38:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3301159ioh; Mon, 9 Aug 2021 16:38:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9eA0ocHx3kfhEkz8JI7Vnc5rOdpNtbd6g4GC+0uG5eX1faD0ZwLocyrmaQDyV4PGQrzJ3 X-Received: by 2002:a05:6402:5251:: with SMTP id t17mr1033320edd.157.1628552313604; Mon, 09 Aug 2021 16:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628552313; cv=none; d=google.com; s=arc-20160816; b=e2Puyjd8n5BFsvj81Q0Tn1u339O7wZZ2YZ8KDhJ4yyGgnRRkuhUeKn4U6NCJmYsK+z gb9o4HRxOGPqXt80acVwxZF1aAJ7jjqNEJ3LreP6f7UWleB5t8Jz6qYoQQbYXUV6pPbQ aiDPdebPdQzTVOWxpERze5zaSVCc31/ydQpP9x+RSa8BRihagAYCGi9IXGXRj/037Z7r SpYYJlkOCza83tY1m9Rsle38Y8JMyq2quq0jnhofjKJdTTGBzI1GdSdsjikT1d3GpDJq nql/F1Zf3qMYxK0nRXBi5pm9WshTM7cTl9nW7DTTneqmS2xdj/SvRRSnuys68hGXQ3Qi 1CPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=nahDj4oMVgw8dpTRLlkUBQWuhcyVgKt7IY8GhCa1kjc=; b=RjSrrP+/u6owjnRNtdP5nT9F5530vtwwDMZrtw8sJV3afTJzhosoruwCg6PQCrWK1Y yMHg50dP6ydp5UIpAz7ulkfMNtkWBOli6m+uDhLu/FuXvu1XnNbW/za/lvh8N1IZ/eH1 QfszftEtF+k7kjP4KQ8jDaMMQuQ4abRjqJa8FrikLUQzJh1843W3dWH9cC9jqXUdAcnZ iCzSC6ci22r1bq3NenAIiNXJyt/R6HshvvZS9pLpkU5YtP97leGEy5cQd812lPGReBK5 x1/43xmlX4hVZI6oxnSzX0Q9cahjbRUbKU7HjXDguebtg4J51PqmRh4uLyonMBh90mrA bBdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YXSEpgmw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr16si18306781ejc.736.2021.08.09.16.38.33; Mon, 09 Aug 2021 16:38:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YXSEpgmw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F83868A320; Tue, 10 Aug 2021 02:38:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A102868A33F for ; Tue, 10 Aug 2021 02:38:13 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d17so18416951plr.12 for ; Mon, 09 Aug 2021 16:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dcOdSQpz9epFAwwmtRB8d/gkDNpe4tSyXYJ/Cv0lxss=; b=YXSEpgmwAz/AOHDjynMYRiarZFJcELpssKaBbfsRVCnOwLfBkHu9LjfmGkKRke3xfd keRPfIWV1SigUnW9FO3EVJpp573VYpMemLb3mHG08RaiK/Wmbe0nUV43Qz2SlCpyx+Dg U+p3WEl26OmygebWN0cPIX/6eoZEkPQNuOIpgKHu8gm/Qb4RUN786caqliNWdJvkIvqT hYAKdBAixtqKI7grOQ5ko9+vcei+V/m4KFyCnH+ovdKrIPe9LI3V1X0XAdrJqf8sJdu5 9FMV+gx62XZvB9bLiHWASwKIDrSXxCsh5rJQWdauetkCs+Wh+mQ+ZBfXhgImqAdl956m GEeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dcOdSQpz9epFAwwmtRB8d/gkDNpe4tSyXYJ/Cv0lxss=; b=rY6uzscDe214dpmgxtVNAT7j47iwPMZL6aGS5mB359eBVXZbYshlom6zk3u3g3nQBq gDpWNy8QkGg6N3eDZBtRSMkshY94bS1WhtVkoYDmx7jzWpr3k7moub846mNUIWYqVXNF n3AK/sRbwJ2V3jVX06G3vRuIgvMpkJsFUX+aL3MZ1D4iyY5CmWtCW297UT/wv15icLu6 bKSQjL4hCJJBLqyaTLnx1T2nPJDQIlrKxQrHV33Fd+tnoPUtJGpOCNque6Bi+QEJee5T Kd/sKGvKdbfhVb0nYRv4NdzTH4z5L5Ht0T3+GPWLwneUdenSydOivOEcjt3yoS9zrv/R M8LQ== X-Gm-Message-State: AOAM532EchTgOo3LcPTtoILO8eUFaOhjNddg+ARMjNl9kwHfKSjv/PND 2e37Ll+F3ce6RSBkaUnX5NHgGuIUzzw= X-Received: by 2002:a17:90a:ce16:: with SMTP id f22mr1559228pju.90.1628552290915; Mon, 09 Aug 2021 16:38:10 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n33sm21879307pfv.96.2021.08.09.16.38.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Aug 2021 16:38:10 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Aug 2021 07:38:01 +0800 Message-Id: <1628552283-26880-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628552283-26880-1-git-send-email-lance.lmwang@gmail.com> References: <1628037188-8826-1-git-send-email-lance.lmwang@gmail.com> <1628552283-26880-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/4] avdevice/decklink: add sqd configure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sCQYiWespptT From: Limin Wang Signed-off-by: Limin Wang --- configure | 2 +- doc/outdevs.texi | 5 +++++ libavdevice/decklink_common.cpp | 7 +++++++ libavdevice/decklink_common_c.h | 1 + libavdevice/decklink_enc_c.c | 4 ++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f9fdf58..11f774c 100755 --- a/configure +++ b/configure @@ -6387,7 +6387,7 @@ enabled avisynth && require_headers "avisynth/avisynth_c.h" enabled cuda_nvcc && { check_nvcc cuda_nvcc || die "ERROR: failed checking for nvcc."; } enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint enabled decklink && { require_headers DeckLinkAPI.h && - { test_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a0a0000" || die "ERROR: Decklink API version must be >= 10.10"; } } + { test_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a0b0400" || die "ERROR: Decklink API version must be >= 10.11.4"; } } enabled frei0r && require_headers "frei0r.h dlfcn.h" enabled gmp && require gmp gmp.h mpz_export -lgmp enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init diff --git a/doc/outdevs.texi b/doc/outdevs.texi index f046b23..e3e88b2 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -211,6 +211,11 @@ Sets the SDI video link configuration on the used output. Must be SDI. Defaults to @samp{unset}. +@item sqd +Enable Square Division Quad Split mode for Quad-link SDI output. +Must be @samp{unset}, @samp{true} or @samp{false}. +Defaults to @option{unset}. + @end table @subsection Examples diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 4e0df04..a892a6c 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -221,6 +221,13 @@ 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 >= 0) { + 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"); + } } 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 4d191d8..4bcdbfe 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -40,6 +40,10 @@ 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_INT, { .i64 = -1 }, -1,1, ENC, "sqd"}, + { "unset" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = -1 }, 0, 0, ENC, "sqd"}, + { "false" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 0 }, 0, 0, ENC, "sqd"}, + { "true" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 1 }, 0, 0, ENC, "sqd"}, { "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 },