From patchwork Mon Jan 6 14:54:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17215 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 2C47544A960 for ; Mon, 6 Jan 2020 16:59:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D36E68A772; Mon, 6 Jan 2020 16:59:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1B99687FFF for ; Mon, 6 Jan 2020 16:59:47 +0200 (EET) Received: by mail-qv1-f66.google.com with SMTP id z3so19144115qvn.0 for ; Mon, 06 Jan 2020 06:59:47 -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=6XFzsmwQP5TBUa0nrWG35QjzJY+WTXgSqg3AU7HZZ54=; b=tzzmzwz+teP+qActkvr8f49as8VpdJKalbSX/vSulkPB59O2WuhIuuqroimvx0flBC qJJ6q3axZ4DlcgSD3WWCWXABet8QTC5j4x/yJD51qZu/5RcFwj8qlLEIEZFAY/1gFgsL K2CK5+Lds1hCTYMVKRcZyoeBgrrU3GBU0lM+LJXpYnqeXsG9+ciii0FK0j4Qa+/KW+ex SLS7nbFqZBCuS6ZY4ac24ulyeM0trchVZmZo9+DdMlxHxDaZ1PAOqvYKllU4w4w01q3o evmYquNxJJyBd4RycKseqpolPT1IBsjALGAG7U0sUMMfkkeImBSbxwvQ0besvYJYdcIg qyUg== 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=6XFzsmwQP5TBUa0nrWG35QjzJY+WTXgSqg3AU7HZZ54=; b=A7LUpi0NdYq4q02IyKZuPoOkAolyo5WWz7TlfvNs3BWUz1/zqn6OyXJUP0lhMVzlZT w5wA4WX+7HyzDGNEHCws0ruPjIQbV7AEfkDT9j6haTv7zgt7QaB1FtbEbHkgp+U/PPpy y/Ri9+Q8nUuCGjw7pj76CudamvecNgbRbZ/fdUqoaTQknUHIp4d+aaPX1jsk+ftzVHPN 6PjoLID2iK/1WU5bRhFZCzQPY5giHudn84ekia6acXTYnG1V/W6rZAlRfVl3eIu6P2Wu eiVhwDClBiKRMnjHxxCtosDaFaJ6ELLW3hJbZgQQm0qpRJW2fW2SXSW5Q9b0FeQZalLn TGZw== X-Gm-Message-State: APjAAAWxMuWRQd/b/bjdE0b9PkFOuzwqtCX4V0CGkHXcmM1iYsH+Zy5d S9L4LcbzNd0nkfP69S173nwbxD2X X-Google-Smtp-Source: APXvYqwbUf6KOtTFqXrGZKkC3fpuvuSo3cVhRn6GxRAaO7z5d35lxt4QyFeL6Abxkw1O3GZZYo895g== X-Received: by 2002:a17:902:9a8e:: with SMTP id w14mr104544438plp.315.1578322452868; Mon, 06 Jan 2020 06:54:12 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id i127sm81219568pfe.54.2020.01.06.06.54.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 06:54:12 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Jan 2020 22:54:06 +0800 Message-Id: <20200106145406.9247-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 v6] avutil: 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 --- Fix for the v5 commit message change when copy(add avutil:) 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, \