From patchwork Tue Apr 11 21:20:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 41095 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:907:3203:b0:94c:9d7a:e065 with SMTP id xg3csp1125760ejb; Tue, 11 Apr 2023 14:21:54 -0700 (PDT) X-Google-Smtp-Source: AKy350ad5HrpcBcGVMa9tZq3Vdg8w5M89wPqI7OJZb/q8H0ZotCOUWpsMGwjVh8mq9RO/sVFPq+4 X-Received: by 2002:aa7:d445:0:b0:4fe:19cb:4788 with SMTP id q5-20020aa7d445000000b004fe19cb4788mr3626991edr.42.1681248114490; Tue, 11 Apr 2023 14:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681248114; cv=none; d=google.com; s=arc-20160816; b=M/Jkdw5K5sQcovMwhjxFn2a/jtf/86G0VLdIE07SnMf+7RwK2ZVspojufa7OZHUTCH lsJDoZM357HuQZ7jfpq+teb2ZZf1aY0+tHqRT6NyNkLmRIZSEjPRSrdzhXiLueTTF8tC 2e78jk1sSiSCfQ2P2wHj37jUnvBop55RXjL9d6JXl13BCdvw2ApxouuBQ9rJElk2BP51 JWvXyeXqgShaUAyHHhJXNrmz29ZXLRhuJhHl9zkArrlyiyRbg/pXs4rNmq8ZZyOpMWss 0ltIw7kCGW7iM0JjATJfdaxZphh0g3Ep3Ily9WCom8wUD0QKVVZKGWuhYKnmBTrtqQne hcwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=+7JzOg6g+JCRGlzlcBP6UMjGC6ZmNpZYks+Lj1yZT6U=; b=fsrRh8KMyn0csRYYarvTnYqNoa6YPpf4HeeysDk1nFZa/OfP7W+AWvPWW4BjsKrqvX BvFsinmKUREEh0P4KrrJuIYLPU5ga2JSjWMz+mOiZvHcoDIShbYJpBWpsbQEViMKgbw/ bKv4GCQ0Bw9KX10XGbYdI4FjY7OxIhhIvh4UFJE7eY/Hi55/YhFg2LiddFJP8+44RkQV Lsxf2BS7gygRZBWM7UPQlnn5JuOdeNdHOCSFhiZ/bHHUFz0CYl8tBq1+T7Y1ZYtSczK8 DbWFNphe8w2tEVBJirMwqRjENdFnr4iVXR+xCUhKZXzpxgezJOXtAstOxPmptRoUvj1v uiAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=oHOjn2P+; 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 h23-20020aa7c617000000b00504a2c8a9a1si4775070edq.157.2023.04.11.14.21.54; Tue, 11 Apr 2023 14:21:54 -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=20221208 header.b=oHOjn2P+; 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 628206899F1; Wed, 12 Apr 2023 00:21:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAD3E68BAEC for ; Wed, 12 Apr 2023 00:21:03 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id y4so9744796ljq.9 for ; Tue, 11 Apr 2023 14:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681248063; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mWaYaFYBsZtUbVJpWS6ur2SQRzPNckXBsp+HIlQG0fY=; b=oHOjn2P+0uCnr0nrGVxHBH1eMILD6Xrc+wObTHZ3qQWI7oHK2k1zGziSHodqM2/i3k aRE3+uwiVuVN1EjU89pmUgGjIXlv//4qSQKufL9uI2EZB8uDeNaAaj4hPDFVbs0vE2jQ cL+/L/S8GvCGFMKaO5n2nCPGl702bKM0K0R2ieBV03Rcq9nXsAWcHH3lUM04BMtxFtq+ GRWRzRoFrtC5/u5vG12uM8e0vD+Qr7SYGIlUsvPcvQrRC42gCqWGsySYq8Ym3lC7pgbO W08AfWAzk1pDXHgR9RgOp7yDmLM+rpYPQ4P5OsfZkqHRvEATO+36d+PXsjVo2XbfzUOX QmiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681248063; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mWaYaFYBsZtUbVJpWS6ur2SQRzPNckXBsp+HIlQG0fY=; b=it6sYq0qhj1NEiF8EC5SrTW6BRhf6I3V7ZpJPNwoUhLFBdiRHiNtRq+16Ti06hHsZY 8o3yILfG/BSgQDQc5ZdgDtsiLzPAhSKjCmWiG+8zGLmrarRte7moaFuFo3qblE4cpLD4 FW1jM8D657i1A+0dIa7s6lYVZ3y2kMzUvRrbChELJEeRWTNYEdmxU4Iw0mqoRpPdyp1z pzn0jHx4iFGvSZXrNoCnHwa64H6Cm58I9tPA732IitCtFjwH6d0BuPdzVyyT2NPNgm8F tKAoJk4POGiuQq1ERXU7+MJ0qeHqVPXx4aFlTPCMV232YBBFqZqU/pWYR1vqVWH+DeW0 T/2Q== X-Gm-Message-State: AAQBX9dPX8dqhAx5T4IaAXhgXH+QTUiL+Ef6nz8nIA/lMIy+afkarKOk lKoxM7LaSFuTIGN3F/UYAylHhCwUPQ8= X-Received: by 2002:a2e:920b:0:b0:2a7:7b5e:271 with SMTP id k11-20020a2e920b000000b002a77b5e0271mr934393ljg.24.1681248063020; Tue, 11 Apr 2023 14:21:03 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id w21-20020a2e9995000000b002a7778bd271sm1195055lji.20.2023.04.11.14.21.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 14:21:02 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Apr 2023 00:20:44 +0300 Message-Id: <20230411212052.159889-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230411212052.159889-1-jeebjp@gmail.com> References: <20230411212052.159889-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 04/12] avutil/frame: split side_data_from_buf to base and AVFrame func 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: De/eAhgpmt+6 --- libavutil/frame.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 24038cc0fa..ab1a4e7f6a 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -648,23 +648,23 @@ FF_ENABLE_DEPRECATION_WARNINGS return NULL; } -AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, - enum AVFrameSideDataType type, - AVBufferRef *buf) +static AVFrameSideData *add_side_data_to_set_from_buf(AVFrameSideDataSet *set, + enum AVFrameSideDataType type, + AVBufferRef *buf) { AVFrameSideData *ret, **tmp; if (!buf) return NULL; - if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1) + if (set->nb_side_data > INT_MAX / sizeof(*set->side_data) - 1) return NULL; - tmp = av_realloc(frame->side_data, - (frame->nb_side_data + 1) * sizeof(*frame->side_data)); + tmp = av_realloc(set->side_data, + (set->nb_side_data + 1) * sizeof(*set->side_data)); if (!tmp) return NULL; - frame->side_data = tmp; + set->side_data = tmp; ret = av_mallocz(sizeof(*ret)); if (!ret) @@ -675,7 +675,23 @@ AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, ret->size = buf->size; ret->type = type; - frame->side_data[frame->nb_side_data++] = ret; + set->side_data[set->nb_side_data++] = ret; + + return ret; +} + +AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, + enum AVFrameSideDataType type, + AVBufferRef *buf) +{ + AVFrameSideDataSet set = { + .side_data = frame->side_data, + .nb_side_data = frame->nb_side_data, + }; + AVFrameSideData *ret = add_side_data_to_set_from_buf(&set, type, buf); + + frame->side_data = set.side_data; + frame->nb_side_data = set.nb_side_data; return ret; }