From patchwork Wed Oct 12 13:08:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1367344pzb; Wed, 12 Oct 2022 06:09:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6cjFcm1lxZ9vJyG+P2kT1PgyoGeeLfhJe2fvOXX75yynsUHLoaUX57KZz4CEjTsGgCaRoR X-Received: by 2002:a17:907:1dc7:b0:78d:c153:d64a with SMTP id og7-20020a1709071dc700b0078dc153d64amr10110504ejc.429.1665580186401; Wed, 12 Oct 2022 06:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665580186; cv=none; d=google.com; s=arc-20160816; b=Fh6nX8p8XcjOPkxFxw8YO9xhE13Ed0wrVIXgqwMpyN2ucJiDtFusbMhm/w5zSZxu3F o+K7L5D53O3+gfLrTrH+GIJlipGBDfgcWGz8U+EEv0NAV6o7jPAxkK27g2QnfPJUNfS/ ioMViDSNTHbRnhz/Ov5WMaaHIpBbP+o14aidZJQVjMo9UG7YccJu2fqeOFtlTILD4xv4 NmJevAoLcdvUApBm4Yr/pzb53kxhbMDhnQ7tdGajyOgJpnFu6slHudiqxNGTI9zCE1LB 0Nu5ww/468Q0fwQ7sfD7Nl5W/V1E1gPmp1BT4Re0GXV8hMEGCTCE/92ACQyPr4SWKfDc l+Iw== 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=tMRJ8NB58EFxTsRYWi9G4RWlygsisKXJg/gu/2IMG/Q=; b=Hc+lnb42xBM8NxPOLJGGzICNq3RHuKnNFp/CVeXR+N9UTpC71lBFWNvO2YJWg83nN+ AqmARazMr++YzjztdGQDB0XYEXTB9KWdiTlLbO2Zpw/nZInmdZq7rPHgyeuuzWpb34Ve TDJpE+qgBqLTRsjUMleWMUgdPoyOxreeJMmXHpK/ffTg677VUKGxYq0ccIySfBFHCAGF EGbZjngxb3QpunEfyLG/W0C7ncVHnzEqCD/WtYyKDly3mLk9ohR0H6x3BWxr5KRpsuXW 0y0K/SUP83xad3r8AVfJga3EvTSC3kcXoCH55RpUh9daSU2epFphctCd8tBFR5Z7rJs8 vpDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=F3FCvfPa; 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 t9-20020a50d709000000b004542c9947c1si16409971edi.217.2022.10.12.06.09.45; Wed, 12 Oct 2022 06:09:46 -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=20210112 header.b=F3FCvfPa; 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 DB73868BD53; Wed, 12 Oct 2022 16:09:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49AF068BC9A for ; Wed, 12 Oct 2022 16:09:11 +0300 (EEST) Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-132fb4fd495so19358182fac.12 for ; Wed, 12 Oct 2022 06:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=wyCg6k1YxXbr2bpsHm9dopKjsjnk7hUFWkBtyWEzeNw=; b=F3FCvfPa30yGUxNzbSmW3sAdGw5ohRwpv9NVQNCFfRHjFg7aGD7aUMI9HUvMteTkx/ J9wSmW8gYtAtPHUv5Mv3gvYThTO/4hGxVRWyi2ZRjF3lkEdQx31nXsoWl/rmiHlMD+ID nGG0Ol4Yzaq6Rc2LoM6+K4XHcgPGL9tYxiDsoRU75e07m+p60XdbT2Sh8Xtc5VKusJKq mjT0k+roZB/j/LKDHA7uTXQwqhC9OOgKnR9uXEj/8RSORLW19N+VWQOJvPmhUH2VrRfc ishm6aPhAq49bB69F8h5B7/l8oQ9IqAsAEpKIbcxUkAQQzvfSqFnbYPA+9bEeAXu3u4G eWWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=wyCg6k1YxXbr2bpsHm9dopKjsjnk7hUFWkBtyWEzeNw=; b=Ag/5GQQWu3vnR4Cl4wl3aZc4TxooBzzjjDmxmjTuVhp6E8Cl/HvM+MH5cVlJysuZMb 8aNRnKDb1vdVMqWL/V6I8OcOJPaxoFpMfY/ZNEjMqIz9ieOd6yb0Y8hYwe2ILBvUL37t mbBGmTYqhrMO2LYhZmfYuVaIrnowRcNXyX/4ZH0UMEn3MRt7mafevhWN7G1p/YPqZXKX gxtSLHXqqEO3IugjxYuEs0vJ3Swr4Cj1kAURpZzqjIPgBCAJAmA7zJS5sjUMVRV/o7kj mXOObz6TFwXGBm9kRB34hf/Qb2FXqG+Obaq90KPhgPl0dLnJcBfZhKBqtTWavIM3aRlr gnfQ== X-Gm-Message-State: ACrzQf3YBmS50Ser94+OGSIxheVObRyqDUPDudBxbj9wyUBxYJjMxAhp F6jsoWASpnrWxuHoeSJz4Ef7OaBll2Y= X-Received: by 2002:a05:6870:f10f:b0:132:5c4f:5998 with SMTP id k15-20020a056870f10f00b001325c4f5998mr2444945oac.118.1665580149542; Wed, 12 Oct 2022 06:09:09 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id ch15-20020a0568081c0f00b0035028730c90sm6664092oib.1.2022.10.12.06.09.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 06:09:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2022 10:08:29 -0300 Message-Id: <20221012130829.2392-4-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221012130829.2392-1-jamrial@gmail.com> References: <20221012130829.2392-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/librav1e: use lavu image helpers where adequate 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: bvfZi/AR6gNv Signed-off-by: James Almer --- libavcodec/librav1e.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 130417622a..284af34ec4 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -437,6 +437,8 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt) if (frame->buf[0]) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); + ptrdiff_t linesizes[4]; + size_t sizes[4]; int64_t *pts = av_malloc(sizeof(int64_t)); if (!pts) { @@ -453,12 +455,20 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt) return AVERROR(ENOMEM); } + for (int i = 0; i < 4; i++) + linesizes[i] = frame->linesize[i]; + + ret = av_image_fill_plane_sizes(sizes, frame->format, frame->height, linesizes); + if (ret < 0) { + rav1e_frame_unref(rframe); + av_frame_unref(frame); + av_freep(&pts); + return ret; + } + for (int i = 0; i < desc->nb_components; i++) { - int shift = i ? desc->log2_chroma_h : 0; - int bytes = desc->comp[0].depth == 8 ? 1 : 2; - rav1e_frame_fill_plane(rframe, i, frame->data[i], - (frame->height >> shift) * frame->linesize[i], - frame->linesize[i], bytes); + rav1e_frame_fill_plane(rframe, i, frame->data[i], sizes[i], + linesizes[i], desc->comp[i].step); } av_frame_unref(frame); rav1e_frame_set_opaque(rframe, pts, av_free);