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 }, 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 }, From patchwork Fri Aug 13 10:39:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29494 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp694883iov; Fri, 13 Aug 2021 03:39:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzh/XFIl4MWCgpumyhNm6ZdTYXN0K6mH+6jD/57edVHs6kgx2lWH72TDzU6Y0YWkWh79cNL X-Received: by 2002:a17:906:4943:: with SMTP id f3mr1786028ejt.102.1628851185128; Fri, 13 Aug 2021 03:39:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628851185; cv=none; d=google.com; s=arc-20160816; b=WEEDg1SwdxetNunA246UBLu5R1DBPGdc30+2P0iFhlCx1lDuNqaqKNyreY+SRgLAcW nfrqBcXJKpYZQZxXPibO2SrMe84KNZb2ZwEA5xmd80B+eBIo/F+pFHPTvQYaOmie8j9A efpwALyFzm1KMLVhG1nkNg9WCH8FVsKitOsPWNTNQ6tyK+tH/Mhcp1TTd9ODQiyUU5oM K73wSbxV1MgdT/LU1KKJCAnl7dbk6bdG2u2qqf3g//Jn4EUlV+IJG6dZy/l8yPYeG2cW 2qaPbC4doYa/pOZEeaQQvGGcBqpBK8SLkNvT1HR8bTcWgwdnT7sZQZfPvTjqZh9YJJWl bwZQ== 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=BWbmMB4MvAzvo/Mt28Wj8zRKNxVJyVX/dU1ydEMJilU=; b=ILaa5NAabmVBOC17F9RL0akUL87/LEV/htt68qw/Gu+3QYZb9aXxb9/79UEmg6kGzv iAih0PXhB8rgZLaIQMv0n+fSNTiWiuVtcbrlTCHwg5+RN07ltfWg+AsjjTwNHQhk68P8 eyUrQ4Rena6KPoAa/SPfBbpscEtmHNXEWLD/Y/WZaoVi/sXqwfmHUv4SJC2tgMRJAHxE k6J/nBKD054zaUwIAx1mfePOPYbmfQbxFI7hfP+0pv1sK2XY729p3I5Nem8rd7GvFFeD Q+EP0QENM64AYSFjIEdyj2Y3tv94cYqjhN37ZY6DcxY1Cj0RWYMTR2Aan+G2pj4dNGik PJAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZLhBBfzu; 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 nc19si1085137ejc.426.2021.08.13.03.39.44; Fri, 13 Aug 2021 03:39:45 -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=ZLhBBfzu; 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 C8C6268A46B; Fri, 13 Aug 2021 13:39:23 +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 F3BA768A2C6 for ; Fri, 13 Aug 2021 13:39:14 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id b7so11347267plh.7 for ; Fri, 13 Aug 2021 03:39:14 -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=Lb6UqS0tAtdzosGlCqwN/xf7ogkgxbplvtZY3EI8NdM=; b=ZLhBBfzuAtB2tKo3+fY5DHF9Rav0wAz6lj5SfFuyPgnM3XpfXA1j6Em9DAzZQalmco vKohMSH94Xn6GJ/V2y+ZqQYuMGFvUHTPIo5QVSQkok++H8ZZxbsPBAdVkR0IfQcaqR1B JjzUJzi0f6m9CCdygb1OiT9O+EXxQJqyNrbp6wNmIUiGgEVKZ0Hnnx/N10NjZ155e4iJ a3h/V/AmSYDTThtoAyVNsT3BFgATGaqSiYlEy2raPRxZ/N5E41rccWR3BtcRQ6Ua8+Q9 +zK5o4P1Ig/MqoJD8Quhxhc3lqIDB6dbuAIpCTIIdGgxMUNTMOjn8gwqPncbWwU3WTIA HBuw== 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=Lb6UqS0tAtdzosGlCqwN/xf7ogkgxbplvtZY3EI8NdM=; b=l+0WqINC2Aj/3Z8w9Fys0F88dR624HNnZYY+y5PGUggciqhxK/YJ4EovqJ6L2arVm4 YCjOBoXsTPSaju80SMHugoC3mAMyl3fISjc4posvtg5gK/ZB0O04n0rtssBSUBUO/wIm p6g7tXbLEPuU92OrKy2XcG549WDu/2kxaNdno3cTpDJoMdf25iL0sc0TksKR1mVuktls IAr0+v78Xu9qnW4SbVeSagm2gwp3R4jaWogJj4FrOIXntI6VAx+hNxPyltg0jQ+H4JOH hpPuiGYacDnn8o4CKp+Nk2Dg7Ll4+au7nEiyxcaPXINBdQhY5+ZLr7fL6c2KneOvD5pf cA0w== X-Gm-Message-State: AOAM5304YyXxEpJcjQWjntlnZokgpxrEWtzyDxrQpT0rByBM5zOExkFX wbqqagRynsOb88YwAb/SedLVZbxC+Ls= X-Received: by 2002:a17:90a:2842:: with SMTP id p2mr2095550pjf.196.1628851153238; Fri, 13 Aug 2021 03:39:13 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 128sm1850702pfe.55.2021.08.13.03.39.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 03:39:12 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Aug 2021 18:39:05 +0800 Message-Id: <1628851146-29380-3-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 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: o5evVqwj2MT2 From: Limin Wang Reviewed-by: Marton Balint 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 Fri Aug 13 10:39:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29496 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp694994iov; Fri, 13 Aug 2021 03:39:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIeHgJSbrLzaNqnDzHpOuR869AA7X8w2ifCwo9B3H1UKvJd/ZJi46r9gXJ4WeiFlMj7iQc X-Received: by 2002:a17:906:445:: with SMTP id e5mr1751459eja.497.1628851195345; Fri, 13 Aug 2021 03:39:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628851195; cv=none; d=google.com; s=arc-20160816; b=AiqlA3RY+GktQUbO6N+sMQKAGELHI44fN24r6V8J2RVVRWVfvVef4QuaWYc1AAGH1H 4gNDA11dEQi2xvHsYCJDRc8ui9mAs195fu8xMOC5/dIZ7IvCzFlTDbCk4KdEIdbvjMoR F+F/IbNvZVTHPm/JWILERiQ0SBZtN9nMce0GO71Xf7/3tq0j69s9FkFiIhji8fM/BjYV 2kqsF7veQSleptcRDibEVse8hgHdzBkoSA6ZGToOlwWPmGfKqwciTQkfSmiLmKgPiiQh yX486kL/vKDguitx6WFS7lkjeqtA0I7PffKIYiYDXQRWnvO9jfxcLz1Lh04LZnxdF5cy vtTA== 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=42WkYGE/tkWfnsmRrxBQNw8mZPZo0L1ZYKLlJo42Hos=; b=gZ5jnXVeX2CtyGhg6Yy2+5ggT3LXfqU21rXFDiN6zX4Fa41g2F4vbErbUC1Dpelq4P N7/DM3/nUyPurEE0vJWeg22fwb+FWv+PH/uzDqy4s+PHxe+m2R7Ahe4tbJ+/qhqz27RM fHUv3gl+hKK4EXmsZR9B711QV67AS69dBFIL/JNyVf0zb/MldirX3aFvlazBTK0kurIz 7BrJih8HQCXPu9PHV6JVgYEe5bd0rxoDaQi8wz4b5Almi2KXfjb18eq4FEvCtTqxkR0u XI9TZOuHnfCIveoi2INXWtThRBzBp0cyksofTF9Cs5vObVHxR/N/hhLNDhu63xt85f4v YxIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=m8KVTp4N; 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 cq21si1207098edb.413.2021.08.13.03.39.55; Fri, 13 Aug 2021 03:39:55 -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=m8KVTp4N; 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 AD62668A477; Fri, 13 Aug 2021 13:39:24 +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 77AF8688051 for ; Fri, 13 Aug 2021 13:39:16 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id j1so14609461pjv.3 for ; Fri, 13 Aug 2021 03:39:16 -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=aq9xDYjQJma/1KpHXcoXrgNqF1MYj8fXlW5SfnR5CdY=; b=m8KVTp4N8qp3ehApGOj1mrpoCvbxyu0KIne2Ze7mc5s50ZCZGAUkAzeWZLEkGojkDq oiOkVboe6tBzGZ9P6fdfzXd8eQbvILofyxsB/N/hmNxTeTJU1SggHSeiSxmgHWkNhjzn R2XITeiseCcaBldzg7ArX4oWtPNQWW1/MWS8980ZyKWBAJj63bpGi83q7l2leNrcken1 omDwVr7mocrvJboi6WqjIF5ZqXN6Pt0QsR5GwYMFMFmJv9M8hupRoBgowoDZkpVc+Sgg zT+lW77EsufD5GcFoEJHCoD10SbfoV9Xy4rxbBDgOion0ZHWNz9M4061smIKM7CqygXg GpBQ== 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=aq9xDYjQJma/1KpHXcoXrgNqF1MYj8fXlW5SfnR5CdY=; b=RWdP20OoWSRRP1/gEhh1zUNZdb2Mi9DmBVbJrtNVpG+Jfx+4j0jFGU0QVLxqzQoxeT Ijf/3myMc/vrSsuKPPccA4omfa/UV+90wSqHVKi+9xSWaBWiOHUN0J11yldAySoZri/H SomrF81/G0781MOV9piGN+MgHb0fG4qrPC6Sha3s1bE9VNpJqVop3fWQsUn+5syd+jny iZLKdwtSNwMQrxTGR1lHgZS8Q2MH+dyTX8Cn8HfxPzVsmGgnN7NvD38Y1ea1IEFuJE/V rVSnAG2qRIqh2e9wqwQdOP7mVwvNinePlmOcX4H3/TDkEkcv4v1tp7XI8QJdDxZ49XCA I1qw== X-Gm-Message-State: AOAM533l3tEo3GtsEQFBNiS3yn9s4byS8BHSSoawt37gOjPRfgUVlvOY 9yFG8d+hswHUAalZ7VpazwACWWMvXDs= X-Received: by 2002:a17:90a:f3d2:: with SMTP id ha18mr2041852pjb.68.1628851154552; Fri, 13 Aug 2021 03:39:14 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 128sm1850702pfe.55.2021.08.13.03.39.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 03:39:14 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Aug 2021 18:39:06 +0800 Message-Id: <1628851146-29380-4-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 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: jC/kUhwmJOLh From: Limin Wang Reviewed-by: Marton Balint Signed-off-by: Limin Wang --- doc/indevs.texi | 16 +++++++++++++++- doc/outdevs.texi | 16 +++++++++++++++- libavdevice/decklink_common.cpp | 8 ++++++-- libavdevice/decklink_common.h | 11 +++++++++++ libavdevice/decklink_dec_c.c | 10 ++++++++++ libavdevice/decklink_enc_c.c | 10 ++++++++++ libavdevice/version.h | 2 +- 7 files changed, 68 insertions(+), 5 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index b377924..5be647f 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 modes for DeckLink 8K Pro(with DeckLink SDK >= 11.0): +@samp{one_sub_device_full}, @samp{one_sub_device_half}, @samp{two_sub_device_full}, +@samp{four_sub_device_half} + +Valid profile modes 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..aa41e29 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 modes for DeckLink 8K Pro(with DeckLink SDK >= 11.0): +@samp{one_sub_device_full}, @samp{one_sub_device_half}, @samp{two_sub_device_full}, +@samp{four_sub_device_half} + +Valid profile modes 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..380c6e5 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -182,7 +182,11 @@ 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 = NULL; + + if (ctx->duplex_mode >= FF_ARRAY_ELEMS(decklink_profile_id_map)) + return EINVAL; + 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 +199,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..990fbb8 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 >= 0x0b000000 + { "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"}, diff --git a/libavdevice/version.h b/libavdevice/version.h index 6021a0d..8daeb00 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -29,7 +29,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 59 #define LIBAVDEVICE_VERSION_MINOR 0 -#define LIBAVDEVICE_VERSION_MICRO 100 +#define LIBAVDEVICE_VERSION_MICRO 101 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \