From patchwork Wed Jun 7 20:22:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 41997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp659378pzb; Wed, 7 Jun 2023 12:26:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5h5EMlPjsK+Fqi2ttztN2aiJGtVqVbU/cx5Eaf9FO8c2xwGTsld3+qoUJeB4GhiitXmHv1 X-Received: by 2002:a17:907:2d2a:b0:961:78c2:1d27 with SMTP id gs42-20020a1709072d2a00b0096178c21d27mr7142071ejc.19.1686165961616; Wed, 07 Jun 2023 12:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686165961; cv=none; d=google.com; s=arc-20160816; b=fXh8thf/Rs/ObPLrv7UR7rL4ccpxbBq4lAmrcb5qzMzQVN31JG6TR6pIOzSDfLMx5d +Kq2sm9aMSJRG4qp3zkpgFSW0DIRzfa7kk+OITaX/B9nFGD5+pkU/MfbS35/NJcX1k8f DbRBvepp4VWDBRAT/okFk9YVasoHqRM5sq8P8qKWudHVgMiIIrRBmM8/v7X0lB79owU8 kPS6TLRqtfif/FxVfhZz+jUyJMJNmQA3C+EXcRVaCqFjJiJLQYa1OP6b7tHen53Xf7+v 8bZATwG1CWsaCstadE5jObY9C667I1YlBBoEQleqqnSpWjNhl37Pjk91nlSbJ5DvoX40 9kOQ== 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=qpf6aTlXIil80y4zUrDsEhhXeV1X5iqSxayuawNBGZA=; b=FL+Uu8sCaLKg0H9dqWtfQhjYwXt1hMcuhMXNzjJb9OEke0HW7rYEZvJDTxucIQS0hb 1ADkh47IwPpUGatisWqOt9Y7UgxgC0BOUuV3q/z2iWEkPrVcHren5RlRnEj1CfgBBuFk Gdiyt/2GsUnQIZOdj9a5i5+b2VqYdlI6LNWeOlp4zLD97cgJn6OcG5pE6J7vRIstmekX idHYEgWEta+Hk2G12Uv/pGUZh0zRsr3N2Cr4NIu5rFqnLh3zYQpCz9a4HVRTiKricg51 SMdE8giuwC+uO2xSsmu9zV4eRvBfpZdq437QhDCbDPKva622GlC/Im+qZBwB10/3wa3/ ki1g== 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=OuEhaat+; 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 hs34-20020a1709073ea200b009788ca4af50si853502ejc.241.2023.06.07.12.26.01; Wed, 07 Jun 2023 12:26:01 -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=OuEhaat+; 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 88DA668C0B8; Wed, 7 Jun 2023 22:25:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A97BE68BFF5 for ; Wed, 7 Jun 2023 22:24:59 +0300 (EEST) Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3942c6584f0so5277652b6e.3 for ; Wed, 07 Jun 2023 12:24:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1686165898; x=1688757898; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=83UPHzarnuXbzYo6VqzGhadcopTJS5L9+pSro3qrCgU=; b=OuEhaat+jzW6rFtVUTLcFy9pg7VX+HABcteQlZp7NlAUB4I889S5XuAU58FXEorIVj v0GLz1ieQHSu8kbjTavxn1DDq0sJaH5NtMrJA2zb8TPYOEKxy/gw2QChNlrSyEJ643cO 1vPPa8TiutkJOSuDdvl7svMZri1sNGeq0FHP+godp2Sj52cOTgPOICEyX1Nldx8u4JZ2 0AubAu0byUZ8j4R2Ws2zp30pWdJs7PWXv6bCdDQ0BUKczUyEAfUb14Xb/jgxATBHWP5e mimJmhL2m/+bsNaLf1Vme4J5R1McpN4MfZQVVKsSNWTczmcNuxW+NCGKG7n8sUGNN+Pt hSyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686165898; x=1688757898; 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=83UPHzarnuXbzYo6VqzGhadcopTJS5L9+pSro3qrCgU=; b=IWeP+C1CpDAV/yOi4ScOusjIlfGqpjHmCnTvs7YvZ8yO+vAKcKjYDgGhcyB7fXBODY op5yj4SLsMWJ6Z0W1lUlwsu6O4lPLpSWLlpAf6mSn6Cz6E16+l2Aecc63BJ2FWOFhx6Y cSODf+l0/koCvaF+Inr8cmndc/fIGTn4s1OpQHbe3qhLbFaeDNb5ItQ9TrKA2J75B8zS Aubw3xGrvOvxQJyAx9oMdmBerv7upwK1NYSLBjpwnUmVJt4GuIarUZi/GNYZCMt/PVyl JkdTqQU924wGenFDLvLxSYTc9WTpZaHfyw70SG6pO0RE8Xc3edtYkU5jlf128i6O8Kwe rwJg== X-Gm-Message-State: AC+VfDxa1Sbwfh2klsjI5kAQr3AjCYKVUu7CnI8SOy717nlPm49QvfJZ YTddoQWYQCU7LVwoWX/g3qk5uYovIGu8UVe4iEg= X-Received: by 2002:aca:2811:0:b0:39c:7749:74b4 with SMTP id 17-20020aca2811000000b0039c774974b4mr788466oix.17.1686165898269; 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.57 (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:26 -0400 Message-Id: <1686169347-28987-7-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 6/7] avcodec/v210enc: Pass through bar data 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: xE9Y72BKmiGX When encoding to V210, make sure the bar side data makes it through in the resulting AVPacket. This is needed so the decklink output module can put out bar data as VANC when in 10-bit mode. Signed-off-by: Devin Heitmueller --- libavcodec/v210enc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 2a30ed7..69a2d72 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -103,6 +103,14 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, memcpy(buf, side_data->data, side_data->size); } + side_data = av_frame_get_side_data(pic, AV_FRAME_DATA_BARDATA); + if (side_data && side_data->size) { + uint8_t *buf = av_packet_new_side_data(pkt, AV_PKT_DATA_BARDATA, side_data->size); + if (!buf) + return AVERROR(ENOMEM); + memcpy(buf, side_data->data, side_data->size); + } + *got_packet = 1; return 0; }