From patchwork Fri Aug 13 10:39: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: 29497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp694665iov; Fri, 13 Aug 2021 03:39:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaROC/171h7Of/NcVV6Hrr3V+CWAfktYgm64fjx0u1rk4ldODj7J/caGaLqFSfyhMwzN6D X-Received: by 2002:a50:cac7:: with SMTP id f7mr2239066edi.302.1628851164452; Fri, 13 Aug 2021 03:39:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628851164; cv=none; d=google.com; s=arc-20160816; b=cHeqpcU14C8l/PNJxGQzzwafvP/f0qynJmdS4h2Au6YJT+1zR2BgpHS04kJ74cFP5y EhRMNvFyAj9U8orde4VjmQAvWinhErziOyWUuEg/cBP+ZLyocfOS/bEIMU2JViBE6kqE kxpsS44LnElu+b76XQjS0sjW2wwyy0dhxGolggg345BtkkQj3dkY5JimYXE+07sORnsY AUu9CU9vDu/VPYsK5sTbw4BvrIvoXSfbNlOEORX913sUrV7HJnLBuVUKp+zHlieZLAX1 gqMySyCLBByGQ3hKaaBUB0IPFW3VbtEJ3vavGns6AwHnkno0mb65JNFpaLzE7/UDAvMw aJYA== 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=jHa0+Ivo9OFSbfW1NvwaDk5Py7Jd22ozOmc9SCKe8C0=; b=jMEVJH6rzdwSuA6HDG43ZoqLiKK4JFxTQk9hdRvu/KyoNsoL5II1ZstTQUtB3fQoPv wwQKSI0iUldoVJ2y+3AoeWzKbpC3NAAFp+c+hmhlpNK4AjSuq4w4XxVpFQHRZ1HvzMG0 CtWl0iMAVvfjGKqTo7TsOSwqO48xibMtCOhKj3unfDuV4OW97YmTcwAWv1ZKIt2/ApwN n3kw3XnMxBRZDRhyQz17rvJbQb02NX8J18l5hGsVnHuMdC79rCMj42H5KHlyfnyWZ7Ir DitGFmQrw1QraGBCv90s51kzjvH5GM7pK4PRb6yI6DkumADLWFiScaweEFlcWPEBnY/f FrOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sXRJuJ2p; 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 bm26si1399832edb.367.2021.08.13.03.39.23; Fri, 13 Aug 2021 03:39:24 -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=sXRJuJ2p; 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 A515068A2C0; Fri, 13 Aug 2021 13:39:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D496368A107 for ; Fri, 13 Aug 2021 13:39:12 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id u13-20020a17090abb0db0290177e1d9b3f7so20032466pjr.1 for ; Fri, 13 Aug 2021 03:39:12 -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=FlPZgaZKR6vRHLFIbXNni0kFTS6G9QMWirV0IZAMCtc=; b=sXRJuJ2p9t+fCyrWLEozW8smFx23NaLGECU51fEGMyLQzWpVZx1AaclUlY9IcV8CgW rgX81yqrcqeDsidXlrY3R2AU6e1hz/xD9TcMucobmnsrC75YjzD5cAFCkwVw/9rQcBu0 E+8fdENySpIEDZFZJ54MimWeQ0xoc1Pe1Qm1RyGGFDPPuKbfk+JpXkaDNMALiYqet8Hr ZUpmvH9bfDMrLAcnLpx1ZXpPBdtGBvFEw3dwHEob+SDbp4aNCxRKAg2kztDrSWvF7w72 3Kdw+q/juMrRscBVSaNMoVzlbcrfz2d2nuhqT4QYvB52m1z4fK7MZsn9jazgApuo+BVA N4cQ== 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=FlPZgaZKR6vRHLFIbXNni0kFTS6G9QMWirV0IZAMCtc=; b=oEHGzS/dx/GEaEzIs3RuGCXrOCswqRptZkHYte7AtGFj4R3pVEqsTZ+jCeFpWvl9V/ 7Oi89KPbtqKckWTsPqCPOKQilulLFqwLXtTtNzpYYAOAuwiAargKKaIT5aN/iGZs7TSf xaSpwrJdMI+45kc2C0F8pRdw+ZL+kk0ngFQt8dwLGpo+wOLrkr0YThkly9qPgoqZyna0 n6KiqhFqUi2CM2rGHcXhnWNpunYY/nW5yKMVTrRooMBHPiXtdrz0oBhSV/aeu8hSN9si SlwrkDt/h/1WO/M1sL6gP83aSCpZkkuDc1ZM8W6YKv4A8RwpCSrLGCv4lPOGCXF89hC4 j8kA== X-Gm-Message-State: AOAM530FioMFUoVAZHhGsam8Byz8QgKmlzfZc8auDRf8CJBpO01VFoZB aNL1Z9nqo1JAev3oeKvmkb12oE8+W1U= X-Received: by 2002:a17:902:6905:b029:12b:8f6a:7c60 with SMTP id j5-20020a1709026905b029012b8f6a7c60mr1598732plk.24.1628851150608; Fri, 13 Aug 2021 03:39:10 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 128sm1850702pfe.55.2021.08.13.03.39.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 03:39:10 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Aug 2021 18:39:03 +0800 Message-Id: <1628851146-29380-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 v4 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: igU0X0o/+OKF From: Limin Wang Reviewed-by: Marton Balint 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 },