From patchwork Thu Jan 2 01:28:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17124 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 761644474D4 for ; Thu, 2 Jan 2020 03:29:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F3F868ADD8; Thu, 2 Jan 2020 03:29:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D896168AC4C for ; Thu, 2 Jan 2020 03:29:19 +0200 (EET) Received: by mail-pg1-f195.google.com with SMTP id s64so21150589pgb.9 for ; Wed, 01 Jan 2020 17:29:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rf+UEvS7ZKNrYXlZs0Qy8DX6Bm4oZQwRJ+m8pmtjlf4=; b=CgTW5dqyYycpMPEfJKX7njWKRTISjm5E5HpC7UQubIrCHm++kzhy5TMOuPaM6gVRQA H1NJ4Q76mHQGRbs++fAKCuWX9QlfAPn0pinWQoUZuKj49llgjk0j8nWAl8lXTGeMgcnY 6aKvMBtLa8vAnOPkbTFnrUs0ZW6oCFDUDMe7z59cPLZS31+6CIxXGvL7SzuKalZkUqhE I2RDDcazCRe7x3zJDtm/wLclBTZRXjNgtSVw9q4fPdtifXJfc0a4OfqmIXWEtVMv/qeO chAapJBSc2klP6DSQabSNXdHE6DeO2cZNa4REQ0ybYZfAHLq9QKGYxQCxf+xCNAOpnFk 04AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rf+UEvS7ZKNrYXlZs0Qy8DX6Bm4oZQwRJ+m8pmtjlf4=; b=aDDkWf3NucYcgipflSmfevRb2JZLq85brMKL9f/GQ+AxcqYEvS1ZfH92q/fq2LlJpB DMc07VU+dBI8tqigYS3D33eOwh4+SLM3ulojFZiS+SWs04bAYgrnsMy6uBpmA/2BQ57p R5u3OMvNdGwCg4WuOiHl9ZZkEhNuinLrEycMdsQit2to8KnTv8AxC4sNseAY0lOj7Kx/ o+v8MdZM1u1gumYDV+EVr6GakOtWlQPwYdUXCQg0v6Zj/pl+ZeqP09hgkB/Rp6FAEHmV jTzwn2hKVS+JWhSRmKtfLxZFL7lMOl3PJ970JJVWkN0ay5nUjQ/MdhMWXS8xVNkMhcWR NAfQ== X-Gm-Message-State: APjAAAXhvpZCqj4dVgFRcGIIewJYP7i1e9RTxXjVN652HtvBuxafcwth hI/ukho0KsUJUUOzlFqAYt9+9HeS X-Google-Smtp-Source: APXvYqywTDcihIkkJaChaenOq7hNAKlh8mXIywDJv/yklc0qvD2SkQ+EvmGYPk8SHAqAyOkNchnRKw== X-Received: by 2002:a63:d802:: with SMTP id b2mr86675309pgh.414.1577928558025; Wed, 01 Jan 2020 17:29:18 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id q15sm57121583pgi.55.2020.01.01.17.29.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jan 2020 17:29:17 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 09:28:45 +0800 Message-Id: <20200102012848.18881-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191217102217.4811-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 1/4] add AV_FRAME_DATA_USER_DATA_UNREGISTERED side data type 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- rebase the patchset for the latest code doc/APIchanges | 3 +++ libavutil/frame.c | 1 + libavutil/frame.h | 8 ++++++++ libavutil/version.h | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 3c24dc6..6e1673e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2020-01-xx - xxxxxxxxxx - lavu 56.39.100 - frame.h + Add AV_FRAME_DATA_USER_DATA_UNREGISTERED. + 2019-12-27 - xxxxxxxxxx - lavu 56.38.100 - eval.h Add av_expr_count_func(). diff --git a/libavutil/frame.c b/libavutil/frame.c index e403809..1d0faec6 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -842,6 +842,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) #endif case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; + case AV_FRAME_DATA_USER_DATA_UNREGISTERED: return "User Data Unregistered"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index b5afb58..9e8c3a9 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -179,6 +179,14 @@ enum AVFrameSideDataType { * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size. */ AV_FRAME_DATA_REGIONS_OF_INTEREST, + + /** + * User data unregistered metadata associated with a video frame. + * This data payload is stored as uint8_t in AVFrameSideData.data. + * The number of bytes of data payload is AVFrameSideData.size. + * The data payload consists of 16 bytes UUID and real user data. + */ + AV_FRAME_DATA_USER_DATA_UNREGISTERED, }; enum AVActiveFormatDescription { diff --git a/libavutil/version.h b/libavutil/version.h index af8f614..2bc1b98 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 38 +#define LIBAVUTIL_VERSION_MINOR 39 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \