From patchwork Thu Mar 1 16:48:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 7778 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp5252916jaj; Thu, 1 Mar 2018 08:48:33 -0800 (PST) X-Google-Smtp-Source: AG47ELt0Ev1MBImy4n/lNR09IN35grnUXzC5NWXAMxN2Bi1w2MQNrlIQVJ+lDyWkVuqrtNb+LhRm X-Received: by 10.223.144.131 with SMTP id i3mr2298821wri.218.1519922913015; Thu, 01 Mar 2018 08:48:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519922912; cv=none; d=google.com; s=arc-20160816; b=ccnM2YHy56AUgOMxVmshuOCZAWaydtwWhCimkVogxQxeiDfREKqkmk6GWPm5tlrkzS /RCnL2xPK6HQOGr7gh0pneAhgYhju0AgwN8rwZH+5gGJ/wQzYWZpOOrt7GO+qKPQN7HP F+tYfvtP4clzKLqLQZAA912kYrDC4gAbAAc7+9lKRdbYvFahZdNAxlSFyiMZzWDtdpeQ Pxqyw1/yNd5Zm7h75wwQkULF2/89gPVs1lrrLA/lvrwxfERAAvTZ5IAnGZ3wcvma3ayb tLPXpfgR+O5opUCK7/dI++n9/qRJT//L69UwExF6LFqdrMUL7dBQDHsZdL7KQWPqufWJ tNOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=aUgp9+g1wo6OV31PBhceB7kMxpHNDyB9S6SBMRYS3y4=; b=CczE6FybGdHkfkLsZjee2iXkeVjUxVrcn5TAmnw4DCJsVe4dmkwNNCUBln/yCnNTxC YNMWEfs8aBTRFEUmeJSm5piPo5mIAATQNzuJ0/1rJ0EtNTr+/ngPyfHmQnL3BT+b+H2N /QOpjxRm0XeBDZ4QvSjcL30mGm90iREqH4ozMO8uzC+Y97KzflfBsn/ApN6aI0KTio5b BnrDVw3Ndj/sJlp5hYYnX8FUwHGX/2zhgjqeOY/dO6ql2q1BedrNFcQ6kv6rPeLI4sNL +IKOF6TVsJfYhjN3hPdEpD8iIywJL+tNUh6QA4BFi20sZBZ4ICRV5OFS8hwrAvycuc1b JJag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MlC8lDG1; 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 e16si3163101wrc.405.2018.03.01.08.48.32; Thu, 01 Mar 2018 08:48:32 -0800 (PST) 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=20161025 header.b=MlC8lDG1; 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 10A6C68A3FC; Thu, 1 Mar 2018 18:48:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB24968A1BE for ; Thu, 1 Mar 2018 18:48:18 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id v18so6626606wrv.0 for ; Thu, 01 Mar 2018 08:48:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hK7NfomR3OCsH3+R+kEAUg4v0wBj9JtnirwE7Zo4STw=; b=MlC8lDG1h3BiYDbPC5Jat5PDq6E438lJ5CDjT5PJ97MukZ0BGhUtFdZXcHsqAYk/YB kPocwNCb3MVKcMf5pekOzJPaAN+EecIMbxK4COFK76CZHiP7vaUyF1ON65Z7zHTVfytt YRt2g1QTwXLSUZCoLuAIpNX8UH5JuSB8CJlt2XiF7ShcNo3ban11A71zVJUIfukduw+w mNH+GM/HD2NUFUJtGsK4UJEmdlsa2pU/sD1qVeudu4QgKKEJmDbIT2GFAjLemsqs638G kJNdyeKgJhLRDsBnLTqqJrBCwJMHF+qr02SZcRP8YB0FWDzEQxJ+6jxLjU5JYbax39BL 3Wtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hK7NfomR3OCsH3+R+kEAUg4v0wBj9JtnirwE7Zo4STw=; b=GcL9JJu6HFZgbYdBkDtq8N/vgDyRlvSt6HILOCzeOMdcGWov6Znqj/MUGZtwZVr2RD MsL8aSjzXyd/teVhYb9hAau3gno1yp4QPc/obyMiTSM4uW4ZItJZEwbtxJL/aCxLOZbX LgZk1AKpxMCDAG7AayfeXnbG2OmAgAYSidRDSSXLNOPSg5A0jJjibJvne4BkMySLhdvp xnNKUc1LF+/HUjsD2D2m8K6fZUI5jiJP0NC5TqFTsqF6qJYXnt8HxmyspnCqx+IeVnGa 5OS2MFy4sHrh+TOZtXjfRvbJ55GgnfqKCiXMGoJrkJSobf9HvA31TFwe7/H4mLjAAENW rGSg== X-Gm-Message-State: APf1xPAVYx7xeRqzendKuQ+OOnNZhqRx9kKCP8mOW0fbVMtjFFEjW4ut Hpe6CWbEdh6RlwThnr7OYZ53pyhO X-Received: by 10.223.192.74 with SMTP id c10mr2548222wrf.145.1519922903388; Thu, 01 Mar 2018 08:48:23 -0800 (PST) Received: from moonbase.pars.ee ([2a00:23c4:7c88:af00:28e9:f50d:c7d9:1df0]) by smtp.gmail.com with ESMTPSA id 96sm5109653wrk.54.2018.03.01.08.48.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 08:48:22 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Mar 2018 16:48:17 +0000 Message-Id: <20180301164817.2479-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] frame: add an av_frame_new_side_data_from_buf function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Rostislav Pehlivanov --- Changed so that the function will not create a new reference. libavutil/frame.c | 45 +++++++++++++++++++++++++-------------------- libavutil/frame.h | 17 +++++++++++++++++ 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 662a7e5ab5..a49c853493 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -26,11 +26,6 @@ #include "mem.h" #include "samplefmt.h" - -static AVFrameSideData *frame_new_side_data(AVFrame *frame, - enum AVFrameSideDataType type, - AVBufferRef *buf); - #if FF_API_FRAME_GET_SET MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) @@ -356,8 +351,10 @@ FF_ENABLE_DEPRECATION_WARNINGS } memcpy(sd_dst->data, sd_src->data, sd_src->size); } else { - sd_dst = frame_new_side_data(dst, sd_src->type, av_buffer_ref(sd_src->buf)); + 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); } @@ -642,9 +639,9 @@ AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane) return NULL; } -static AVFrameSideData *frame_new_side_data(AVFrame *frame, - enum AVFrameSideDataType type, - AVBufferRef *buf) +AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, + enum AVFrameSideDataType type, + AVBufferRef *buf) { AVFrameSideData *ret, **tmp; @@ -652,18 +649,20 @@ static AVFrameSideData *frame_new_side_data(AVFrame *frame, return NULL; if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1) - goto fail; + return NULL; + + ret = av_mallocz(sizeof(*ret)); + if (!ret) + return NULL; tmp = av_realloc(frame->side_data, (frame->nb_side_data + 1) * sizeof(*frame->side_data)); - if (!tmp) - goto fail; + if (!tmp) { + av_free(tmp); + return NULL; + } frame->side_data = tmp; - ret = av_mallocz(sizeof(*ret)); - if (!ret) - goto fail; - ret->buf = buf; ret->data = ret->buf->data; ret->size = buf->size; @@ -672,17 +671,23 @@ static AVFrameSideData *frame_new_side_data(AVFrame *frame, frame->side_data[frame->nb_side_data++] = ret; return ret; -fail: - av_buffer_unref(&buf); - return NULL; } AVFrameSideData *av_frame_new_side_data(AVFrame *frame, enum AVFrameSideDataType type, int size) { + AVFrameSideData *ret; + AVBufferRef *buf = av_buffer_alloc(size); + if (!buf) + return NULL; - return frame_new_side_data(frame, type, av_buffer_alloc(size)); + ret = av_frame_new_side_data_from_buf(frame, type, buf); + if (!ret) { + av_buffer_unref(&buf); + return NULL; + } + return ret; } AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, diff --git a/libavutil/frame.h b/libavutil/frame.h index d54bd9a354..6745e7d7b2 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -800,6 +800,23 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame, enum AVFrameSideDataType type, int size); +/** + * Add a new side data to a frame from an existing AVBufferRef + * + * The ownership is not changed, its up to users to create and pass a + * new reference if they still need the AVBufferRef. + * On error, nothing will be changed and the function will return NULL. + * + * @param frame a frame to which the side data should be added + * @param type type of the added side data + * @param buf the AVBufferRef to add as side data + * + * @return newly added side data on success, NULL on error + */ +AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, + enum AVFrameSideDataType type, + AVBufferRef *buf); + /** * @return a pointer to the side data of a given type on success, NULL if there * is no side data with such type in this frame.