From patchwork Mon Mar 27 19:58:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp1604170pzh; Mon, 27 Mar 2023 12:58:25 -0700 (PDT) X-Google-Smtp-Source: AKy350ZK9+BzvyaOhzunvEXz2QS8IQ3q211i+OELG/84sEk880vWkwSepTmKOa8PD7TSg0waoiio X-Received: by 2002:a17:907:6a11:b0:93e:5a85:ad3c with SMTP id rf17-20020a1709076a1100b0093e5a85ad3cmr13295724ejc.57.1679947105730; Mon, 27 Mar 2023 12:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679947105; cv=none; d=google.com; s=arc-20160816; b=wsUecNPgRL5PXFka5Si8bbL7ab4+RcgDodDhUBCZCGELvRR0Is7mSDo/PKS7fWyCbb AbrkH5To3V6UMS60vSmxs9EV/O/wS5x2uiemRJFWuMqKgyCBIZCWoYJyxAQuKw6lgFEp GruijwyWL52KgC1ZBCKIjQ9ehRRdVlNkQmaOL0zI/CCVRTBE3N25pAJSwVfuc8/qC/3I 9MZtOaR3OWELYRGpOsM1e08qXUyxtKGk9gz71aBnk1j4vpodzrp4/wWnNG8h/O8Qz1c/ ZeEEny3fJplI22KMVQCfcJ+KJVxCCfj/JvdYImWkC9cCrFFSaatW6TAQvaQuRDexpHKP J/WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=hvLHXO50HuSBvKrek9VgWytQQYyFkIDMMVARS+3H8gI=; b=NiBbLf9+oFxHE/L4e6IAZH/wJpBxobLVGIj7TtWurxtsGM9WjpW/djj5V8+ia4KId+ cKoksnXoFTx/K72NbhlhIoHPWB7F7DDXD/us+DZeckneF3aUbU8CMJTMoAqCOsM1eATK goOXiy7MbT5svnCRQ8e0uXisiHjeM9NeDtJBy6xxbg0LeW4dy+v0Fs5FzL3Hqz8j7eXk SUZLeeCN2cJmYMK+daksVD66vdP6tNuZa/xKus/WAnMNvZS0FLFd/J/njpnLaL+9dieu Ma1bDCdvlVfqGZkSR/DVOL1XfuVocLmlu8BYzi74kraCz/c+jQu+kxVLTpIXY1hzSv7p 6jgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=14+V16n2; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n8-20020aa7d048000000b005002e71a84fsi27390688edo.137.2023.03.27.12.58.24; Mon, 27 Mar 2023 12:58:25 -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=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=14+V16n2; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19EEE68CB8D; Mon, 27 Mar 2023 22:58:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6AD168CA0C for ; Mon, 27 Mar 2023 22:58:15 +0300 (EEST) Received: by mail-qt1-f182.google.com with SMTP id t19so9749204qta.12 for ; Mon, 27 Mar 2023 12:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1679947094; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oyeqcY/OhMgHovp5UtAdO70yTjra52vxdRN+c6WUFYo=; b=14+V16n2sn0PseBX3A6xkCjOxN9M0NyXyd6pEKo377fbePkdQX9IJhQfdBv0W4VVDk KJyr5ljfkXQgcfZiPye13zY2ErsfjHCREpoVvD2LPIulpDG7F6vl3XgloR5G4u7ZIFNp BDguDTXrCW16m9OG0uHTom/CNeETxAe8W+OmT83aeBhTrGuRCvx4YSN5GwJfOff43gE6 pz7bWBE5U0xk/xeKsGxO0DGdz1Sb9wBThz3lvKn3NYsorHDCt4F+/Y2SfCF5EFYYjKlV mhjo4jObUCQwba8dRwyHk+/7s39AIV5fZPfngXdGphBYs0hl3bUCPdt5iNHaONCflRe8 qawA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679947094; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oyeqcY/OhMgHovp5UtAdO70yTjra52vxdRN+c6WUFYo=; b=UZyMhkVHFySTGfJkkng2+X0yo4DJE+1BQ/pHBloBviZTaowIiXgvDelAK+bW5fWFjx 4Osbvhj0OPqpkGSyZOKuwJVBGCoFbnyqIZ+08MoAosfEn6sUJmDb1Cvg0xAVjESiIqlD gi87sZMrDz64fMwpWW7ATbtm7VLTbd2ThqTjJvuMxj2yFUew0S9PlVHAfI1gBXnA8+W6 yYMb3RkPGqLLz9P6/VsBtDZd5m+st8mJVdNnPkm/dffLvrw/krwGGdnNKsXiqRD4RWfS 9yRP/yVP8ZoEDSb+Jymu2TUIQkyC8Qo9ym272IZkaqp0fsrvWyGZHJ5zBy9VziG2lluC iH6A== X-Gm-Message-State: AAQBX9fjKkmPB/vBT3EnDQ9Wlj1VyYPsbTBN/PuWn2QKEO+t7rs6Q7cV TIc+7vPD05k0D/N3Jj8ihoUCHRQ6X3BWkV7oMEo= X-Received: by 2002:a05:622a:4c:b0:3bf:d193:1b0 with SMTP id y12-20020a05622a004c00b003bfd19301b0mr21933449qtw.48.1679947093949; Mon, 27 Mar 2023 12:58:13 -0700 (PDT) Received: from klab-nyc-kernellabs2.localdomain (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id n191-20020a3740c8000000b007487c780f5esm234419qka.121.2023.03.27.12.58.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2023 12:58:13 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Mar 2023 15:58:10 -0400 Message-Id: <20230327195810.2240-1-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] decklink: Add support for output of Active Format Description (AFD) 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: Devin Heitmueller Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WXCl5qnL3xy8 Implement support for including AFD in decklink output when putting out 10-bit VANC data. Updated to reflect feedback in 2018 from Marton Balint , Carl Eugen Hoyos and Aaron Levinson . Also includes fixes to set the AR field based on the SAR, as well as now sending the AFD info in both fields for interlaced formats. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_enc.cpp | 91 +++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index a63aeaa088..309cea8a48 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -412,8 +412,94 @@ static void construct_cc(AVFormatContext *avctx, struct decklink_ctx *ctx, } } +/* See SMPTE ST 2016-3:2009 */ +static void construct_afd(AVFormatContext *avctx, struct decklink_ctx *ctx, + AVPacket *pkt, struct klvanc_line_set_s *vanc_lines, + AVStream *st) +{ + struct klvanc_packet_afd_s *afd = NULL; + uint16_t *afd_words = NULL; + uint16_t len; + size_t size; + int f1_line = 12, f2_line = 0, ret; + + const uint8_t *data = av_packet_get_side_data(pkt, AV_PKT_DATA_AFD, &size); + if (!data || size == 0) + return; + + ret = klvanc_create_AFD(&afd); + if (ret) { + return; + } + + ret = klvanc_set_AFD_val(afd, data[0]); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "Invalid AFD value specified: %d\n", + data[0]); + klvanc_destroy_AFD(afd); + return; + } + + /* Compute the AR flag based on the DAR (see ST 2016-1:2009 Sec 9.1). Note, we treat + anything below 1.4 as 4:3 (as opposed to the standard 1.33), because there are lots + of streams in the field that aren't *exactly* 4:3 but a tiny bit larger after doing + the math... */ + if (av_cmp_q((AVRational) {st->codecpar->width * st->codecpar->sample_aspect_ratio.num, + st->codecpar->height * st->codecpar->sample_aspect_ratio.den}, (AVRational) {14, 10}) == 1) + afd->aspectRatio = ASPECT_16x9; + else + afd->aspectRatio = ASPECT_4x3; + + ret = klvanc_convert_AFD_to_words(afd, &afd_words, &len); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "Failed converting AFD packet to words\n"); + goto out; + } + + ret = klvanc_line_insert(ctx->vanc_ctx, vanc_lines, afd_words, len, f1_line, 0); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "VANC line insertion failed\n"); + goto out; + } + + /* For interlaced video, insert into both fields. Switching lines for field 2 + derived from SMPTE RP 168:2009, Sec 6, Table 2. */ + switch (ctx->bmd_mode) { + case bmdModeNTSC: + case bmdModeNTSC2398: + f2_line = 273 - 10 + f1_line; + break; + case bmdModePAL: + f2_line = 319 - 6 + f1_line; + break; + case bmdModeHD1080i50: + case bmdModeHD1080i5994: + case bmdModeHD1080i6000: + f2_line = 569 - 7 + f1_line; + break; + default: + f2_line = 0; + break; + } + + if (f2_line > 0) { + ret = klvanc_line_insert(ctx->vanc_ctx, vanc_lines, afd_words, len, f2_line, 0); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "VANC line insertion failed\n"); + goto out; + } + } + +out: + if (afd) + klvanc_destroy_AFD(afd); + if (afd_words) + free(afd_words); +} + static int decklink_construct_vanc(AVFormatContext *avctx, struct decklink_ctx *ctx, - AVPacket *pkt, decklink_frame *frame) + AVPacket *pkt, decklink_frame *frame, + AVStream *st) { struct klvanc_line_set_s vanc_lines = { 0 }; int ret = 0, i; @@ -422,6 +508,7 @@ static int decklink_construct_vanc(AVFormatContext *avctx, struct decklink_ctx * return 0; construct_cc(avctx, ctx, pkt, &vanc_lines); + construct_afd(avctx, ctx, pkt, &vanc_lines, st); IDeckLinkVideoFrameAncillary *vanc; int result = ctx->dlo->CreateAncillaryData(bmdFormat10BitYUV, &vanc); @@ -513,7 +600,7 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) frame = new decklink_frame(ctx, avpacket, st->codecpar->codec_id, ctx->bmd_height, ctx->bmd_width); #if CONFIG_LIBKLVANC - if (decklink_construct_vanc(avctx, ctx, pkt, frame)) + if (decklink_construct_vanc(avctx, ctx, pkt, frame, st)) av_log(avctx, AV_LOG_ERROR, "Failed to construct VANC\n"); #endif }