From patchwork Fri Sep 7 19:40:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 10271 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1941520jap; Fri, 7 Sep 2018 12:41:18 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZiLbVjcHb4u7ApKAmWsfyn3yEKeQWlURVrqWdLhk3Sr6m58aRWX7QI5pRWn0e/PQ8v2Sep X-Received: by 2002:adf:8b98:: with SMTP id o24-v6mr7132349wra.110.1536349278315; Fri, 07 Sep 2018 12:41:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536349278; cv=none; d=google.com; s=arc-20160816; b=dYxIiBdnizBf6QT0fnZ0OCtlQWzFU6DiO/XxpT/dWFvsaFZexDm4E79F9tHDIh182L 1cuTWLcU0oa+MA7ll9HjWzoMOwkva8Q2TSI7yQw7ylH0OMGprbEDpLpW+GKa9suC2MqW qr4eH9w1sLvkRrTAVF6YKJL2dzIYdU4g7dH/W9SMld2g1Td7M6f1uXGsQUuXx+S/cCUo WTOzQHuS4RmTqcxQWuKz8QFr6GR0eRrjtYb4uH8aeCXXlF0va0yK5y/8ot6zYPD5YkLO Nae3kdpFTs5hpk6+LUEeNOTrtprT+n63brWy7XZPzaJ4ulUvGKFJsmvZU1LhQTgah4Cb MLzA== 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:delivered-to; bh=ibhUwVWjSjRTjZZ3CzujTREmTd9yM4mVcvLPnb8STnU=; b=D2ggVROPW+emPBeaOKEPr8buqdjTyCU98RS1gxxmTv2OcZFv8OQUcoKwJrP7GK0Bom rIA5cwRV4WvmnUHTDm4Y9VG0o8vMrS9Gz/jfhdeFTi3T20IjxTbDvhzWQUVRE6i0AAPs UtS0yQ4gH+D33IK0H6I5kr2Y/y4TbDR2iry7wQX6CLx19jq9v8fPt0P4q2X+BJowAORT CWkoyo7iSDoowjfwJzzRXs9qfAoopmw4BF47m0OKxRsqqIOeBIwNLMGg4DHLgMYFp/af BY81ur9ExsdRM3lBUFp+9eIeOSPR0V5KNq3G1nPkzDt3bFI5A/a+hWKQSjbKJ8dwBXyc A1xw== ARC-Authentication-Results: i=1; mx.google.com; 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 d15-v6si8386318wrs.188.2018.09.07.12.41.18; Fri, 07 Sep 2018 12:41:18 -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; 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 5CDD2689FDF; Fri, 7 Sep 2018 22:40:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from was-smtp1.livetimenet.net (50-206-97-56-was-smtp1.livetimenet.net [50.206.97.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CB63689F05 for ; Fri, 7 Sep 2018 22:40:34 +0300 (EEST) Received: by was-smtp1.livetimenet.net with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.84_2) (envelope-from ) id 1fyMcS-0006Sz-NS; Fri, 07 Sep 2018 15:40:41 -0400 From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Sep 2018 15:40:27 -0400 Message-Id: <20180907194028.4629-5-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180907194028.4629-1-dheitmueller@ltnglobal.com> References: <20180907194028.4629-1-dheitmueller@ltnglobal.com> X-Spam-Score: -1.9 (-) Subject: [FFmpeg-devel] [PATCH 4/5] v210enc: Pass through Active Format Description (AFD) data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: jgreen@ltnglobal.com, Devin Heitmueller MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When encoding to V210, make sure the AFD side data makes it through in the resulting AVPacket. This is needed so the decklink output module can put out AFD 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 b9dcf9a672..b024806d0b 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -242,6 +242,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_AFD); + if (side_data && side_data->size) { + uint8_t *buf = av_packet_new_side_data(pkt, AV_PKT_DATA_AFD, side_data->size); + if (!buf) + return AVERROR(ENOMEM); + memcpy(buf, side_data->data, side_data->size); + } + pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; return 0;