From patchwork Thu Sep 12 00:59:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:14c:b0:48e:c0f8:d0de with SMTP id h12csp722429vqi; Wed, 11 Sep 2024 23:24:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5G3+Awuh6XKZ2i/jlLiKbvyY4RRBui0A3uQjfoHaHazWQ3wMmmt7x+H4BFNy/N9F2iOMuDcPbJ8egVXHRxDSZ@gmail.com X-Google-Smtp-Source: AGHT+IEiM0xcU4MIgBIemu0uF8vHcC2QR4Klda4jODCrL8caS3/YPHYGys9ScGAPnV82PtyD3yXS X-Received: by 2002:a2e:4a19:0:b0:2f3:f8d7:d556 with SMTP id 38308e7fff4ca-2f787dc864dmr7110081fa.18.1726122253975; Wed, 11 Sep 2024 23:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726122253; cv=none; d=google.com; s=arc-20240605; b=I9lBSmbOfXmL7HXf2PjRqWlcwv7XEbCiGJRiBEJb/1bCom+zUn8GJKer0ziL6QrTxc eDWmuk5vRnssASv/4xsfLwAqUBfOa/tefvEXniTLJjIrf1lM1FEtyq/X+93kzsu+9yb9 XwVI3NmDJt15xLUu25++j3zTIt/Ddr63sL9QLsRbdJjGJrytJ1VPnLu1lQyyQ9aGOTkp K3dsKCshtY0PUeomlQBtvxiS7Mdmd3UwbjnAeR9qVyD2vJC5oAuLGfTjk1Fhq3fwD1e8 fPt6+IXjIwx2OEnd3SA9YFN2ICM2NZDMSPJ95xI+vwij62cdAqb/2sS9yjHyyF/hnxPM oO+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=PpAXEcUHAr0WgFmkHIpe6+vKHe5oKDGJrUBYboIayl0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=B83xgGlC+qB92OcI2WfXijawnXXgXhEllQvQCQjwp12DjmQU2PmR3jJxFZj68+9aMq TRt+FUc/Zb8PT+DG7a/lcG8LHoY+hm0U0MQ3/1kYlCic36wzHH8QkInsKE9WLc5wF5i7 Tnmd7Vx0Fgl/q5GJRaU8a2luUmGy4Lkut3KzklCFGB41FeG/D0hWQ0JxwwvZkbHch8D2 WJBmKqcdlnl9XC55O+iZup3Buz6R2NPjfkKUDK4HT9+VfVIZp3GC8jWdDN01/wptRb3T 7IPdF95C0ouYmGujXya/XVE/F0yNjgeOzRZ/MTvTmmC/2ikAElKF+Jf7ZY71RavysLrq udhQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fNzRI+Y5; 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; dara=fail header.i=@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 4fb4d7f45d1cf-5c3ebdab6fcsi8339206a12.606.2024.09.11.23.24.13; Wed, 11 Sep 2024 23:24:13 -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=20230601 header.b=fNzRI+Y5; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4493C68D99C; Thu, 12 Sep 2024 03:59:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3945168D910 for ; Thu, 12 Sep 2024 03:59:49 +0300 (EEST) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7db12af2f31so418272a12.1 for ; Wed, 11 Sep 2024 17:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726102787; x=1726707587; darn=ffmpeg.org; 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=VUdUieD16iXRDL6xUC1S3Eyy6dcKEQr6tLYRW00kpTM=; b=fNzRI+Y5rn9eUINZ4VN78zNy2pk5cgSwyPrJRNqoLmJdpH6Cu4uk/RY1XKWBl1rjZ/ FQAmrjSQ1h1ctYj03aDY+VUrXYJ7Dnb16Nb0y+LJdcUvzaQSiZLJ/jP6n0MT8lB3spO9 5cbS4iXp6lEI/kXbt3qVRU4BJkSPNTy20Cl9/avh4e/tY33eG/dWU7gWpizeAvpmh2aN HZoqYeAzZcd3IW+S9YH/3w3AVZG8+l0xHc5h4iV2n298JgT40lhwpZZ0nyDlVNnJWTXJ QVi/yAzYQ6qwQHFsZdZuTtQrY2Z330sAebIottpBgeo8FdYKLnWhok/1oHhXpeay0CZ3 54LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726102787; x=1726707587; 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=VUdUieD16iXRDL6xUC1S3Eyy6dcKEQr6tLYRW00kpTM=; b=CRUosNLOoyH4lha9epkW+g0jr89/wKLJdMDJhH/H26OWnYK+42SeyI95ANqY5CuMS+ MP9Y2k4MG5CCn+sMvOUv6/IVdVLhJXk93PsCqvRQwUVY0N9dk6aCrJoSnjkWvy5sG5OH 25Lklt+n4jLORnIojDgNVJlQYkEzm3iuvK5Fe9kOZLqQbkuZmhGVyV9PfDy9hcHo4LiB KClFs9dErFOvfGIzNkcC8MH6LNQyXQKH0ct/8mPNSy5beNNZhwcZ1WMK95FMCf9y+GW3 uN5nN5Ayd8Pso6mQpUh5MTeKnjCWmrjzBuYog+4HY79/CPVh0l7wCR28nvUuZfydA8Pn JOaw== X-Gm-Message-State: AOJu0Yx728edZ5lK8FT7DK1f1EMfjAX/hNOm0vjF/UQKocKvVi/SWElr h8WbIcvsTbaYDO8NGTG+ETKAafL/ZztKQnSjYg/CQkzhJf4JnxrzqWf+ZA== X-Received: by 2002:a05:6a21:a4c1:b0:1cf:314d:4ff1 with SMTP id adf61e73a8af0-1cf7616931bmr1463366637.30.1726102787105; Wed, 11 Sep 2024 17:59:47 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71908fc8210sm3557769b3a.36.2024.09.11.17.59.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 17:59:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2024 21:59:23 -0300 Message-ID: <20240912005925.10151-9-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240912005925.10151-1-jamrial@gmail.com> References: <20240912005925.10151-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] avcodec/hevc/refs: ensure LCEVC SEI payloads are exported as frame side data before get_buffer() calls 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: kd4K4uE0M2RG Signed-off-by: James Almer --- libavcodec/hevc/refs.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/hevc/refs.c b/libavcodec/hevc/refs.c index 09d759f936..a75153c462 100644 --- a/libavcodec/hevc/refs.c +++ b/libavcodec/hevc/refs.c @@ -86,6 +86,19 @@ static HEVCFrame *alloc_frame(HEVCContext *s, HEVCLayerContext *l) if (frame->f) continue; + ret = ff_progress_frame_alloc(s->avctx, &frame->tf); + if (ret < 0) + return NULL; + + // Add LCEVC SEI metadata here, as it's needed in get_buffer() + if (s->sei.common.lcevc.info) { + HEVCSEILCEVC *lcevc = &s->sei.common.lcevc; + ret = ff_frame_new_side_data_from_buf(s->avctx, frame->tf.f, + AV_FRAME_DATA_LCEVC, &lcevc->info); + if (ret < 0) + goto fail; + } + ret = ff_progress_frame_get_buffer(s->avctx, &frame->tf, AV_GET_BUFFER_FLAG_REF); if (ret < 0)