From patchwork Wed Nov 18 13:05:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gil Pedersen X-Patchwork-Id: 23685 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c00a:0:0:0:0:0 with SMTP id c10csp248172ybf; Wed, 18 Nov 2020 05:05:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwot6SQ3qgVoByP+BA3BCHNoDPNcwUjORRiAfFvW1qtLbE/c8ti7NjG2cHWTHuTTgAM0TQu X-Received: by 2002:adf:f382:: with SMTP id m2mr4907664wro.426.1605704755946; Wed, 18 Nov 2020 05:05:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605704755; cv=none; d=google.com; s=arc-20160816; b=L1I6ndyEoboA8CZjmRaxohWKDaUP068qFBMDWql8HDHM+MJtdUaQkptVoUjiioXl/Z UIxt1AMVhKqMI2uplyUV1/cRupU6na9FO19ebDXCfsho5kcHBsH8D4+w6GbnAJ6Yez+z 0UJwYhkQkuaqn4zAN1jb7obsUsJMdFb3dq/PDS7UfLmjj25hnuURM/FeeTu688lA3ZvA BqalmPkKkY2Hw5OfFaX/BmrEUsbEy5QTr43a1UuLX+WQzm7vuwXZADTZEUqb2pwaOcKo jRWzNeAw2RohEb1Eo1c+TMw1tz/Y0R5d8P29WcV7Zs962mtQ4l9fwlLXSduv53Gno5Fv XKzw== 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:delivered-to; bh=aI2ghA+HPDxmmtplwR8Ild8rr7DTH4Qfy35kgTBCosY=; b=fyV1ZIX75hiJbKlnRX7CRv43QoABy6gyq7HiczF7Wh0OP2WCJoGO7tGdXRyE5lBCUu FNs2V/Vm66DIi+DYD26SDKigE5mZzhfOCyXuIOuU7997+Oxz/IXVRa5SEhNDqEvqMo+l I4URsHNqGuQYsbdPvSCTHkW3o5K3aJ6CbRlziIOKEARkRKG1U68sdQnVfDv0T8I9L8hH x8qwy3ArZ7lhIxR3JGrahjAKJE2jowdEDZvHglfn8+6vA+26PePpZV1pMoxyk2Qmp+VS XjMRVOGDPgEA+iUTw4+I3lUQWBl+WItBoBgBNqqkWPIiYQDVhfWKntVWUXPjmOWnScZw gCrA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 35si22407356wrn.502.2020.11.18.05.05.55; Wed, 18 Nov 2020 05:05:55 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1AB2168B435; Wed, 18 Nov 2020 15:05:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 432BB6897F4 for ; Wed, 18 Nov 2020 15:05:43 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id p8so2149060wrx.5 for ; Wed, 18 Nov 2020 05:05:43 -0800 (PST) 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=jnWT73wk7je30Zh55qpd8jLrBijNWFgB7X4MA9Oer14=; b=RCu/BQuxuTD08zkpVN4NXKoBpMfKP0++Jl9hupOVw6ffQmh0fRIgdV/bjHiQLS+iB7 IwYOHNK44cpX8zNXNR2vMSXJXzusxw/+JELeFh3HrBl8OPAg6j4B+Y/lJVUXVPF9AdaX Z2gigM6Qko3CBW0F6UlmbaQqwsf6Fb+XnCFVGW1ia5R4I7I85jRWKtAGuxAVTKUd3JOt pOtpdItQm5yB8KvNofIR56gtqEsBcKwGCEkX2CnyHmbCqHITDyOodLLh4AB+yU0kjCYW 24Fj5RtUBsHrJnjwD1UfVwb/s1s6HDMjnJpfGrBrZvbKFI5vVpEPlKP7Vg7hro+fs5tT u/dA== X-Gm-Message-State: AOAM5328rGvzk6hrBZNZJWwFs/1MbCpyf+3fv+c5ZSPWB4/BIR0+H6pC 17WpYNH3kWoAYhUaknFmapO191GW6T5Wcvb8 X-Received: by 2002:adf:f783:: with SMTP id q3mr4565348wrp.88.1605704742377; Wed, 18 Nov 2020 05:05:42 -0800 (PST) Received: from ov04.ovh.net ([2001:41d0:303:c09e::]) by smtp.gmail.com with ESMTPSA id y16sm31757320wrt.25.2020.11.18.05.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 05:05:41 -0800 (PST) From: Gil Pedersen To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:05:12 +0000 Message-Id: <20201118130517.585-2-git@gpost.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201118130517.585-1-git@gpost.dk> References: <20201118130517.585-1-git@gpost.dk> Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/cbs_av1: use av_buffer_replace() to simplify code 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: Gil Pedersen MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BfGSwR9sQg4s Content-Length: 2635 Signed-off-by: Gil Pedersen --- libavcodec/cbs_av1.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 9badfe31e4..cf680aed6c 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -896,12 +896,11 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - av_buffer_unref(&priv->sequence_header_ref); - priv->sequence_header = NULL; - - priv->sequence_header_ref = av_buffer_ref(unit->content_ref); - if (!priv->sequence_header_ref) - return AVERROR(ENOMEM); + err = av_buffer_replace(&priv->sequence_header_ref, unit->content_ref); + if (err < 0) { + priv->sequence_header = NULL; + return err; + } priv->sequence_header = &obu->obu.sequence_header; } break; @@ -1039,12 +1038,11 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, if (err < 0) return err; - av_buffer_unref(&priv->sequence_header_ref); - priv->sequence_header = NULL; - - priv->sequence_header_ref = av_buffer_ref(unit->content_ref); - if (!priv->sequence_header_ref) - return AVERROR(ENOMEM); + err = av_buffer_replace(&priv->sequence_header_ref, unit->content_ref); + if (err < 0) { + priv->sequence_header = NULL; + return err; + } priv->sequence_header = &obu->obu.sequence_header; } break;