From patchwork Wed Jun 26 12:43:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50161 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp405993vqv; Wed, 26 Jun 2024 05:44:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXteZdk1e7SXTXKkHPmRL76ZNsPBuF1885hyaAVul1zMtgZoESPw2PN/e3YNB/jVmVXRZgkKpvPxWDOv0ilMUzZPDZ+Fp0mdV0a4A== X-Google-Smtp-Source: AGHT+IGFYFfGHznCZh2q79OG6cuT8FW3xlcQXrDjuwPIHhc8akOhJJRZbE9Lsdd3NOvWONkiJdyn X-Received: by 2002:a17:907:8dca:b0:a72:631d:6de1 with SMTP id a640c23a62f3a-a72631d6eabmr548106666b.20.1719405860782; Wed, 26 Jun 2024 05:44:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719405860; cv=none; d=google.com; s=arc-20160816; b=ar4ykEW9YmTNVf5Dgx3RxP8eTCuLjkN1Wi2YBk6IVJZwC+D1PpIj/1mQAF7FKMjSwy DTPE9iq1M0UqLBGpyhPCzVFMuG4YOCPEGU+lDBEnRdJU/kfodQsdpP+RmJ+L0NOZelJH 3Z3s0cQ6yfVqtmDTT5LtxGRGiVQebaD505D4811Kk8SmBSx6m0tz/LLfoFfH0pZgPLDi BGC0g543L0PNL7L7IFFW5o2rISJd74B4V57it63UypsV4lKrbiHwFoxbKNK1EJ4UoWJt bLtRRjHpTVU6a0GYbI302bOPM58+NAZoqy3GlTzg/cmaHws3ZE+rrm/1urSLJcGVfYz2 8QAA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=ydNE3mai7DLTXRXhtCPsyX3fxxm529p1FAXKjkkngr8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ay8k2Qn/i7NFGLcNsyTsqzxh+PuW1hZC/d0ZX3zny1py6x47vv5HNdD2qR3bQpqaNj Ic4olVCqXLy9hCFzCn/Zp1+k7f5JN7j7bzFceUT0iUgJr2GE9Q6s3ygCsht4MgnbG8Va RO9OO6LqEBd6PkhBo9p46fHTKOMeDdkTh5yb092aaq+gvencPEyYK3pQ2Lk0Y/feQg0X 6/41/P2Ydf/TmFVnfI9K8Xs7+79rmv7mNAE09ftO140P2bnDkpC46OmEwrsCZglZg1aR p8ulm36Q6SsPjHe74m6saTVMch5/NBJiNQVjSQfE95v6KuyfZxsdMevTwQOuWn3zwE6+ 0p6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=YxZkBF+y; 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 a640c23a62f3a-a6fcf54d067si571472466b.344.2024.06.26.05.44.18; Wed, 26 Jun 2024 05:44:20 -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=@khirnov.net header.s=mail header.b=YxZkBF+y; 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 EE08A68D428; Wed, 26 Jun 2024 15:43:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E677F68D265 for ; Wed, 26 Jun 2024 15:43:44 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=YxZkBF+y; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 01AE94DBC for ; Wed, 26 Jun 2024 14:43:43 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ytrp6OGD_7N3 for ; Wed, 26 Jun 2024 14:43:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1719405820; bh=Xw+cuTO21WtGQ+MLApiZoRuYHioFhiIzdeo6ymIO4oE=; h=From:To:Subject:Date:From; b=YxZkBF+yWbfqCwzh8Tax4XO/GtEsf2INURsDWMPswQOtZ/U8pD6VsjVH8gEQocelM 9O9pRC/u1xFn9D8i5tr4jPFfAqfM9XiT0mtNlIo+D/CLuRBzZ/maip5hcOK6UswQrO bWM5ReJnT4069VJBHffhzCGgFlaAHHm3t6N/0v4kw+UAMCYD4Lz7bsHFgCjVzN62lh rsYFWb4YQ088SH6yFSiZ44Hb2QepLh2h3eR3YFG82vHlg8aAcQAdlDsI63t93yqRtB U78COeDvH6+QMVpEM3z8Z2loNgNOvfvt0BZqTvqGKXdzpBnDlxGxGofQ6LfISWQnSc BJz5tR5wnLLQQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (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 "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id D1C974DBA for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id AACAB3A02EE for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 14:43:33 +0200 Message-ID: <20240626124337.14478-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] lavc/hevcdec: call export_stream_params_from_sei() before ff_get_buffer() 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: el7vLbldw2/8 So that correct values of color_trc are set on the allocated frame. --- libavcodec/hevc/hevcdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 1d2e53afc3..e80f2f28c7 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -2964,6 +2964,10 @@ static int hevc_frame_start(HEVCContext *s) if (pps->tiles_enabled_flag) s->local_ctx[0].end_of_tiles_x = pps->column_width[0] << sps->log2_ctb_size; + ret = export_stream_params_from_sei(s); + if (ret < 0) + return ret; + ret = ff_hevc_set_new_ref(s, s->poc); if (ret < 0) goto fail; @@ -2984,10 +2988,6 @@ static int hevc_frame_start(HEVCContext *s) !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && !s->avctx->hwaccel; - ret = export_stream_params_from_sei(s); - if (ret < 0) - return ret; - ret = set_side_data(s); if (ret < 0) goto fail;