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 },