From patchwork Fri Jul 1 20:48:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36584 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1261228pzh; Fri, 1 Jul 2022 13:49:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vOMo4xsLKIBpqceqtVSRNSNj7Jey7tuicoG/x6Zj3ohkl0EgRfsEI3YajjEaA2rnBbPykF X-Received: by 2002:a17:907:75e8:b0:722:e8c5:ee96 with SMTP id jz8-20020a17090775e800b00722e8c5ee96mr3523775ejc.147.1656708583248; Fri, 01 Jul 2022 13:49:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656708583; cv=none; d=google.com; s=arc-20160816; b=VQTE1y9HbaLIG6k03LiOUhEymYifWpGKxU6eYaE38jnJ/pDmOr/c6csQPWob0EllfO h7u7rPUVOCceeAXdjyb9WA39UxIIQhCCUJKRNiJrpa8PI/57fEqUeGM+0gvwCXCtOUf6 BxaqGoQCmP3Cey+6bvabnjq3QjasRJjHy0DWDRKCwttzvC/PBMJhTFdzHElBEXCxMhae JGTjS+raKKyijAFSJvdXI8XyzuG2q9TDhk9lWdu92dCkh7JVNZLLnZy7hpTXK3kXXjNE ZXHh5imdsZh2NcTyk/bOkJhU7pkOuuFL3RVYX/sOi4iCAFjlqLxQen97ddbn43fwVFy/ FiBA== 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=PI1kwDUMrmVqskstbGODCONQQW/5s5SiTEBKmzoWFyM=; b=u5ZNKP39jM0hpwWmFNBsxhH7lozAnYaItC9Hn1QIIcmIgIARPkT9SVd9R+08WtMjir o+OdEvS4b5rmEFm5ispb8rzZmdTH+ay2eZpVwkBxr2L+iD1vFyQKz8xg6/umV3owzCgm mvb7vG9RdgafSxiP0OxHngsD6h1933ClzB0tV3MpC21TumkfJb7DsBwFSUWVUWy2jfro 7bpYXGGj7culKnFK0d0w2n7c8kb608/5oJJPFVml8JH9xpfBcOQoX7ccqrA1YGVVzfI0 ok1dNq0pX0QRS70eGBxNXe6XDBvdYzJZoK4Hc+J1c0EhaMqROw2AL5YiDsPp/chiMOmh AzwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=I9+6NvQp; 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 s12-20020a1709064d8c00b006fe8b1baec0si2381321eju.709.2022.07.01.13.49.42; Fri, 01 Jul 2022 13:49:43 -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=I9+6NvQp; 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 DA8C968B81B; Fri, 1 Jul 2022 23:49:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B59A68B655 for ; Fri, 1 Jul 2022 23:49:01 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id o18so2241600pgu.9; Fri, 01 Jul 2022 13:49:01 -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=Z1By0WxhSs+F1+ExubIgn2ViMY7zhfK9Xtzywquw6D0=; b=I9+6NvQp5nW/qiOTevTbnf3/SJBgT4V9HEfU8xy4GmHgQX79yN2r3x5QWQd3YDdizF YrJJRmCYeULI5prFXUadCQdeVYuXqwQcD3CuBiTOGz4WgQrznMoXMZ3r298Amixag6xF aRH+2KJfP6tGGg8jzUFNCAdTitl29kqLpSd4BK4/nxkNBjHgygdNXQruRv9bUE4F7l95 yARji+AgMmQx48jftR6LNR5zFEnsqwFPTRJKKbnaXqvCL0WPXlV8ACBwMVhz91veNrpW NGiInoBWI6IManlF34QYcFN8B30JvuXeqnOPjXtIJQFe+V7+WHq4RU/tHtPo0puulGQI yg9A== 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=Z1By0WxhSs+F1+ExubIgn2ViMY7zhfK9Xtzywquw6D0=; b=Fll6gwxVwQUc/3ug4fDjMG133fB4YWogpa68yUELkvf8RKNJKIFVpSkM7okEmmsO23 qxV5CpltQriExlvIz3suWCb3swjukPFD4gYbTr63mR1ffoGWnmzj5FO7ZMtKkjLExFee T1NPKBPPpR57tZv6BAkDXh09C/2eji8Ime1FCqkkS67o6vVj4EZIZ2A0o6LT5/5G2TGw mYVdwYoqaLEL6RN3ZjR/cBhL1VsiNtGupbg7/zy7kEevtQW1K3fXJSR+GzIG1fxL/64v hnNV7iRs6LAFUCckEoW+ERuEhBy9vhVsbcOIIYeNvFcQ599GRR1p9JFRM0VnugH5xzp3 u+yw== X-Gm-Message-State: AJIora/Ndq/Le1A49FwBMLbTZkOOgB7rGVUncO02xRN908vGTbWxy3PG jVieEwIAfQOmxCQeGReJ8SNwbP31Akj3MA== X-Received: by 2002:a05:6a00:170f:b0:525:467c:3516 with SMTP id h15-20020a056a00170f00b00525467c3516mr21588278pfc.22.1656708538707; Fri, 01 Jul 2022 13:48:58 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id r4-20020a635d04000000b0040da5441312sm8521809pgb.12.2022.07.01.13.48.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2022 13:48:57 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <7656477360b1e993b0a432a13332b48c4b7fc4bc.1656708534.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Fri, 01 Jul 2022 20:48:49 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 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: Kieran Kunhya , softworkz , "Xiang, Haihao" , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: T/AXXgrRGQ/O 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 20b944933a..6b5bf61d85 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.28.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-06-12 - xxxxxxxxxx - lavf 59.25.100 - avio.h Add avio_vprintf(), similar to avio_printf() but allow to use it from within a function taking a variable argument list as input. diff --git a/libavutil/frame.c b/libavutil/frame.c index 4c16488c66..5d34fde904 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..f72b6fae71 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 2e9e02dda8..87178e9e9a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 27 +#define LIBAVUTIL_VERSION_MINOR 28 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \