From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D2773496AA for ; Mon, 18 Mar 2024 21:32:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42DC868D3A4; Mon, 18 Mar 2024 23:32:01 +0200 (EET) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8AE368D282 for ; Mon, 18 Mar 2024 23:31:51 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-513d3e57518so5141157e87.3 for ; Mon, 18 Mar 2024 14:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710797511; x=1711402311; darn=ffmpeg.org; 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=AIcLfEuI7q4uHSdhqVKGJePk+pGF+ICqX6Xt66KS8es=; b=Ap3sltj1A07pqTfaBlFFUOty5fHBjRbQP01IT+50hOpLSFfQSCq8+Ej7p9dOvI296b 1vdN4KBK2oXx/uV1osYwp2gcw8hDgQ6mqHtvJL/I+aFq4y/QL6AfBSieS6Ge7xk1m5Tr p9/ejLHvvYuX3kb6zt76Vtjl7pfEPcftx+GE/OzsK/GYrevsEe7sk2yvfcm568013CPu +ZzRyciVIj7pUovXUQ1pIlVl1PjsN5jSGIf96EvOw2ya3oB35k57J0jpiART0NkNyC5S sYcL5xcotlQ6ciaKgB7m62TlmOw+bzFnnfc95+Jfa9qcq+TZ5C0fsXhASOkrPt5/+TnN +4zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710797511; x=1711402311; 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=AIcLfEuI7q4uHSdhqVKGJePk+pGF+ICqX6Xt66KS8es=; b=KM4CoKlxtExGQ0X6AAoPsgmxFoxjyLLKwI/F1tr7S/sy+FMDjnWAHTcRtLzwI5E9tg iaqBXGjxMgv9p5s0VhqlolYm3+Nsone75YfrqEgLQnC8Im6ZAB6rtKbrKhCpKN0P7O8N 4aHpgu4ahGunSGpc9qxbfq9ihW/Buzus5TOv3u7j8BEM8F+ryUv6AMN/6EIQ1ozMxtYH eMZWsDqzsEXZ586UVfaZ79AqwXRiYeBbbR2tA1i2sDC7LgsyJ/otCrvE1XbgJLqj5SY6 nPynWMKJdGW/krO4hFt33U7tCAuIP1G/GZFSGkf/xnZfKINkXJ4Y2gYBdSD6QZdN0fFX Y1wQ== X-Gm-Message-State: AOJu0Yz7NCmbP53Iz0HH3+5B6aINOg6tXXbXCnZ0qjPXwCyevQJOLQgH DXb9cmgjn33RtBf0V2yav2RqZIGdU7WcrO+rfjG1lVi3Ku1bxeqKJ9m5o7aE X-Google-Smtp-Source: AGHT+IGlb6MiMtr6aKvJu98iLUsLsRVWYuqDmTUwYfdtyVlEv1Oi01dlpysQC81odYr1F4qbR/FGMQ== X-Received: by 2002:a05:6512:468:b0:513:dac5:ee1a with SMTP id x8-20020a056512046800b00513dac5ee1amr6184969lfd.25.1710797510906; Mon, 18 Mar 2024 14:31:50 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c13-20020a056512324d00b00514b5462dc7sm186929lfr.56.2024.03.18.14.31.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 14:31:50 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 23:31:26 +0200 Message-ID: <20240318213141.1376789-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318213141.1376789-1-jeebjp@gmail.com> References: <20240318213141.1376789-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 03/14] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavutil/frame.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index baac0706db..382e1f6d58 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -679,23 +679,23 @@ AVBufferRef *av_frame_get_plane_buffer(const AVFrame *frame, int plane) return NULL; } -AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, - enum AVFrameSideDataType type, - AVBufferRef *buf) +static AVFrameSideData *add_side_data_from_buf(AVFrameSideData ***sd, + int *nb_sd, + 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 (*nb_sd > INT_MAX / sizeof(*sd) - 1) return NULL; - tmp = av_realloc(frame->side_data, - (frame->nb_side_data + 1) * sizeof(*frame->side_data)); + tmp = av_realloc(*sd, (*nb_sd + 1) * sizeof(*sd)); if (!tmp) return NULL; - frame->side_data = tmp; + *sd = tmp; ret = av_mallocz(sizeof(*ret)); if (!ret) @@ -706,11 +706,20 @@ 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; + (*sd)[(*nb_sd)++] = ret; return ret; } +AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, + enum AVFrameSideDataType type, + AVBufferRef *buf) +{ + return + add_side_data_from_buf( + &frame->side_data, &frame->nb_side_data, type, buf); +} + AVFrameSideData *av_frame_new_side_data(AVFrame *frame, enum AVFrameSideDataType type, size_t size) -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".