From patchwork Thu May 26 08:08:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35939 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp254197pzj; Thu, 26 May 2022 01:09:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQ9pJsFIe9cAMiEaH/NRCMAOcEoTn2OAukhURhSiF2ymibZ5wpekvAs6/20DqrlCXPXnPy X-Received: by 2002:aa7:cad4:0:b0:428:715f:5ce4 with SMTP id l20-20020aa7cad4000000b00428715f5ce4mr39628528edt.124.1653552553490; Thu, 26 May 2022 01:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653552553; cv=none; d=google.com; s=arc-20160816; b=XCfJIOMtEPGv6C41VdS/77g/+aIALYh6qyM/tJZyCczU7xfXPaTa439NEdwVDWipgM Uq/jr4GVSoCC5u894mj8OSBcIAtlBeCmiBAiQ+kjHBZtWYeiQqVjVwgakmjKgEhPGCF/ lImfTpq1ZQFerNfmTgohIKcmqkg+9oCUzYRn2Vb+ugXVIlnlG/FBLoYpoeL9W8bKeeMR qyjQ47eeBu71MJEpp/ppqd8nLH6K8qMkz50QcjUEj2GYIuw+548iytt9rfeY5JkE7HOB b9aFLT6LV1WuD9SV4GZrK0s8F5hNxHva3fij+sdDasG5Gk0tri1iR+LNrSu52pJehY7c K5Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=cWXSdwBO7skCaDoxVHb8Ak/AvFD2wsRo3Rr0IinjJ/E=; b=0XlOyBz+JyODLoo3SlekiVdyz3i3jxziuATOfQUsieLwd2WEJ/TExkW2Y3yKPQ7Is9 bU7DoacP5LMY2pDn2R7JfPUN2VCf2zOHzBFWR/940OD2O5x6ohKXosc00U5pAxTw5OKw fOidt+96feWE4YKpiOu/UhN8fO7/MPLQSA1Ff3AETxkmOmP357f3q8SFBM9ddJQ3ukiT 5OTP/ngFNCaTscimJt0kqD/i6O+iL0mhkNxSJqtOi/lFrSxtbHpryr5ttP2wHsxx9VJa wv4exHuLHg/zz9lGKi84kSnlys87TsiTH3Ukq7kgs76zsLfzwlJjPMaIEO1yJyGI0S5D j6rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LHzKL2dY; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g3-20020a17090613c300b006fef85cfce1si861193ejc.346.2022.05.26.01.09.13; Thu, 26 May 2022 01:09:13 -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=@gmail.com header.s=20210112 header.b=LHzKL2dY; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE05168B584; Thu, 26 May 2022 11:09:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63BF368B506 for ; Thu, 26 May 2022 11:08:54 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id c65so533408pfb.1 for ; Thu, 26 May 2022 01:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=t+Odd/Td7cc0cgkGbjJ84eE0biqvNbP5k3UqCjLvFig=; b=LHzKL2dYedCD+p1eYNI/Kc+iIw/w1UrjmnbLXTy03eO1QfueUUcZLUE+1dKESt1vyl f1biUVykAR034zGgRPOWoB68zKd9vgah4CwiPr4d96jcN0VL3euINj/6yk4K0aFhfjGv TJ3v3dmvU0rANo+yrjkx0aNInxq7R1Ztc1/2JAU28daD2FfYHBZd6sGBhGaW0ofked1F yKDvQEsJlqj3imR4jcNsFM+YGRvz9pD+ZDRArk7J0HmqhVPWkvSogrvxiU2t2nH1WgZz 5MpjiInOPs37L+0cuZvRKFdbBcE5fIAXIE3Jfu1X1JDMUzbdhtSj5pWKOVG19YqSSy6U unwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=t+Odd/Td7cc0cgkGbjJ84eE0biqvNbP5k3UqCjLvFig=; b=U9/3on0nT9UPIGCKYNbVgFwUDLXdmfNyA4GucHxIYi3V2RRoGJun1NoU96RAeauET5 40W1YWL0z/zniMOEwZO/b7JQWAmk6n4Ug0SRZ4o/esMzM9HVMjdCOXbrppzDNS2IpUIa J7kiaiEUBCAm9LZwa8lj08DIoQKyDgPJWXAlYac0fdKCB4/49cHNKrnUeyS/Gwru9tIn jabFO8CuEfQSL0nrzvd9J4yhMqc7lONqcflsq4Evdox51CJHM4nMF16dmg9xMb6Fz2Kl e8hlSo+JEEwBT+ze+QOeMudQa9Fe2LrnW8vggmj4fLwB9h6IDz63PQJGtaVechjan2Ic qDQg== X-Gm-Message-State: AOAM530RzEvmNttiYOlol/vAj1v2g4k9rgMOeRmH/vcjkrOy7KdwJ4nK s4Od+zH6kpSHybxZo95PuwZsgbvIet7k8g== X-Received: by 2002:a65:6a50:0:b0:3f6:4566:581d with SMTP id o16-20020a656a50000000b003f64566581dmr30240665pgu.122.1653552532233; Thu, 26 May 2022 01:08:52 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id e21-20020a170902ed9500b0015e8d4eb2c5sm770900plj.271.2022.05.26.01.08.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2022 01:08:51 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <4ee6cb47db828e4a91f5e349fab2678c07a95f82.1653552529.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Thu, 26 May 2022 08:08:44 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/6] avutil/frame: Add av_frame_copy_side_data() and av_frame_remove_all_side_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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GYQMBkzSEREf From: softworkz Signed-off-by: softworkz Signed-off-by: Anton Khirnov --- doc/APIchanges | 4 +++ libavutil/frame.c | 67 +++++++++++++++++++++++++++------------------ libavutil/frame.h | 32 ++++++++++++++++++++++ libavutil/version.h | 2 +- 4 files changed, 78 insertions(+), 27 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 337f1466d8..e5dd6f1e83 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-05-26 - xxxxxxxxx - lavu 57.26.100 - frame.h + Add av_frame_remove_all_side_data(), av_frame_copy_side_data(), + AV_FRAME_TRANSFER_SD_COPY, and AV_FRAME_TRANSFER_SD_FILTER. + 2022-05-23 - xxxxxxxxx - lavu 57.25.100 - avutil.h Deprecate av_fopen_utf8() without replacement. diff --git a/libavutil/frame.c b/libavutil/frame.c index fbb869fffa..bfe575612d 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -271,9 +271,45 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } +void av_frame_remove_all_side_data(AVFrame *frame) +{ + wipe_side_data(frame); +} + +int av_frame_copy_side_data(AVFrame* dst, const AVFrame* src, int flags) +{ + for (unsigned i = 0; i < src->nb_side_data; i++) { + const AVFrameSideData *sd_src = src->side_data[i]; + AVFrameSideData *sd_dst; + if ((flags & AV_FRAME_TRANSFER_SD_FILTER) && + sd_src->type == AV_FRAME_DATA_PANSCAN && + (src->width != dst->width || src->height != dst->height)) + continue; + if (flags & AV_FRAME_TRANSFER_SD_COPY) { + sd_dst = av_frame_new_side_data(dst, sd_src->type, + sd_src->size); + if (!sd_dst) { + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + memcpy(sd_dst->data, sd_src->data, sd_src->size); + } else { + AVBufferRef *ref = av_buffer_ref(sd_src->buf); + sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); + if (!sd_dst) { + av_buffer_unref(&ref); + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + } + av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); + } + return 0; +} + static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) { - int ret, i; + int ret; dst->key_frame = src->key_frame; dst->pict_type = src->pict_type; @@ -309,31 +345,10 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) av_dict_copy(&dst->metadata, src->metadata, 0); - for (i = 0; i < src->nb_side_data; i++) { - const AVFrameSideData *sd_src = src->side_data[i]; - AVFrameSideData *sd_dst; - if ( sd_src->type == AV_FRAME_DATA_PANSCAN - && (src->width != dst->width || src->height != dst->height)) - continue; - if (force_copy) { - sd_dst = av_frame_new_side_data(dst, sd_src->type, - sd_src->size); - if (!sd_dst) { - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - memcpy(sd_dst->data, sd_src->data, sd_src->size); - } else { - AVBufferRef *ref = av_buffer_ref(sd_src->buf); - sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); - if (!sd_dst) { - av_buffer_unref(&ref); - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - } - av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); - } + if ((ret = av_frame_copy_side_data(dst, src, + (force_copy ? AV_FRAME_TRANSFER_SD_COPY : 0) | + AV_FRAME_TRANSFER_SD_FILTER) < 0)) + return ret; ret = av_buffer_replace(&dst->opaque_ref, src->opaque_ref); ret |= av_buffer_replace(&dst->private_ref, src->private_ref); diff --git a/libavutil/frame.h b/libavutil/frame.h index 33fac2054c..a868fa70d7 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -850,6 +850,30 @@ int av_frame_copy(AVFrame *dst, const AVFrame *src); */ int av_frame_copy_props(AVFrame *dst, const AVFrame *src); + +/** + * Copy side data, rather than creating new references. + */ +#define AV_FRAME_TRANSFER_SD_COPY (1 << 0) +/** + * Filter out side data that does not match dst properties. + */ +#define AV_FRAME_TRANSFER_SD_FILTER (1 << 1) + +/** + * Copy all side-data from src to dst. + * + * @param dst a frame to which the side data should be copied. + * @param src a frame from which to copy the side data. + * @param flags a combination of AV_FRAME_TRANSFER_SD_* + * + * @return >= 0 on success, a negative AVERROR on error. + * + * @note This function will create new references to side data buffers in src, + * unless the AV_FRAME_TRANSFER_SD_COPY flag is passed. + */ +int av_frame_copy_side_data(AVFrame* dst, const AVFrame* src, int flags); + /** * Get the buffer reference a given data plane is stored in. * @@ -901,6 +925,14 @@ AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, */ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type); +/** + * Remove and free all side data instances. + * + * @param frame from which to remove all side data. + */ +void av_frame_remove_all_side_data(AVFrame *frame); + + /** * Flags for frame cropping. diff --git a/libavutil/version.h b/libavutil/version.h index 1b4b41d81f..2c7f4f6b37 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \