From patchwork Fri Aug 6 01:24:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp91817ioh; Thu, 5 Aug 2021 18:25:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+eS74xvGc2WyFtUmshjIhB/evNLwFGlf7qKjN+RhcEqGgBahqoy364cdWkYWibAev/K/b X-Received: by 2002:aa7:cc83:: with SMTP id p3mr10048842edt.365.1628213121585; Thu, 05 Aug 2021 18:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628213121; cv=none; d=google.com; s=arc-20160816; b=Lva19X9OM2WGQgpzVYY6eqnxcdnpmudDg30Qly5wWLvfwSziZrY/M7zXpHaAoAXaA+ LqNUxx7dcKE/lr12vVT+coV51Vm562sJKslA6x7tGJE3pOzn3atB+ZefazSyIawYK2Dn 25NYqYJXzfhW9uw5dxMxCEPKyH1YyFEdb3f2FtRycte2yGnAXMm4K8N1GiDwGpQkA/Vh QVfq2NURyME40QhSdztg93bBrnveM/6aCR0TpDuHem7DQBE2Tu6TPhz5oCJZC5vrYdxq 8LIrfQNvcc/2T8SO0ygbZ/8jiwIKQMxlDthTKKolqY575Uk36gW063VAG69AaY9HAbSM sqIA== 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=qf2rBIqCbZplGnrBfHhnE5laQIgGsWWuGuV3T92QunM=; b=iGQUo6JLGqNPfebfKdkgaYVr2iM3b2TRS4kzXZaKTOdjyq9oD1uX7Khv+tWkYglf4t bJsyBNVOvxU/tW/LBm2+HpXLmU8pCp5uXRNk/sMoI6eJozzYcWK1BdfQcGhHddCW6ePH T9rtYSwz7Cia93/b2QNikU9EOqZGAFeq2v5ecxDJn2ytRGdDCqShevkquvs3zofAH9M4 A7gcUqpO/RJ+Dd5BPpmrQ9rNh3iRB4nRubyJgNCW5J4xd1Ik/BLs26C10tYN86DiCPoU bmxUeXPy9ccD7rz3NhC60dt6xQb7Fa+4ZzP9/qr+7+Mu69aLldr3wdW5+Ej3KaOTgty2 jLDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=urlY7CNy; 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 dr21si6823346ejc.474.2021.08.05.18.25.21; Thu, 05 Aug 2021 18:25:21 -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=urlY7CNy; 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 09C36689FB4; Fri, 6 Aug 2021 04:25:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 227CC680518 for ; Fri, 6 Aug 2021 04:24:56 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id l19so13413903pjz.0 for ; Thu, 05 Aug 2021 18:24:56 -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=4QCPfXUwS2FnUqHUMMEqdV+CTzMuG0fChucNGwasyCE=; b=urlY7CNyY2boIDRE8OFCxJIPrNBLlV2YgRlO+M/oWZ3OBukrwTi0x0fzOtnp8/X87s EfaqaRAXp/+fpaDMgq8ZrqCG7+89Gy+c4vdxwR4n1t2PV97nBeQWH3fth2H4rfiFJUHC AU5bD0N9y1ss/bQnBPPqCWdiGWb7i1e+V8Nz8PG8JgAM5xdv9Z1MXPGmF8+jJLA/o6fq IHVUjZK08DJmtL0cIHTMYZhPoXw5wTGsXGBBslaVkFtzNYgK7Mw49FYqzotD3+mjPpfp iBKraGsTWw8HPDDHF3BOBgdAYg92EHcveRP+Uode0l27gYl150SqfTrVjt0NcASgFl7a GATg== 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=4QCPfXUwS2FnUqHUMMEqdV+CTzMuG0fChucNGwasyCE=; b=ENe/DPbrrCZePkzwuADAvPJoDZeZZizKl7Y5NpG5+IWdDZftuMxNkmuBWixIdNwoai UdCiQGpPADipX4X3WIuCBsPHBz3cGJ9x4REz7HuGk3X2V92qUDwQJuH+t/cZ6nNZOkEE 8AIYYwY6gL86Z4LYZkGlH3FGYuFmG/SLXpoq58li7i0e2aLyPMfAq4QFjB3ZnTT25F8S 0POHEnZqX4nw/rPVTPm9++BkCZuM9AFqy8zKxAaeneBesT/FkeKJsTQZjfZPSMyxL/1M epwx+fMc3p6L1P8fOf/O6HOQL1Mx7ZMp57hXyoad5G6jEzT7Gb77+kHo7zk4LJGrWJlx +K2Q== X-Gm-Message-State: AOAM532yjWNFdvSNii1nt4bR4UQnrS+BDxRry1VtmhZo6KTKB/Ai/mCN mWugayTWhh57UUv9PonyqdH2ajiyRUM= X-Received: by 2002:a17:902:e74d:b029:12b:e3f2:f5d3 with SMTP id p13-20020a170902e74db029012be3f2f5d3mr6421826plf.82.1628213094493; Thu, 05 Aug 2021 18:24:54 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x8sm7426339pjn.10.2021.08.05.18.24.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Aug 2021 18:24:54 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Aug 2021 09:24:45 +0800 Message-Id: <1628213087-15896-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628213087-15896-1-git-send-email-lance.lmwang@gmail.com> References: <1628037188-8826-1-git-send-email-lance.lmwang@gmail.com> <1628213087-15896-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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: xmPMi7p1GcOS From: Limin Wang Signed-off-by: Limin Wang --- 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}. +@item sqd +If set to @option{true}, Quad-link SDI is output in Square Division Quad Split mode. +Defaults to @option{false}. + @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"); +#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 },