From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AA7FD471D9 for ; Thu, 28 Sep 2023 13:03:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEC5F68CB2C; Thu, 28 Sep 2023 16:03:27 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13A3068CA6F for ; Thu, 28 Sep 2023 16:03:21 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C7B36240490; Thu, 28 Sep 2023 15:03:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id nth0TAkbEeWt; Thu, 28 Sep 2023 15:03:20 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 530AC240445; Thu, 28 Sep 2023 15:03:20 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 361A21601B9; Thu, 28 Sep 2023 15:03:20 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: References: Mail-Followup-To: FFmpeg development discussions and patches , Andreas Rheinhardt Date: Thu, 28 Sep 2023 15:03:20 +0200 Message-ID: <169590620019.6638.10581942324909893781@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 04/42] avcodec/h264_ps: Use RefStruct API for SPS/PPS 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting Andreas Rheinhardt (2023-09-19 21:56:56) > diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c > index 5657327f0c..632f5b23b2 100644 > --- a/libavcodec/h264_slice.c > +++ b/libavcodec/h264_slice.c > @@ -363,25 +361,16 @@ int ff_h264_update_thread_context(AVCodecContext *dst, > > // SPS/PPS > for (i = 0; i < FF_ARRAY_ELEMS(h->ps.sps_list); i++) { > - ret = av_buffer_replace(&h->ps.sps_list[i], h1->ps.sps_list[i]); > - if (ret < 0) > - return ret; > + ff_refstruct_replace(&h->ps.sps_list[i], h1->ps.sps_list[i]); > } > for (i = 0; i < FF_ARRAY_ELEMS(h->ps.pps_list); i++) { > - ret = av_buffer_replace(&h->ps.pps_list[i], h1->ps.pps_list[i]); > - if (ret < 0) > - return ret; > + ff_refstruct_replace(&h->ps.pps_list[i], h1->ps.pps_list[i]); > } > > - ret = av_buffer_replace(&h->ps.pps_ref, h1->ps.pps_ref); > - if (ret < 0) > - return ret; > - h->ps.pps = NULL; > + ff_refstruct_replace(&h->ps.pps, h1->ps.pps); > h->ps.sps = NULL; > - if (h1->ps.pps_ref) { > - h->ps.pps = (const PPS*)h->ps.pps_ref->data; > + if (h1->ps.pps) > h->ps.sps = h->ps.pps->sps; nit: this would look better as h->ps.sps = h->ps.pps ? h->ps.pps->sps : NULL Otherwise LGTM -- Anton Khirnov _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".