From patchwork Mon Mar 18 13:38:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12342 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 79AB244719F for ; Mon, 18 Mar 2019 15:39:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A14E68A880; Mon, 18 Mar 2019 15:39:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F729689F31 for ; Mon, 18 Mar 2019 15:38:54 +0200 (EET) Received: by mail-qk1-f195.google.com with SMTP id g1so5363231qki.5 for ; Mon, 18 Mar 2019 06:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uoDTq1OSI2ZmL01uD37Y9Bjlz0Slpq5Nr/EbUGEKFqY=; b=kVdf187rdIWCAvBJGPNb12lLMeL7IDZbF2rfxpQwMmiZdt5ubGd7vmQU9Vw9tKGjDa 7d7J1lcah2usSOwEvmEcvBN+Q8oV/UmKoPjpmwJA+nmjfmypEL//XDlJkeyJGkePUxD3 LkVEOlkDqmgmeKzozQLLgan3xNCgUt/tM+c7SkhvLw64MQE39WNOPEUZZdfgnvlECMNi 9nggZUBn0Lq6ePRBOwSfaYw40Vrqm4rS5P5j+A3PQsstXvMntJjmi0VAxO4nFhqbowWw 8GueEXCMZ9SOxLA6D0df0hr2Wyud72pVhsV90A33SppNYCOo6wxC6nX8LWtVQOBJmL0O pzwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uoDTq1OSI2ZmL01uD37Y9Bjlz0Slpq5Nr/EbUGEKFqY=; b=tD+hLGuvgIim/v8j7kpzsNECjLG0FbNggWUeVoTApBIpZXGas6GTXmoqyczS6+Kt1t OVrXhLHX9cca6yXs6vvCq4ahLvslR1mL5hZ7jjTrfoGwIp/3yb8MCsK4CE2906RhzEkG m2an2NFQXApi3UnvG0zvb/Hn5mS23DaUaOR6yxrI04zxqpGisc+2iYdhE8ZptmajFze+ sX7L0/oU947rJdtvjWNm7pSjxmOZzaUSH4wIBQ/TKJJNHHBTI1X3qQJbwbUwYBVm5kDC l0TJfDxkmg1d0Vy9qVkvIC6hEKyxWgUfx31R3I2IB1JOVEsPvAxCoBLdBPf5Td7vn49T YjAg== X-Gm-Message-State: APjAAAXON9sAX7UhkLiu4eZcJ93/3nQC/zWA6o/1a0mcjFybXbXzvkNf fjqkwvI7kBmzlRzz4n4qJoFpiEGr X-Google-Smtp-Source: APXvYqx/lyIHfSmJPcSn9eG4BHg0/NN+W3NkInRvJj9EIZC4Q3zmHevY0vJ0jmldiBGU8GAzLlcTAA== X-Received: by 2002:a37:414c:: with SMTP id o73mr13100385qka.323.1552916333167; Mon, 18 Mar 2019 06:38:53 -0700 (PDT) Received: from localhost.localdomain ([181.23.66.178]) by smtp.gmail.com with ESMTPSA id d18sm4593934qtn.36.2019.03.18.06.38.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 06:38:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2019 10:38:31 -0300 Message-Id: <20190318133832.4300-1-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: use a reference to the allocated buffer instead of wrapping the Dav1dPicture 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Removes an av_malloc() per frame. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index d9079cbbef..30c6eccfef 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -149,18 +149,11 @@ static void libdav1d_data_free(const uint8_t *data, void *opaque) { av_buffer_unref(&buf); } -static void libdav1d_frame_free(void *opaque, uint8_t *data) { - Dav1dPicture *p = opaque; - - dav1d_picture_unref(p); - av_free(p); -} - static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) { Libdav1dContext *dav1d = c->priv_data; Dav1dData *data = &dav1d->data; - Dav1dPicture *p; + Dav1dPicture pic = { 0 }, *p = &pic; int res; if (!data->sz) { @@ -194,10 +187,6 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) return res; } - p = av_mallocz(sizeof(*p)); - if (!p) - return AVERROR(ENOMEM); - res = dav1d_get_picture(dav1d->c, p); if (res < 0) { if (res == AVERROR(EINVAL)) @@ -205,17 +194,15 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) else if (res == AVERROR(EAGAIN) && c->internal->draining) res = AVERROR_EOF; - av_free(p); return res; } av_assert0(p->data[0] != NULL); - frame->buf[0] = av_buffer_create(NULL, 0, libdav1d_frame_free, - p, AV_BUFFER_FLAG_READONLY); + // This requires the custom allocator above + frame->buf[0] = av_buffer_ref(p->allocator_data); if (!frame->buf[0]) { dav1d_picture_unref(p); - av_free(p); return AVERROR(ENOMEM); } @@ -310,6 +297,7 @@ FF_ENABLE_DEPRECATION_WARNINGS res = 0; fail: + dav1d_picture_unref(p); if (res < 0) av_frame_unref(frame); return res;