From patchwork Thu Mar 1 17:09:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 7779 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp5282250jaj; Thu, 1 Mar 2018 09:15:14 -0800 (PST) X-Google-Smtp-Source: AG47ELsWQJYCdciOez/WZAfbj5c89Zx6aOD5hsiPhf39JTqtNEjZ4+TWjrg6VazH7c3BNniqDXSm X-Received: by 10.28.40.214 with SMTP id o205mr2248806wmo.22.1519924514073; Thu, 01 Mar 2018 09:15:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519924514; cv=none; d=google.com; s=arc-20160816; b=CDPkwnLiKemMMhtSwB/i63B+tmrNFMb6QUQPJLJ8oN+Z9KFZy0StDD1Kb4qJjXnVjj IKJIwdwn5L34/RxV3QkQ09aFcykrWOiYsymSkNZp8gsz/V7kK+i3dY88M+g3ufXcD2nj lc0DX3J35jT3VN4Wmixj8KlyKp8n5KOayeuEO15nEgxqa4DZNLGeNH9guqA/6Z6be9+7 BPtEKVjP2Y8MJbWRV8I3RCTOc9xHMkUTVTm4MW+1V3G9VH9hfO5VB+YBfBFWRT/jtV2r ahblzFTl9pBRfAVgYG+SrKrugMo/MUGrOklZgUQmiQbtDBqYuEqmO6Qj8/GZHB3VFoMD RHfg== 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=lJAQ8mHqPcj/K4XQ0FkV35sCP9aKC8NHfkl/D/RnJio=; b=JDtd1P1W0cSngg2v1Lcn+hTIOhvBLe51U9ykmP6e6lW400cW8/3WTcfTV3f9nAkisX xdHgtT9uWS2mR6rhSYEgfFyVyhXPTvPuvy3cOAp/oSwBs+ty0FNsCd/TAxL4vJDxbWvp NuquLSAh9BHRcCtYrczuzUQtTjF15nkp996bHXub5nAt4hOpqfO5GCYPqZ13jUkYArCQ zFEvIXW317PkOrEzMprPp302sAF7LrDJuZWs3K4W6TW4xydqfQ9QJEY3T3a5S4cmZy0P Mw4eXaxAQuyfXl/X8OVrQXyEV2Qah/+Ej4vOIGR6B1WnxC4v1IGVz1lBMAMShVIlbgf9 1mpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=u/5Ro51i; 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 d7si3133971wrf.337.2018.03.01.09.15.13; Thu, 01 Mar 2018 09:15:14 -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=u/5Ro51i; 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 6227D689983; Thu, 1 Mar 2018 19:15:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BA0D68A1B3 for ; Thu, 1 Mar 2018 19:15:00 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id 139so13630479wmn.2 for ; Thu, 01 Mar 2018 09:15:05 -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=jJ1Rg38kSUQ0f5uYkRokzeWyTLZ9/Z4dYDsA5ccyafE=; b=u/5Ro51iRGWfvzL/ZsRCJmh8usDKiw95fP/VT3DbwliWxT109KqJJ0BKaKlm0bcYCm JP024BkeUyxlIUUKsXX5WgVKZpfAmvRUmyee5QNw3C/cL9noPUfUAK2tiCVCIQO7UnL0 uCc/iHnw1PFvJVLMZ7KGyAHUz29WEi85b2Gt3WfpX9nbHKyAuhvPHuv+BO55ignATDSK B0pOs4McoZrIpQevA7zHYl48QPhAkyKmGbLG+GrBJUwU9rtqiqj74LcR2KD06+xrEktg FPt1YX+RzgoHS5ChZYSYLHi10MSnvgXJ73HHPDOilAjNqSNDWBwNMhNlUWY+t7IcDNeq Odcg== 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=jJ1Rg38kSUQ0f5uYkRokzeWyTLZ9/Z4dYDsA5ccyafE=; b=bFx5slFTGMf2eUQesyCTE8oOiTr6H1GH9Cp2RfGY3WQP0GAxkubMzQ+u3In976Vfzl d8nbDpAD+H7471nd3mxvVAkQd9fnX0VGkWD34RaS2xthYNCgFRTyn8PWlEuFbJKVFZuX 4On/30bYsz2kJkk7hg2akSRn5vcLISYeNP8jLXZs84+rfoSqkEIyQb+0ucrkZdDEz2DK fuqidRCjLQalkgO/1OmH8P4VpDsxcuFrIpFAOYGcfgBxlJoEQKBcNzO3se14Skb9EC7P nyIMaoFHA+witiKWtSuf/bcRFah82QsDJ9zu7cz4aShCPdtqKHTRiP3pn3zZDl3Li+uP MuZA== X-Gm-Message-State: AElRT7G7FhN473+1aXXI4dzBJyvk0ue3worSK66CaqganTaWLNP1XPQ3 6sJVNcTRfKaUD2POGx5n/fpxtQ2x X-Received: by 10.28.133.200 with SMTP id h191mr2609276wmd.39.1519924173761; Thu, 01 Mar 2018 09:09:33 -0800 (PST) Received: from moonbase.pars.ee ([2a00:23c4:7c88:af00:28e9:f50d:c7d9:1df0]) by smtp.gmail.com with ESMTPSA id r98sm11247006wrb.70.2018.03.01.09.09.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 09:09:33 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Mar 2018 17:09:29 +0000 Message-Id: <20180301170929.3003-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <467017e6-5dde-4bd7-7730-bde8968a69c4@gmail.com> References: <467017e6-5dde-4bd7-7730-bde8968a69c4@gmail.com> 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 --- Yeah, that sounds better, thanks. libavutil/frame.c | 45 +++++++++++++++++++++++++-------------------- libavutil/frame.h | 16 ++++++++++++++++ 2 files changed, 41 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..59cee8ceab 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -800,6 +800,22 @@ 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 + * + * @param frame a frame to which the side data should be added + * @param type the type of the added side data + * @param buf an AVBufferRef to add as side data. The ownership of + * the reference is transferred to the frame. + * + * @return newly added side data on success, NULL on error. On failure + * the frame is unchanged and the AVBufferRef remains owned by + * the caller. + */ +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.