From patchwork Fri Sep 7 19:40:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 10268 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1941430jap; Fri, 7 Sep 2018 12:41:10 -0700 (PDT) X-Google-Smtp-Source: ANB0VdakCWIFGKVUl3a8x8UfXAFEWK1SudlN7YtIVD2LygaEierLaZQ51cy2GoPqGvkdgoMJF45+ X-Received: by 2002:a1c:5f82:: with SMTP id t124-v6mr6403042wmb.14.1536349270034; Fri, 07 Sep 2018 12:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536349270; cv=none; d=google.com; s=arc-20160816; b=vsRtqOlkSQsPJ/VjmQ8o7g/ny0JeXFOSuy8jPKrF5+Q1Nhp0OjS502CixYQJb/CO4z ZX9h14jMW9Jhlay5g+MRZD08nmiq/uJu5gK5YYSOXRIBvXJ2GCVIzabZMCwdJpvgDAbJ 5DhaEjWmI4+ytHGvFy3CNGD0IaFYOVRHs92USBgzeIRYH0bsKsm0kryFshPOYYAfsBMP Cl3DZUsbzrR5b/f2DBYnBXK9khlboiOXeyWUOJHmjSe++OtiUhfj7Bi3rkPpX/Xl+Bxm oV+aYRp4CjJr++mCf68bzHtASut6JRhlVxfbGGUZ35uLhSMsMzUVmOxQuoV1rItimkGG Odqw== 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=3WJZkViRzti2cWPxBQR0O5OwT5M4KSXEL6pON8SPqZk=; b=jy1FAIX7kTvLIl7bzDU6nUSRNwF6g4+hBdxOSkNXDROSfJ7kn/MZA2f/C9lD07NQYH zZFZQKDd6f01vKfIWLnowid7pT/NUVzI9jrLcrxrW4uOA/ozftYFkeQhyzI8ogpYVMgZ l7+9MEj62vI8VPLZIExPaSeBLQj8xiOykIo+ADzK+wQqSI0WiUPsIcOYztJ4l8EKxbfx r021bHFiKOsO8S+6CTVhKsVDz57dxdivRWJoY/18hIEVyJwLBAnbotDCsLEii0s5cbIm B6uNDFj0Qd4FAP1AgST4C1W7CMmEr47z8GXCR6oRHTavHV8nvrVQPGwLt3w48inOkqKu v6PA== 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 g4-v6si8228688wru.338.2018.09.07.12.41.09; Fri, 07 Sep 2018 12:41:10 -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 B02AD689FF0; Fri, 7 Sep 2018 22:40:39 +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 2B3DF689EE2 for ; Fri, 7 Sep 2018 22:40:33 +0300 (EEST) Received: by was-smtp1.livetimenet.net with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.84_2) (envelope-from ) id 1fyMcR-0006Sz-QI; Fri, 07 Sep 2018 15:40:40 -0400 From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Sep 2018 15:40:26 -0400 Message-Id: <20180907194028.4629-4-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 3/5] Allow AFD data to be embedded in AVPacket 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" Create a new AVPacket side data type for Active Format Description, which mirrors the side data type found in AVFrame. The primary use case for this is ensuring AFD gets preserved in the V210 encoder, so that the decklink libavdevice can output AFD. Signed-off-by: Devin Heitmueller --- libavcodec/avcodec.h | 6 ++++++ libavcodec/version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b6688b7af3..7f714fc1d8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1365,6 +1365,12 @@ enum AVPacketSideDataType { AV_PKT_DATA_ENCRYPTION_INFO, /** + * Active Format Description data consisting of a single byte as specified + * in ETSI TS 101 154 using AVActiveFormatDescription enum. + */ + AV_PKT_DATA_AFD, + + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may * change when new side data types are added. diff --git a/libavcodec/version.h b/libavcodec/version.h index ce3349019c..60cc99d753 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 27 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \