From patchwork Fri Jun 30 21:38:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 42356 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp2791639pzh; Fri, 30 Jun 2023 13:42:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlF7MbeFKf4z5XtPr0fogzuEJKztYwFFjpeK9bpg5cQNiQJWzM0IF6aNMA5Vn+XX+FIJCytA X-Received: by 2002:a17:906:b7d7:b0:992:91ce:4508 with SMTP id fy23-20020a170906b7d700b0099291ce4508mr2632628ejb.53.1688157736973; Fri, 30 Jun 2023 13:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688157736; cv=none; d=google.com; s=arc-20160816; b=C5uwd9Z5Ge+et6GWKJg0MZ3VZpEbX0iMzXfVi4UWrRr3my0Sg8K/hqKsC4O1R20M7l JnJFd7ekE60FokTxb2+PoUcCMCcHyuo9nNwk3wv/w4XCYlzoQg6XYdWR1BjprAvW/tXD f6go+aNow0q0BqE2tD3BFApOc8zW9V5Xcq1FIm/u9XEZ3ZnWtKtMATqiqOUcn48u6eje AepZlcnQemxW5QVMPK+/aCmpzOkoQVJu9HHIGVY59VaDv9c3xN8AIy+5JiP3CqMoEfNK f4lWPmGbfu9t72jfHFvDbSUS3TOPqeZM3SXx86LhIafTvAc4enERuk2Ry1K1dxSblsHn T2PQ== 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=IVvUK+s/YwkbVVINiKh63BMkGHg9O1p2R4z3qxJ66q8=; fh=pXLAZvRiz3/uELcsWNfKAkJPgyV9/rr3Mrznj9KeXEo=; b=cEDGlb5y6OEMBU7NtzpCYgJuhXWMga/6scDv273UF3aFyWXN3/AE+dIGcDVhnoqifm S+vxgQMO8OvfXuyM8nRDYvd8JSHT5wz63xoRgK/aIxUw7HyEytGe3RvIDvKWf2SsaYjP D6lbaMHs4omSNh4d5U4QZn5Plx6eAtF5a4PVLEudpEgYPKxegMMFjj9nLDcs7/5UFAtW rLesv7F7trq+GKloEyVpEiBtgNK3065dJ6s1i94EGKgI9NewOcSkfQf3aQOAHqGJe1bT BIu9LhKZld9mGyDsySOd8rKmQ8js51Rtk2XsFwMPG2Vf0NHANTJLAdqf3i+lOjJ06Hsf wJGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20221208.gappssmtp.com header.s=20221208 header.b=DZiGUmok; 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 y9-20020a170906914900b009893fe84e6asi8994757ejw.677.2023.06.30.13.42.16; Fri, 30 Jun 2023 13:42:16 -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.20221208.gappssmtp.com header.s=20221208 header.b=DZiGUmok; 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 3301F68C4C3; Fri, 30 Jun 2023 23:41:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F8FE68C43A for ; Fri, 30 Jun 2023 23:41:08 +0300 (EEST) Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-402318ef92fso14735291cf.3 for ; Fri, 30 Jun 2023 13:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1688157667; x=1690749667; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=6YI+qFPWP7kKCykOQwozf4QpyAdmDqg7v2l5h0cRu5c=; b=DZiGUmokIhPOTuQ3yJ7QecdiO5mb5ohRNgkk5NtS2y8rG7bGx1Gdkk19nTqmUEQoVn xFAv/fzMn1HdPfcM5wMDmwugnqovhRhDd6lwDTK56JgtypOwULszgTdys36ppmGBft3v oxg1sKiX8TX1dIq8e37kOvP2/OPlTrQNzSsK0Q34bjmROhw4bp6x90KbQs9czc2pXvW8 l3UyVBbMlIVHJe1L/9f49WCQaHlMgoLwdE3cMAQpkJBCLtGKMADOzctj73ifAfwyctjP eJPeZ1EvFbN8/LkKLklXYy7d9NbnqEUIeEsQJNYjDqBdPqPkLz3cSxHpN3xRnN+KYVQA r7nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688157667; x=1690749667; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6YI+qFPWP7kKCykOQwozf4QpyAdmDqg7v2l5h0cRu5c=; b=YcxCl23qW7SydWPpTSIygVPHwUrAHjlyP8toEsXjQnPhFBlrJgnWTSm55/T/UKrYv2 JqssosUksBhmrCJe2qefWytXgQ8df2BBZFvF7xFz/y5OfANr/s1zBcplGQV31WPMFd6m bwQm6Lftp2nBByj4mkI2iM1gE0fAdFQtJCDmEoX9CelsQ61GIQTdCSz2V9pg0zp3DSkX TJctBcmI9oQLe+nWgF8mbxF26Ea4qk8ybs95NF0aWD5k1mMogMHiEfiIL2EqeezZzzKb r05F1lHh7Bed4yTGNib9poFyRKEAPEVVrDj2IyQFwP8IYiRwX54SDVt0i9acWCeXmPmM LTZw== X-Gm-Message-State: AC+VfDzg8VbngazSNJwhKI9UJlNrEOhbahGdUe5XFInzRk2sukc+/M5X JTP5pRsFaNC+ZnPMMfHMcylY+9dtQP92YyoDYas= X-Received: by 2002:a05:622a:9:b0:401:fa32:3594 with SMTP id x9-20020a05622a000900b00401fa323594mr3832569qtw.27.1688157666851; Fri, 30 Jun 2023 13:41:06 -0700 (PDT) Received: from ltnt-nyc-580testdevin.livetimenet.com (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id bq8-20020a05622a1c0800b003e0945575dasm4409885qtb.1.2023.06.30.13.41.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2023 13:41:06 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Jun 2023 17:38:55 -0400 Message-Id: <1688161135-11774-8-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1688161135-11774-1-git-send-email-dheitmueller@ltnglobal.com> References: <1688161135-11774-1-git-send-email-dheitmueller@ltnglobal.com> Subject: [FFmpeg-devel] [PATCH v2 7/7] avdevice/decklink_enc: Add support for output of bar data as VANC 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JRTpKBsUvhcF SMPTE ST2016-3 supports both AFD and bar data within the VANC message. Extend the existing support to pass through both. Example usage: ffmpeg -i input.ts -vf setafd=afd=1:code=0x00:bardata=1:top=100:bottom=120 -f decklink -vcodec v210 'DeckLink Duo (4)' Signed-off-by: Devin Heitmueller --- libavdevice/decklink_enc.cpp | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 11e67c4..9ad902f 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -467,23 +467,39 @@ static void construct_afd(AVFormatContext *avctx, struct decklink_ctx *ctx, struct klvanc_packet_afd_s *afd = NULL; uint16_t *afd_words = NULL; uint16_t len; - size_t size; + size_t size, bardata_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) + const AVBarData *bardata = (AVBarData *) av_packet_get_side_data(pkt, AV_PKT_DATA_BARDATA, &bardata_size); + + if ((!data || size == 0) && (!bardata || bardata_size != sizeof(AVBarData))) 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; + if (data) { + 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; + } + } + + if (bardata) { + if (bardata->top_bottom) { + afd->barDataFlags = BARS_TOPBOTTOM; + afd->top = bardata->top; + afd->bottom = bardata->bottom; + } else { + afd->barDataFlags = BARS_LEFTRIGHT; + afd->left = bardata->left; + afd->right = bardata->right; + } } /* Compute the AR flag based on the DAR (see ST 2016-1:2009 Sec 9.1). Note, we treat