From patchwork Thu Jan 14 13:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 24942 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 4B88E44B1B7 for ; Thu, 14 Jan 2021 16:25:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26F1D680138; Thu, 14 Jan 2021 16:25:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3E596800C3 for ; Thu, 14 Jan 2021 16:25:02 +0200 (EET) Received: by mail-lj1-f181.google.com with SMTP id n11so6642734lji.5 for ; Thu, 14 Jan 2021 06:25:02 -0800 (PST) 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=w8lLEw0JKLh57u5oQ7FNK+wllA/47qCJWE8KjPy5fSY=; b=H10xmz1PUhy+3VBRxsZfmndBavudUMDo+mnyzXvT0XJpX002CfwRfPd3dLVttsZT50 2G23WUdWEjvp0u3zhhPtrloO7kQN5VRjnIFDPnQgURMU55LWrFcXOfyfKoMY6itS5RMY GnY2qvfjTCIO7kfr9ISBr6zG0Ql0XNrwx1LazFwJrZf2fTemeX14eRirCHJxsnBxwi2+ FNYw0rcATuCvUdCmyO9hHIKQaLwC1n+bDNWA3TdZyOHuFpoK9vztIp4PWmmS+7g88/Eb cqGbaR68+rDfDrrAJf1tPh2nNy8Cl0MoB424SZ3jRz0J1QGcCZV0+ATqUuSsUKWNyuKO 81cw== 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=w8lLEw0JKLh57u5oQ7FNK+wllA/47qCJWE8KjPy5fSY=; b=CiQtYvddyo9O2l7SenfhCXNNrb8k2LugnYz1R1W6+cukcLviJ+UA9Rvtqne0OdjrTa wL4cbyNELA73l7uXtZWuC3sGv7G56RriRvzTTknFkqYPZWIVRHSAI8HhGJ8Gyo5dJ6hG 6hK/tfTvdH53ckD4CYm3i8ZAVMVEunK6bDveXv3WKCA6fKN2bDUFOzMPWzYvNob46Jun 5uvPku94PKu6hB6hk11a5oaYpFAIxtGP0CK2sorJMwwPLqsi9oQkQcjxq6n377HEhDhb M4RV5/0R8s/VwrFjzdfBLYO5OOE/r7ZHrJuWAY8feRNxfLGu7ZbSoUwMoeWj+0WqAS2J R66g== X-Gm-Message-State: AOAM531s2WLVy8rTdQVnZJN8iE38wwFAKb2Nv9mrE/+4YTxbgNufLzXU HcvXzDivnsMYN20IM4QWfdoCgWqN69I= X-Google-Smtp-Source: ABdhPJymlx9D9F4xwglcpXj31wSVweesv1brAk68/STcA81Qjq/Bb948eP9D+rBBKmbPaAJUVrkh7w== X-Received: by 2002:adf:84c1:: with SMTP id 59mr8404442wrg.409.1610632573731; Thu, 14 Jan 2021 05:56:13 -0800 (PST) Received: from localhost.localdomain ([82.129.110.36]) by smtp.gmail.com with ESMTPSA id p8sm10490753wru.50.2021.01.14.05.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 05:56:12 -0800 (PST) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Jan 2021 13:55:57 +0000 Message-Id: <20210114135558.58119-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/librav1e: Fix indentation 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" Signed-off-by: Derek Buitenhuis --- Seems it got mangled at some point. --- libavcodec/librav1e.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index e9b82a724a..46071bcdac 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -443,23 +443,23 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt) return ret; if (frame->buf[0]) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); - rframe = rav1e_frame_new(ctx->ctx); - if (!rframe) { - av_log(avctx, AV_LOG_ERROR, "Could not allocate new rav1e frame.\n"); - av_frame_unref(frame); - return AVERROR(ENOMEM); - } + rframe = rav1e_frame_new(ctx->ctx); + if (!rframe) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate new rav1e frame.\n"); + av_frame_unref(frame); + return AVERROR(ENOMEM); + } - 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); - } - av_frame_unref(frame); + 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); + } + av_frame_unref(frame); } } @@ -468,7 +468,7 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt) if (ret == RA_ENCODER_STATUS_ENOUGH_DATA) { ctx->rframe = rframe; /* Queue is full. Store the RaFrame to retry next call */ } else { - rav1e_frame_unref(rframe); /* No need to unref if flushing. */ + rav1e_frame_unref(rframe); /* No need to unref if flushing. */ ctx->rframe = NULL; }