From patchwork Wed Aug 4 00:33: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: 29221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2927652ioh; Tue, 3 Aug 2021 17:41:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJ9yzLzp4bhkfbV30QtYul6RGoL4gybQy1T7fd0uEcCz1ZDx2lCEH5J/sAmdj7SzeX5K9M X-Received: by 2002:a05:6402:111a:: with SMTP id u26mr28308325edv.260.1628037689300; Tue, 03 Aug 2021 17:41:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628037689; cv=none; d=google.com; s=arc-20160816; b=A4/5Vio1LpQmXY8mpHVk8M1GxEB8Ra7z3rN2E65b9orIEdC9htTD2Bera3qEElTJsz Bt9zPJJjfqXjpp4+gMYthd5xWmtdggKBYYNTSzzyZFQVdC6KDFgwr15avLczmvFLY8K3 5EWzrYpRMxOCr3Y4PdSaL4/l88Bpgu91F0XUxQPxbxg1RRScsviljGt/h71HMy8pweUH Y7sYtLOYJ1WUd+K0G/dIL9C0WW8373GvyoJJbPDQt9raa4i+Hoa6f6PyKWe/130sAq/5 0DsFpFdPnZ/PlRNqvqAqDxYc6MUUnWuu3lch20H3ubxG6/8nG3K1Xx0Qpjor3BuG4o1y dcBw== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=EWoJjZL6p9O+bPSQ3Eg2/KAsGshJM07NPtrONuXWTUo=; b=p39LPW0qXAr1FUiAenN+Nt8GlaF8PLV4ZqncPjOWcrDq8rkFqC/J7n7aqY9E5GTIuw htflkdF5l47jXNcNs5Yqr525y5v5nLcGR1DOB+pbp3A9Xz2qSjaRizZPsoqFDDdAkthL Qf/CHvGPIRsKjauwD4PHmSpQIyzZeaY5ed/8BHrRYsbOA3J8HW29pNMVOYtPZrPBCVvL 5zLFgQ4yCJ8f/yXdvv2pnpqR5LOStDCp9SNq5HU3N9PGEY3taLcvzVHvRSRTEktEFTU1 TiK6RKNAsni9XbaQk60frC97ESTNOpUh1hrj9vwLQfPAW/v+V+NvlDT6zobLlBTYh4PB jPpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bDswG+LJ; 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 b26si446253eje.399.2021.08.03.17.41.28; Tue, 03 Aug 2021 17:41:29 -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=bDswG+LJ; 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 4283C68A1C3; Wed, 4 Aug 2021 03:41:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f43.google.com (mail-vs1-f43.google.com [209.85.217.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80960680858 for ; Wed, 4 Aug 2021 03:41:19 +0300 (EEST) Received: by mail-vs1-f43.google.com with SMTP id y1so164476vsc.1 for ; Tue, 03 Aug 2021 17:41:19 -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; bh=0eclQwsSarVhM2y6K/R3oZRpFXaxX5txv3UcQe8wlUI=; b=bDswG+LJpjOcOitnfNXmrtY2BNdHP5ns0e7Wbcv9ApDTsxX1LdNsWanrJ/hcyvugNa x9Sxuu6vLni/R5lHixO5lhTsenIKMpyI2C1zjw1V29pzrtigyxlBJLLB9IgDhei5KefG oovaGf9uJWBr26hXYhCbgYqokK+a1NqL12idSS7CoPjeiWV+mw3RWfOkGX9pI1gDu/5z cAqbwn0C4CFxvtAWD5whONVTfk3uWsAdYiV/pz4iLXmKr8s8/cyXRnxA4SNkxdQ3uQ21 b2Guce0w7eEx8qfw/O75W+ZjwSn80M08e2wQBradEO4GQo58zDIlaK9fSPwkHzVHpHA2 hIVQ== 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; bh=0eclQwsSarVhM2y6K/R3oZRpFXaxX5txv3UcQe8wlUI=; b=VurJfB0cg5TFy/1PqEeDKnJnVCJ7KQwv1w6kvLMEJni5MsA8bgWBC9e4Ks9F2GctdG T9nRWQFyt7j1ATWw1RD1obnAFxgj/h0VWvIigfZBBvmbwDoZHte6DDnMPWOYJ0muHLNZ BVQyx/NkFSTyVvsly3EdBUVXv9SWlw+p/YNsVFIy1JSrc/DCaI1RapXyCfMEehpa/MSE rzP9/4WhaXljnEVADhEUgCS0j13qxTfXJPAN4T9z3IaVAZZxx5MEHlhLDXQoYvEdfBRd aIZ24FKl1+IbhdHU7Q2kAMrGyUpxKbWv1ilS3hq5g/oujyf6oSAfub/FBoiCKsSsAwLb YrbA== X-Gm-Message-State: AOAM5306FGHX6hOjcUDl8DKApTI/nsIfcQr7cCXv93m2zCs44CJZAmJB 4kVRXbxK64eG8CRnzNMimIamOfmP6Mc= X-Received: by 2002:a17:903:228c:b029:12c:a49c:10c0 with SMTP id b12-20020a170903228cb029012ca49c10c0mr15026306plh.6.1628037193794; Tue, 03 Aug 2021 17:33:13 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id g1sm386366pfo.0.2021.08.03.17.33.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Aug 2021 17:33:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Aug 2021 08:33:05 +0800 Message-Id: <1628037188-8826-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 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: yX1Gxz3E2y6q From: Limin Wang Signed-off-by: Limin Wang --- doc/outdevs.texi | 5 +++++ 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, 30 insertions(+) diff --git a/doc/outdevs.texi b/doc/outdevs.texi index aaf2479..dd55904 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -205,6 +205,11 @@ Defaults to @samp{unset}. Sets the genlock timing pixel offset on the used output. Defaults to @samp{unset}. +@item link +Sets the video link configuration on the used output. Must be @samp{unset}, @samp{single}, +@samp{dual}, @samp{quad}. +Defaults to @samp{unset}. + @end table @subsection Examples diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 24aa9b1..d7b4829 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..d85d540 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" , "link configure" , 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 },