From patchwork Mon Aug 9 23:38:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29383 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3301001ioh; Mon, 9 Aug 2021 16:38:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE/tea+a9kkKi3xHIVB+iqIRGSPEreNZ3r1akK2eIL+DMcWNztZAgC3MbO4ZQsGBC6aDw8 X-Received: by 2002:a05:6402:3550:: with SMTP id f16mr462374edd.191.1628552303328; Mon, 09 Aug 2021 16:38:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628552303; cv=none; d=google.com; s=arc-20160816; b=yOWsb6Yiq+ehwtEcbL+O00bETAKCV5Dt4TH7xLFrH0HoLcNqjvhGk/nMZ2zGAusWge dOs2XzzyzJx/RourzJr6ZAB87GS6j7atbeeAgs5ZSIUcBqQtQN4gC/763/hf2fkLZone AVX/8imSkbZDK8I8xVMeSoxU6iCBVKeRuwh4VbAKOx5PMtGMTxI9OoIlsC7xhde09ywr WKGyqTUEglu2XM/mXz/t50gtDnfej9FnyIzVnpRhI9frPCJUwKgztZ/BX2jK9Q092SEW gfgunNA9emK9yC+7leMpIMJHFoSdgOGcFyeFYJnCyTDLBg91zBJZDCVnJTmEMbVi7gD/ C1fg== 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=E7ush+4HhxELXh/0vI3vv83r2YYUsGpeeHxAj8bF69g=; b=Oh7QJB9KpdNMn09fcxwkGiHv23za8McvRfHs8n7BUtKSSlw8f2wqKZeeI9aq1VxDLg TlJcSJZKp+PDbOuCFxybqUk7Z7k7IL5huJclt7xtykIvrwZ0ZgqXaCTZGQn5PkG2F/6f v2y/npX2+gYxBPqPDyK+Jjxw97oYC1sGjj5da5DoOIYjTz1RM4k+APuAiGrxG4pIHCAd iQy3NCuprxgxrEJm8R6E19/tPu8UK0BGXFGV55HVtxz2eZFWZdo2GnOLhuP7d0V5EP+a 118WOTMKWN9DSrnvgwly9LDN+ZvhY2Wu9n6zWpg3l9XCoW601QEyab3EDjiEXW4VZuKs S/Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Jt98OXUV; 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 p15si5443264edq.262.2021.08.09.16.38.22; Mon, 09 Aug 2021 16:38:23 -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=Jt98OXUV; 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 4589B6805B8; Tue, 10 Aug 2021 02:38:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABD5168A273 for ; Tue, 10 Aug 2021 02:38:11 +0300 (EEST) Received: by mail-pj1-f45.google.com with SMTP id mq2-20020a17090b3802b0290178911d298bso2536965pjb.1 for ; Mon, 09 Aug 2021 16:38:11 -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=7Q08b6vSLBapfRZ04vf1yB7zsORN0JujvXwPhcSqgHw=; b=Jt98OXUVEen1F82MA6qYqsNVtUfumalFt+xPhi4wdngPubvoNK+P38aZxrKAFHR9ZQ gsCDch6qt87Tf9ld0RJc7Ix0f5yaRpvr/AuG3kzwDpfqUl638Mt4GCT2uGXNNrc/lCO9 rM7uJO/MEC+jzXaRJwT0p2VslXNxl2nURb78OU7868OBL8SRjm9vr3M5+QFIyLo8WVJI Ke7f3jlqJcOxIr+VJDyqLNGm7A1tl4tTMhfBTbiH2g7OV2KhqHhBPrlmbNRa2oCB4s7O rQYMY9CXB6lpT9+xCsu9CWfZ48O+5PncZ6/v3BJjdkIvipLl8xAJ8W4bKuFZ3b7uVq+/ BhVg== 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=7Q08b6vSLBapfRZ04vf1yB7zsORN0JujvXwPhcSqgHw=; b=FgOJGFVCtBzE0iS8+CuPZFkm7ludueLLPDeMo1a4f7JQiZDNELgnSRTbdyGVJIAa5e qYPya4ecdKUiAryfdah8HQAcv+N7+i7cKNVSHPpgP9XG2hiiwXW0vtwT3j92Wz/QCT9/ IJW0WozDUs5HCTDZA6hq23/kIiyTu6I8SgRg4gQ17nJXlDu1ozexol+JdSRNDppQeVqK nb/37V3PTLvED/aWXNs5Ig7hJbRUI2Rpj4/FPbE0VjTaCKn2EjqDxtrdqUm4W9RMK2O7 VlwDDb8/5pdzmexEAVxozwd9jQ9QNdIT8axjgjC9jhwGXWHHX5l43yUGH3VpmBhYjIke T6fA== X-Gm-Message-State: AOAM5303a7uKQKTPDcJSqRwVr+AYNbNhYtFqMF0DVEIy6OmH3clc9tP0 4lv7mAls+2f1DXwuNYYYLPozGAniNTM= X-Received: by 2002:a17:90b:e82:: with SMTP id fv2mr1615961pjb.99.1628552289640; Mon, 09 Aug 2021 16:38:09 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n33sm21879307pfv.96.2021.08.09.16.38.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Aug 2021 16:38:09 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Aug 2021 07:38:00 +0800 Message-Id: <1628552283-26880-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628037188-8826-1-git-send-email-lance.lmwang@gmail.com> References: <1628037188-8826-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 1/4] avdevice/decklink: add link configuration 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: 1xHZ782WiS00 From: Limin Wang Signed-off-by: Limin Wang --- doc/outdevs.texi | 6 ++++++ libavdevice/decklink_common.cpp | 9 +++++++++ libavdevice/decklink_common.h | 8 ++++++++ libavdevice/decklink_common_c.h | 1 + libavdevice/decklink_enc.cpp | 2 ++ libavdevice/decklink_enc_c.c | 5 +++++ 6 files changed, 31 insertions(+) diff --git a/doc/outdevs.texi b/doc/outdevs.texi index aaf2479..f046b23 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -205,6 +205,12 @@ Defaults to @samp{unset}. Sets the genlock timing pixel offset on the used output. Defaults to @samp{unset}. +@item link +Sets the SDI video link configuration on the used output. Must be +@samp{unset}, @samp{single} link SDI, @samp{dual} link SDI or @samp{quad} link +SDI. +Defaults to @samp{unset}. + @end table @subsection Examples diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 24aa9b1..4e0df04 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -214,6 +214,15 @@ int ff_decklink_set_configs(AVFormatContext *avctx, if (res != S_OK) av_log(avctx, AV_LOG_WARNING, "Setting timing offset failed.\n"); } + + if (direction == DIRECTION_OUT && ctx->link > 0) { + res = ctx->cfg->SetInt(bmdDeckLinkConfigSDIOutputLinkConfiguration, ctx->link); + if (res != S_OK) + 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); + } + return 0; } diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 6e03295..ad8b33c 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -131,6 +131,7 @@ struct decklink_ctx { int64_t teletext_lines; double preroll; int duplex_mode; + BMDLinkConfiguration link; DecklinkPtsSource audio_pts_source; DecklinkPtsSource video_pts_source; int draw_bars; @@ -200,6 +201,13 @@ static const BMDTimecodeFormat decklink_timecode_format_map[] = { #endif }; +static const BMDLinkConfiguration decklink_link_conf_map[] = { + (BMDLinkConfiguration)0, + bmdLinkConfigurationSingleLink, + bmdLinkConfigurationDualLink, + bmdLinkConfigurationQuadLink +}; + int ff_decklink_set_configs(AVFormatContext *avctx, decklink_direction_t direction); int ff_decklink_set_format(AVFormatContext *avctx, int width, int height, int tb_num, int tb_den, enum AVFieldOrder field_order, decklink_direction_t direction = DIRECTION_OUT); int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t direction); diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index 68978fa..f37e0c0 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -48,6 +48,7 @@ struct decklink_cctx { int audio_channels; int audio_depth; int duplex_mode; + int link; DecklinkPtsSource audio_pts_source; DecklinkPtsSource video_pts_source; int audio_input; diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 4c1eb05..6dec5f3 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -559,6 +559,8 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) ctx->list_formats = cctx->list_formats; ctx->preroll = cctx->preroll; ctx->duplex_mode = cctx->duplex_mode; + if (cctx->link > 0 && (unsigned int)cctx->link < FF_ARRAY_ELEMS(decklink_link_conf_map)) + ctx->link = decklink_link_conf_map[cctx->link]; cctx->ctx = ctx; #if CONFIG_LIBKLVANC if (klvanc_context_create(&ctx->vanc_ctx) < 0) { diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c index 828cf5d..4d191d8 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -35,6 +35,11 @@ static const AVOption options[] = { { "unset" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 0 }, 0, 0, ENC, "duplex_mode"}, { "half" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 1 }, 0, 0, ENC, "duplex_mode"}, { "full" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 2 }, 0, 0, ENC, "duplex_mode"}, + { "link" , "single/dual/quad SDI link configuration", OFFSET(link), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, ENC, "link"}, + { "unset" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 0 }, 0, 0, ENC, "link"}, + { "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"}, { "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 }, 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 }, From patchwork Mon Aug 9 23:38:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3301286ioh; Mon, 9 Aug 2021 16:38:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnkX7clLVrkuPHNf9IkXTbJVCPkb/SLSY5t6S7VhekgnFAxVJPaSrq1CEee2QAP2wxz4Ka X-Received: by 2002:aa7:d5c8:: with SMTP id d8mr1135353eds.110.1628552322595; Mon, 09 Aug 2021 16:38:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628552322; cv=none; d=google.com; s=arc-20160816; b=T4loQNhy7JCB60yo/8aycq8JOiG+Tdn/Ku54ehpBAcZ+HgQCi3L+A/QBeCNJBlRydg 0Ihwsr069rameV2BRnCfyPeT+dcBXboeQ1ACankJU+/4RBh8MravyUdBNKszEPglUqjD TBWY4YInEB2neTrOv/9ug2grOKmo+7uhM95GUlQ2kxHydrFL9BHwSsaUBftfGhBftv4u aWN5lMb2mjF73hUF4tgoVVy0cCMrDrdCV7JodBcqGCGL9/pfQlFz0Y0/GllpYN0Qk6aI fM3Te2C7iCWkzaH+jARpCyaaNApWNO3ujvK+iwUFJDWWDlAcfTXKWfjjsQhTgAnqcR81 yJtA== 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=1FwvbyNFcEnT2y8ntHN4YnyW0ELSiQtIc6sXVdTtLz0=; b=sN/J3F3gxDs+YISeECd3wjVmDdEbBo0mX71YMjSFN56dXcKs1AK+p98Iy3fwYLyQ0+ +cwYC74PkpLY3E7X2JulW8diT5C6LCNxokOUEYROPsv3FJ8sLMYQFVEgd9kkK9L8KS7h Mm+DfCsvZ0vPE+v5NSJBp9QC7u0wR2j9jB3YShr9YlYOoeyTE9nCew5byRkK73euKx1c lf++eoamyc5/KwG/5kPylL3DoKyVxXnogGJs115cvQ/T5hvHlH4dWElEGukj1BhA/BUR 0OGQTfYtcy/1J9PxUpq96/QqMEclqOVMz/+wT+h97Br7DAoG6UYJLrvZ+/rzMAaAAuiR cIdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OpXfXOUY; 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 mp40si13101688ejc.179.2021.08.09.16.38.42; Mon, 09 Aug 2021 16:38:42 -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=OpXfXOUY; 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 8027068A404; Tue, 10 Aug 2021 02:38:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06E1A68A2DE for ; Tue, 10 Aug 2021 02:38:14 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id u21-20020a17090a8915b02901782c36f543so1525398pjn.4 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=QnFKjWM11mJYe5qLP9Y09o3FfY28Ztk+snwmYdezDfU=; b=OpXfXOUYqkK0svHh/0GvwfXLWzcTbQWooLNOaFQCdd6ZL8WvTV//iL81IZB8mzx6hY pZZNdMBpVe7pp8ncW8U2RyUzT4WOXqiTOmgM3MITzIkA3ME7Ro1jjMej6Rmh08rmaeNk B3RlfxBYg9EPrOqNAoHPI68vUrF5W/iT/C4ERBiu6hrNL0aoVSB0Cjh3pPZqSViO9LB3 qbUfo3ieHPiOZ0neIZwPgjx4u12afnlG+EnDVbNi1AonFLaU4V61DkIGNJuvx4NrPEL6 jPuMvCneV+RLrXnuLE7kmesUzQpN4OQ2j21t5nmUkMXst5bEGC54cHLpmDsbGLUdPHoz +rxg== 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=QnFKjWM11mJYe5qLP9Y09o3FfY28Ztk+snwmYdezDfU=; b=PlXzo9tlzZFhhn9bHMErfrEiLNtJHU7RNBjlcLwJAoa9VjBNKVjpGb8PGRmhVux1AG qRBODhJ4qZibt0q/Zczx2yTFwFfsL2fLz2jPwIbO0kkhPalvzle5Atp3eguLKKKXiotz 0qL230zYcyumksZWjCB6trBm9GIllI6tNzAr2KoVw6Kj29EESOPrghV+HaHUADK/XFhs NM5Ur7V7s/tCb/u/o149/ST9fQbVA4icUtAUJHetJKQx7DBwDGMR+23E05zYRCa48GjF 283Em5hnvUkf6Of14Nz40oxOUrvLHp2BWeQ7JDFyXXtpjJRlhAe9jcynfsEDV+/VDmIV qLFA== X-Gm-Message-State: AOAM530spm7PfDqEOdGtXG9YopaE5h9EO2oll46I+VzivkUYD4xBKPFo ceWXTRotdEW6Atut4WGG42yU3WjzPPI= X-Received: by 2002:a17:90a:ad07:: with SMTP id r7mr10348627pjq.110.1628552292329; Mon, 09 Aug 2021 16:38:12 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n33sm21879307pfv.96.2021.08.09.16.38.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Aug 2021 16:38:11 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Aug 2021 07:38:02 +0800 Message-Id: <1628552283-26880-3-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 3/4] avdevice/decklink: add level_a 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: zysbTOn5xJ7n From: Limin Wang Signed-off-by: Limin Wang --- doc/outdevs.texi | 5 +++++ libavdevice/decklink_common.cpp | 17 +++++++++++++++++ libavdevice/decklink_common_c.h | 1 + libavdevice/decklink_enc_c.c | 4 ++++ 4 files changed, 27 insertions(+) diff --git a/doc/outdevs.texi b/doc/outdevs.texi index e3e88b2..cc0c94a 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -216,6 +216,11 @@ Enable Square Division Quad Split mode for Quad-link SDI output. Must be @samp{unset}, @samp{true} or @samp{false}. Defaults to @option{unset}. +@item level_a +Enable SMPTE Level A mode on the used 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 a892a6c..0569462 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -230,6 +230,23 @@ int ff_decklink_set_configs(AVFormatContext *avctx, } } + if (direction == DIRECTION_OUT && cctx->level_a >= 0) { + DECKLINK_BOOL level_a_supported = false; + + if (ctx->attr->GetFlag(BMDDeckLinkSupportsSMPTELevelAOutput, &level_a_supported) != S_OK) + level_a_supported = false; + + if (level_a_supported) { + res = ctx->cfg->SetFlag(bmdDeckLinkConfigSMPTELevelAOutput, cctx->level_a); + if (res != S_OK) + av_log(avctx, AV_LOG_WARNING, "Setting SMPTE levelA failed.\n"); + else + av_log(avctx, AV_LOG_VERBOSE, "Successfully set SMPTE levelA.\n"); + } else { + av_log(avctx, AV_LOG_WARNING, "Unable to set SMPTE levelA mode, because it is not supported.\n"); + } + } + return 0; } diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index fdaa1f9..c257721 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -50,6 +50,7 @@ struct decklink_cctx { int duplex_mode; int link; int sqd; + int level_a; 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 4bcdbfe..559f078 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -44,6 +44,10 @@ static const AVOption options[] = { { "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"}, + { "level_a" , "set SMPTE LevelA" , OFFSET(level_a) , AV_OPT_TYPE_INT, { .i64 = -1 }, -1,1, ENC, "level_a"}, + { "unset" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = -1 }, 0, 0, ENC, "level_a"}, + { "false" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 0 }, 0, 0, ENC, "level_a"}, + { "true" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 1 }, 0, 0, ENC, "level_a"}, { "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 }, From patchwork Mon Aug 9 23:38:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3301406ioh; Mon, 9 Aug 2021 16:38:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzijFr33jwtdctO31QselucEQgaAjgfM8nKn/cXIspjJyWr5DP83jP58eZtM4wtde7XbkwN X-Received: by 2002:a17:906:1f54:: with SMTP id d20mr25307855ejk.48.1628552331632; Mon, 09 Aug 2021 16:38:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628552331; cv=none; d=google.com; s=arc-20160816; b=yvmJQbwNGmPdTTLp51/jIBgXMPgFFkKnw7c37k88jTNmo8LdZeN6rlrNQuNT6x5y1A vpX0WgBXffyaubEaZy9aXc2XT0PNvuuIMDxhmDW98Djs6xpzAqq7fF8ZC5lNQbVfI3SQ V0wihPPcXYL13XX84MwE+p5P/yFxDXCEpVOiVZcP6kNdfmF5yu/dR127BW9Pw7IcSV6H Y5NwWJIzfXjaNnfAi6Q2yBH0SANUhjubP//CCKbhNNNL3zbcLa4hfb0nwOi+ca9iwANb b/XaVQViUh9wxK4ial8miOMQgENGzAih2TpqQXipeJb8uJp/RJZGx0Y1FAfNz0c/0QOC +1JA== 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=Fj5IIcyT+osnmWhXfHsoXdZ4r5zbQIVo7uRx1cZGLiM=; b=h+lw4Ypd0uCNr/wzydd+mjEsTN491hY8y5daj+Keg3oNtOTRLI2mEN0TEYcxi8RHIc N4kbkxKV/9wDXxfiYaEqeiKKywVeVGv7NRKO49rwkorG4TCUjLnlz7+3QIVdBeikpk3l XgerDxYFIhvfLJNnFJI6nToXW1op/Ko7uSa3Ts2whYAmGp7TJm7VAJHB4WwrPx+sd8nT kXHOYj1rWmr5GUzALcfS6TxiOfA9FRJkE9h+5hBIKxhd2eJ+iRXYrwbS4RVFmvCKPe2P uDjsoAYk7Y/MGUKr4PtuIX5UfPrq861hBeDOy30FWTqA/qdKCK8BX9yrkxd430RE4fhA ioWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=o1pdfKg3; 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 f26si5460227ejr.32.2021.08.09.16.38.51; Mon, 09 Aug 2021 16:38:51 -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=o1pdfKg3; 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 661F468A41C; Tue, 10 Aug 2021 02:38:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BCAF68A370 for ; Tue, 10 Aug 2021 02:38:15 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id c16so18446865plh.7 for ; Mon, 09 Aug 2021 16:38:15 -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=GyoQ2OsNVDOX0F4jGCrmCMtKoyXbZMbX4/2SHwL1DA4=; b=o1pdfKg35oFqfsnECmGWHXNg7EKrvGWmvmUcB35go/O4SV8dzDMlbblJArKB6K9oCj QqayhQgJOJdb8ceDbwFSirjJLg7F17Iu8slLsmUXq9gaG8wwDBRBkACXZotHmjdM9711 H+GCLBwR3OgFJ8+nWJnI46dqbqEbheOh+4O9tG7sQfZ/SXghacQQvEY1t0lhLAL8t3du AygqP6e5W8pIMrq+FjViDHEekxSGXNiykLWVjXrCGGAU7d8OSaKXoELw2/mfoLupGWM1 cTXplqJI6lfKKqz0wRvUyyXB8iafiywU61K/qYEJlI+sPZjCvyxjxUBmYhXWuQPdpRmj 37Dg== 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=GyoQ2OsNVDOX0F4jGCrmCMtKoyXbZMbX4/2SHwL1DA4=; b=EK8x87N9WmZjgZRabwGjvQx4bKE0YkRmXBQ/+eaHvbsNIpNP1yBCz89N9IXXYY0PJg DTYu4laKHDq+9TrzPADQo2sfoj4u8sz3sdbtMDOKrOmzOB1SW/JY5oJ3p42zgsIc9OEM mAXa7VhPzG7LcpsUfGV1eslVIF2T1q4DmVUGOrpr3hEjL9EP2KGcTQ0zOROOTejFLXC7 Eh7rO/90hNH7cnVgLOSRsIN/sNbQ76aIqXdCxXL1XB1V6Kv4VsaDebTD1rKtojBeAVVw sc9AsCaAlo+5nXBVpDVdItGt0xHimBqv1XGltrYM5PpwrJhiRtEfDmsta6rVPvakemR6 IbLQ== X-Gm-Message-State: AOAM532n+tTqOMJxnceWYIxZZcHTF9sgI/5cmyBCDdhz6UxJtrhV+3Qs 2l2Ex9aw5it6Fn0+HWrCm/Tq1u4K/wA= X-Received: by 2002:aa7:8d54:0:b029:3cd:6ce7:bec6 with SMTP id s20-20020aa78d540000b02903cd6ce7bec6mr3962567pfe.69.1628552293746; Mon, 09 Aug 2021 16:38:13 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n33sm21879307pfv.96.2021.08.09.16.38.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Aug 2021 16:38:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Aug 2021 07:38:03 +0800 Message-Id: <1628552283-26880-4-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 4/4] avdevice/decklink: support for more duplex mode for Decklink 8K Pro 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: 8hkYJG8W1weO From: Limin Wang Signed-off-by: Limin Wang --- doc/indevs.texi | 16 +++++++++++++++- doc/outdevs.texi | 16 +++++++++++++++- libavdevice/decklink_common.cpp | 4 ++-- libavdevice/decklink_common.h | 11 +++++++++++ libavdevice/decklink_dec_c.c | 10 ++++++++++ libavdevice/decklink_enc_c.c | 10 ++++++++++ 6 files changed, 63 insertions(+), 4 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index b377924..c2ec0f4 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -344,9 +344,23 @@ Defines number of audio channels to capture. Must be @samp{2}, @samp{8} or @samp Defaults to @samp{2}. @item duplex_mode -Sets the decklink device duplex mode. Must be @samp{unset}, @samp{half} or @samp{full}. +Sets the decklink device duplex/profile mode. Must be @samp{unset}, @samp{half}, @samp{full}, +@samp{one_sub_device_full}, @samp{one_sub_device_half}, @samp{two_sub_device_full}, +@samp{four_sub_device_half} Defaults to @samp{unset}. +Note: DeckLink SDK 11.0 have replaced the duplex property by a profile property. +For the DeckLink Duo 2 and DeckLink Quad 2, a profile is shared between any 2 +sub-devices that utilize the same connectors. For the DeckLink 8K Pro, a profile +is shared between all 4 sub-devices. So DeckLink 8K Pro support four profiles. + +Valid profile mode for DeckLink 8K Pro(Updated DeckLink SDK to >= 11.0): +@samp{one_sub_device_full}, @samp{one_sub_device_half}, @samp{two_sub_device_full}, +@samp{four_sub_device_half} + +Valid profile mode for DeckLink Quad 2 and DeckLink Duo 2: +@samp{half}, @samp{full} + @item timecode_format Timecode type to include in the frame and video stream metadata. Must be @samp{none}, @samp{rp188vitc}, @samp{rp188vitc2}, @samp{rp188ltc}, diff --git a/doc/outdevs.texi b/doc/outdevs.texi index cc0c94a..47dd913 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -198,9 +198,23 @@ Amount of time to preroll video in seconds. Defaults to @option{0.5}. @item duplex_mode -Sets the decklink device duplex mode. Must be @samp{unset}, @samp{half} or @samp{full}. +Sets the decklink device duplex/profile mode. Must be @samp{unset}, @samp{half}, @samp{full}, +@samp{one_sub_device_full}, @samp{one_sub_device_half}, @samp{two_sub_device_full}, +@samp{four_sub_device_half} Defaults to @samp{unset}. +Note: DeckLink SDK 11.0 have replaced the duplex property by a profile property. +For the DeckLink Duo 2 and DeckLink Quad 2, a profile is shared between any 2 +sub-devices that utilize the same connectors. For the DeckLink 8K Pro, a profile +is shared between all 4 sub-devices. So DeckLink 8K Pro support four profiles. + +Valid profile mode for DeckLink 8K Pro(Updated DeckLink SDK to >= 11.0): +@samp{one_sub_device_full}, @samp{one_sub_device_half}, @samp{two_sub_device_full}, +@samp{four_sub_device_half} + +Valid profile mode for DeckLink Quad 2 and DeckLink Duo 2: +@samp{half}, @samp{full} + @item timing_offset Sets the genlock timing pixel offset on the used output. Defaults to @samp{unset}. diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 0569462..8e77f4d 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -182,7 +182,7 @@ int ff_decklink_set_configs(AVFormatContext *avctx, if (duplex_supported) { #if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 IDeckLinkProfile *profile = NULL; - BMDProfileID bmd_profile_id = ctx->duplex_mode == 2 ? bmdProfileOneSubDeviceFullDuplex : bmdProfileTwoSubDevicesHalfDuplex; + BMDProfileID bmd_profile_id = decklink_profile_id_map[ctx->duplex_mode]; res = manager->GetProfile(bmd_profile_id, &profile); if (res == S_OK) { res = profile->SetActive(); @@ -195,7 +195,7 @@ int ff_decklink_set_configs(AVFormatContext *avctx, if (res != S_OK) av_log(avctx, AV_LOG_WARNING, "Setting duplex mode failed.\n"); else - av_log(avctx, AV_LOG_VERBOSE, "Successfully set duplex mode to %s duplex.\n", ctx->duplex_mode == 2 ? "full" : "half"); + av_log(avctx, AV_LOG_VERBOSE, "Successfully set duplex mode to %s duplex.\n", ctx->duplex_mode == 2 || ctx->duplex_mode == 4 ? "full" : "half"); } else { av_log(avctx, AV_LOG_WARNING, "Unable to set duplex mode, because it is not supported.\n"); } diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index ad8b33c..5b11dcd 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -208,6 +208,17 @@ static const BMDLinkConfiguration decklink_link_conf_map[] = { bmdLinkConfigurationQuadLink }; +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 +static const BMDProfileID decklink_profile_id_map[] = { + (BMDProfileID)0, + bmdProfileTwoSubDevicesHalfDuplex, + bmdProfileOneSubDeviceFullDuplex, + bmdProfileOneSubDeviceHalfDuplex, + bmdProfileTwoSubDevicesFullDuplex, + bmdProfileFourSubDevicesHalfDuplex, +}; +#endif + int ff_decklink_set_configs(AVFormatContext *avctx, decklink_direction_t direction); int ff_decklink_set_format(AVFormatContext *avctx, int width, int height, int tb_num, int tb_den, enum AVFieldOrder field_order, decklink_direction_t direction = DIRECTION_OUT); int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t direction); diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index 1d93e8b..2159702 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -45,10 +45,20 @@ static const AVOption options[] = { { "standard", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0x7fff9fffeLL}, 0, 0, DEC, "teletext_lines"}, { "all", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0x7ffffffffLL}, 0, 0, DEC, "teletext_lines"}, { "channels", "number of audio channels", OFFSET(audio_channels), AV_OPT_TYPE_INT , { .i64 = 2 }, 2, 16, DEC }, +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 + { "duplex_mode", "duplex mode", OFFSET(duplex_mode), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 5, DEC, "duplex_mode"}, +#else { "duplex_mode", "duplex mode", OFFSET(duplex_mode), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, DEC, "duplex_mode"}, +#endif { "unset", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0}, 0, 0, DEC, "duplex_mode"}, { "half", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1}, 0, 0, DEC, "duplex_mode"}, { "full", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2}, 0, 0, DEC, "duplex_mode"}, +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 + { "one_sub_device_full", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2}, 0, 0, DEC, "duplex_mode"}, + { "one_sub_device_half", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3}, 0, 0, DEC, "duplex_mode"}, + { "two_sub_device_full", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 4}, 0, 0, DEC, "duplex_mode"}, + { "four_sub_device_half", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 5}, 0, 0, DEC, "duplex_mode"}, +#endif { "timecode_format", "timecode format", OFFSET(tc_format), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 8, DEC, "tc_format"}, { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0}, 0, 0, DEC, "tc_format"}, { "rp188vitc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1}, 0, 0, DEC, "tc_format"}, diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c index 559f078..d86ba1f 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -31,10 +31,20 @@ static const AVOption options[] = { { "list_devices", "use ffmpeg -sinks decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, ENC }, { "preroll" , "video preroll in seconds", OFFSET(preroll ), AV_OPT_TYPE_DOUBLE, { .dbl = 0.5 }, 0, 5, ENC }, +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 + { "duplex_mode" , "duplex mode" , OFFSET(duplex_mode ), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 5, ENC, "duplex_mode"}, +#else { "duplex_mode" , "duplex mode" , OFFSET(duplex_mode ), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 2, ENC, "duplex_mode"}, +#endif { "unset" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 0 }, 0, 0, ENC, "duplex_mode"}, { "half" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 1 }, 0, 0, ENC, "duplex_mode"}, { "full" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 2 }, 0, 0, ENC, "duplex_mode"}, +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b020000 + { "one_sub_device_full", NULL ,0 , AV_OPT_TYPE_CONST , { .i64 = 2 }, 0, 0, ENC, "duplex_mode"}, + { "one_sub_device_half", NULL ,0 , AV_OPT_TYPE_CONST , { .i64 = 3 }, 0, 0, ENC, "duplex_mode"}, + { "two_sub_device_full", NULL ,0 , AV_OPT_TYPE_CONST , { .i64 = 4 }, 0, 0, ENC, "duplex_mode"}, + { "four_sub_device_half", NULL ,0 , AV_OPT_TYPE_CONST , { .i64 = 5 }, 0, 0, ENC, "duplex_mode"}, +#endif { "link" , "single/dual/quad SDI link configuration", OFFSET(link), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, ENC, "link"}, { "unset" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 0 }, 0, 0, ENC, "link"}, { "single" , NULL , 0 , AV_OPT_TYPE_CONST , { .i64 = 1 }, 0, 0, ENC, "link"},