From patchwork Fri Aug 13 10:39:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29495 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp694781iov; Fri, 13 Aug 2021 03:39:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzniYHh4sbjFm1IZgzmYCszKAsf7PsLRb42hc2R4ybhb4ty4VA8p4jMQ7bWqCyTtKkXEXy X-Received: by 2002:aa7:c64e:: with SMTP id z14mr2269367edr.41.1628851174578; Fri, 13 Aug 2021 03:39:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628851174; cv=none; d=google.com; s=arc-20160816; b=oFulQX5vsNmyc2w3SIvcHGEJfusNfwYBhXybTFeVPg977iJguzjJ6InMUDS8ZvdmP8 XjpvkthliHkOPxSuMkZP8maS2qck5Q6I25NrJ/FPHa2vhjNguO/jOOjl6Aj7wQYJbILa gOy0xY51SWOa+zHhuatPYQcmFf5ajCWhsqTqDDpfYO27SV8EM3mCTix9p+zNtZIMSS9T AbzJahx4uKZxFvUhw084fER6qpD4HQCEKnpl78IGh09nu0SjjeZ0DbucDguWhtCszYLJ fOgBnqohZdWqpcFK99Migmds8zf5DlL76SNXPBzeE01aEjoCC9+zMhyjlVtapBj7c+R9 vg+Q== 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=HYnhJlFmDMFA8IbdaRM8TJbf/awnA5ZfxGkCqiYuBwA=; b=LGwqgEwGBIdwd286+6vsZpjAUzCWqsQLHwjzpvygXwQC/XyXJrurMVMrpYQc4iCXjM nUT08D/ovp66LDdcZxWDzPEdbvneyIZ6Qm2vOFheUbAsPf5m79U0mkDUJ2FmEAx4yzHC QHLwrOonEysn4AFlyOY0oVDs0oFrDB2413gfe6SDQ0JRc3CJ+sxCCMCBG6ewOcAegdtY MGOH/KIhtFIIJrBakePWxh4i1xPGo8mfHYn8GFT2zg/a5zGzqeKwhKJQ+kMN/zWIXQ2H LWN8Na3yAb/9NpXa8U1DoC41vHqWTQpb9Uvhf8LlNI4G6Hc36nPFOx3opp4S8q5OwXjn 5raw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=d0yhvuMx; 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 n15si1293507ejd.124.2021.08.13.03.39.34; Fri, 13 Aug 2021 03:39:34 -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=d0yhvuMx; 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 DB1F068A3C6; Fri, 13 Aug 2021 13:39:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94870680C01 for ; Fri, 13 Aug 2021 13:39:13 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id e19so11330078pla.10 for ; Fri, 13 Aug 2021 03:39: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=ccDLJfS8Dxx9YBnPvyyf6C1FCn4yo9dreaQbNKI5e0Q=; b=d0yhvuMxcD4O1Jd0WM+yfVigkXt2PuM9I5l+BfOlPvaos63HO8eNFmBq7NRUaOck2E 3tPVX/cCV+H0SRbfKbrHf8tCpUhOyCfTxBMr65XgUwJkZbc8t3C4CK3P3zxMkgtpmWUF aRbm/U0ZVpPY7X3gJUeP5GkUD0VXGiYPxt1lUVaR6cKa0XndG1h9f2bBXbni1HgKXSai obvyj5Ty7dXTWYBlyd4rk/6QzAwknQPckXJV2IMc2N6ofOZg0v8hUuFefWe6saMYZsRu aWx81b4m4EIFJI20ZQk5CQuJr5dBbzjcvInWU0sJFv2pJG+RJawXvh6Wh/eey2Ar0t6l W/OA== 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=ccDLJfS8Dxx9YBnPvyyf6C1FCn4yo9dreaQbNKI5e0Q=; b=jFh7xQSyi1gajwKL744YGzkJbkst4yKcT387tOzLrUImbdg9j+dB01wvmXjBsP8G68 vuK1JuJpsXeJjcrV8aDzejoXn011hVldvhjZXrdRm5UiQNjnv4aXmfZ4mszqLHM08jis cdd2qmFh2bt/X2xFPFcrWXbEuSDLZBOrskhZ3xdKa2ks/uTIhN7yZqv20vmqY4oZ0hKT Cjp68+KDZOxWsAdh83hRK7hJBvv0gexhcsEwo8qrcqm0Zdv/MV0w4rTlMZonGlsdDXcy nOLhyOcyX+DefgCnL5tIUXk8B9t9Ggg8sP+5cmVvE+FANp6V4011SuIBDqENirYQDdoX r8Ow== X-Gm-Message-State: AOAM533bA7rG8FrrARFnqxMDAl4svK1xysy/ZEGXUpIi8FxsC21lXhKb JvCcIaWFTH+xBviGWVR2gV/1zFtz+cM= X-Received: by 2002:a17:902:e851:b029:12c:9284:8c2b with SMTP id t17-20020a170902e851b029012c92848c2bmr1454867plg.57.1628851151885; Fri, 13 Aug 2021 03:39:11 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 128sm1850702pfe.55.2021.08.13.03.39.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 03:39:11 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Aug 2021 18:39:04 +0800 Message-Id: <1628851146-29380-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628851146-29380-1-git-send-email-lance.lmwang@gmail.com> References: <1628037188-8826-1-git-send-email-lance.lmwang@gmail.com> <1628851146-29380-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 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: YoQuI1l75rOb From: Limin Wang Reviewed-by: Marton Balint 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 82639ce..af8a934 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 >= 0x0a0b0000" || die "ERROR: Decklink API version must be >= 10.11"; } } 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 },