From patchwork Mon Oct 24 23:04:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 38970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2473013pzb; Mon, 24 Oct 2022 16:04:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7PseTLvJmCNhEHhQ+IXn+R4ZQlHSiCwa88mrAvow8ljAZiDDxdjQo27/AcoUVSE6EKJyDG X-Received: by 2002:a05:6402:1f06:b0:457:149d:beaa with SMTP id b6-20020a0564021f0600b00457149dbeaamr32447476edb.238.1666652690055; Mon, 24 Oct 2022 16:04:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666652690; cv=none; d=google.com; s=arc-20160816; b=bZ40pc/IGlNz5D0pbozFzJZpA4BwpgCPFRvURfw7TjIoogWYbFk7xw6sIL5kuz4N01 sAhM2v8GmcNPjFdV0mLwYc2LnJm9eV/9W7w0j1MFzyq3NL+CDgkygRRXxLsZ7cGFcW/R Db7RGNxSsiD7Z5KLOBbrqFysgnxn9qngXhAy2pBQEH6zIczNfB6J764EsyOiBEclB4FR pj45piyvkIaLU3jKCxIsn5KGkkO5gkZHT8VB67YtmJGgZyTU5pF0wjNVb1a7TwVEn4nc bcLD6oHQN+UohLGwqo6nB8rgs6ZaodH01EilYmijYD00WCrovPx44BReRFyytZaGVLvj EKEA== 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=jBRdF9Yo5QPJRMsusYEQGDQyIiyF4UKT79F5zVQH2ls=; b=da4LRSHqHg5pBqE/H6W09ghxzjhpfT1D+o+uSwpi3YGAOQPMRB5HiKe9cczHJrizsN sk6lLejonvcb7N0D/UshGPG7qXYZwCVveYqjYxMMW+mK9Z8/Qg4/ESetnCAFii5IYqB/ q5cAP8U0z22HAKT15E+cSPqdKBM6axtyp2cxRT5JgNI2SfFmwabpPSRWERyFW9tIB6Tm +5vqghTt4uvkUuYBtYOnWvl6ryPOY9986i6lp+waBKITNJ85o5pmBFY2lphEvB3gFZ3S xaxTzRSwDseP/kSIMRozKeo43ho6NMYDMxfg58Ydwkmz0jfrWx2XYoU36dzTlkvOhTRn psqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LsMxEtVg; 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 gs41-20020a1709072d2900b007894b9de062si1015534ejc.631.2022.10.24.16.04.49; Mon, 24 Oct 2022 16:04:50 -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=LsMxEtVg; 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 9010168BCC3; Tue, 25 Oct 2022 02:04:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A3F368BCAF for ; Tue, 25 Oct 2022 02:04:30 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id t10-20020a17090a4e4a00b0020af4bcae10so10321609pjl.3 for ; Mon, 24 Oct 2022 16:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=iLLsK3ayOmfHpJ4KRD7bpl4w8G+VSKfPjP5EFiMoYGE=; b=LsMxEtVggKn/TRE4E0NuPTyAPwKHcA+IkSioBNs3x5Mk0hrHI2Eq0hzs9b9Zxn8Bk8 dYzKbkwwFLpGHk37lEpttrbQCP6GSvR9aqghhWjrq7n/Hvuvm/XeevhJPWqDu0vqI0uQ uSUN/5nPiTLkqLZ6XY2ZuM1Rlwp98Ek1++1jjQdO3KGqujFjdnDwf1lq21p2WxlmH1y6 MRZx+huIuUz1Ay/48unCEoulkuPYLUV0cCabWkAc/0KJKZbwWTecRmltma9qTVO+pmJE AUJW2N+7UdC4NztdJQj8Th09dR7Tzx2MO3UV8Nbod4anTQWRF+vVhUzorC403SLCdoiI 7cag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iLLsK3ayOmfHpJ4KRD7bpl4w8G+VSKfPjP5EFiMoYGE=; b=HYKKlTzKzevZuNjl2IJiFKe9QxluFSIVYo9gxN7LUg5qCeo0w8qLQKouHnXXlSEqXo t9Tz5KY/JsMdyKZIST0fTiRI1+dkPTa5/wkL+WPWy7/LbK/FtJd0rUYFyATHg5hWMBwP 9lYWdrDZYF/2w5i70nBPtLBYKSTsZ0+nj4wtry9I17DlvKdx9qo+Cc2KJ+24Tb5zvIba rPFfvOrU1oTazVAiCjqdWOjp3Jc4c+PlTwxvMa1ajmvH/eLjnQilkOSS/EWDGb5AEIj9 aRvKUWenZe+aRHxk4A8GD/kQ4XMyPQVNlogntqA7o7UVg2IQkeCWeQbwk2jce0LPX9zV Q5uw== X-Gm-Message-State: ACrzQf0dy4PtzvNMoO9oQzKjTZ9Rktca/HgsGk+/Ttay2zEtJFnyglkj 7T6Ec/oxz3BrDZQVsGrs2vP6pBRUbQQ= X-Received: by 2002:a17:90b:1c90:b0:203:b7b4:b1cf with SMTP id oo16-20020a17090b1c9000b00203b7b4b1cfmr79085481pjb.160.1666652667944; Mon, 24 Oct 2022 16:04:27 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id t9-20020a17090a4e4900b002001c9bf22esm369614pjl.8.2022.10.24.16.04.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2022 16:04:27 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <28c4b9e3240b6876b6402696dc809b120a5fbca3.1666652664.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 24 Oct 2022 23:04:23 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/2] 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: bHsPhMLzlcLf 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 | 4 +-- 4 files changed, 79 insertions(+), 28 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5807bf8069..a65482ecc4 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.40.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-10-11 - xxxxxxxxxx - lavu 57.39.101 - pixfmt.h Add AV_PIX_FMT_RGBF32 and AV_PIX_FMT_RGBAF32. diff --git a/libavutil/frame.c b/libavutil/frame.c index de4ad1f94d..8eb0e1ec95 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -276,9 +276,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; @@ -319,31 +355,10 @@ FF_ENABLE_DEPRECATION_WARNINGS 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 e60a82f6c0..5a3362fb55 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -861,6 +861,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. * @@ -913,6 +937,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 cb0c928bd0..2df788e529 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 39 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 40 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \