From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1E49B42337 for ; Wed, 7 Jun 2023 19:26:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5942D68C0FB; Wed, 7 Jun 2023 22:25:10 +0300 (EEST) Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4045D68C02E for ; Wed, 7 Jun 2023 22:25:00 +0300 (EEST) Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6261a8bbe5fso66658616d6.0 for ; Wed, 07 Jun 2023 12:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1686165899; x=1688757899; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=RZ/Kdz1J0BHeEzy6jTG8mB1tcGrutrZ7exkIhvKZAx8=; b=sr+uU5X5aWx0GlH22mv4Ie9J0OPx8YKOkROxw0PRmMzOggKCpq52bZrLhSF7lXVdTn gXW4kh1De6GMynGNE0cFn7oXTacrruukBsUaefuGF8oWIOsqJ1StP5rMZ3zWMLAL65NF UicJVRZ6yV/yc7J42qZUVpovWVz8pAm3Zj8CmM4Das7U9yTAYk1w6RQ8C69nIc4JcT2b ZtJKvo+taVkGru7dJnuthgI4hcbAGM4zw4neyFR8WioD/F6m0//BTYk8gILb+eMsvZvA vy5n7H6kzQg0drtMSXRLV4D0mQRgSLnZpXG1n6ot/zaAvMya/9nQE72dCWBkUG9IyRUM +FUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686165899; x=1688757899; 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=RZ/Kdz1J0BHeEzy6jTG8mB1tcGrutrZ7exkIhvKZAx8=; b=Ykq7fUhBns9i/PlQXLmOQYHfQeJ1ASS98JB09GMYfSl+lhfqCKWOUP7lTdqIi71TmS 6FS3Vr8/amaKp0bd7WkfKF6+LujenTzyVc8erLrt8ALM7XZdigLuEYBe2frWKo3RAnaw jUscSmPxKoo7qFrdl1hjlgoARBSI/okoUNqAfZX8GIp5QD+4EfSnV/EBw936q/sb8zed 5oZn+rf/9GOMCccYesivxqWE7Jxb8kgi8o6y+Thy7sERbGA1r9GdL4tIU7s8ILJomTr8 gPv/KhsFTQtMxxQYPIS6XoyxnFFjBkaM0a+OFEE9w7Xu2U3/dAhu//DkRVi2xms5oyvk LITw== X-Gm-Message-State: AC+VfDy4L+I/hLngjfbTcIqJtivuoeb1hFShFOpbTqlMNZD2DaPm/BbQ rYaNBdeCE4Ua6ArvLgdsYd1WSe/8NMpO8v8/by4= X-Google-Smtp-Source: ACHHUZ521DY9rcfJVYaafnbsDt5Xbq1AvpCY8ErGgnkGYKwTox7fSDpYbrvR6GkCe1Zo1Oj/OEgg0A== X-Received: by 2002:ad4:5945:0:b0:625:7c0b:4640 with SMTP id eo5-20020ad45945000000b006257c0b4640mr4650514qvb.22.1686165898760; Wed, 07 Jun 2023 12:24:58 -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 j18-20020a0cf512000000b006261c80d76dsm133643qvm.71.2023.06.07.12.24.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jun 2023 12:24:58 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jun 2023 16:22:27 -0400 Message-Id: <1686169347-28987-8-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686169347-28987-1-git-send-email-dheitmueller@ltnglobal.com> References: <1686169347-28987-1-git-send-email-dheitmueller@ltnglobal.com> Subject: [FFmpeg-devel] [PATCH 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 6906cb0..5d85d6b 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -447,23 +447,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 -- 1.8.3.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".