From patchwork Sat Nov 4 07:56:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44505 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3aa6:b0:181:818d:5e7f with SMTP id d38csp336146pzh; Sat, 4 Nov 2023 02:22:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqr4f9WI7DKBCeQjvh+XoEd/YUhLOZg6DkpbcjmwkOuhaMqraxPcYssJMElOuHBnHPA+/D X-Received: by 2002:a17:906:fd81:b0:9be:bf31:335b with SMTP id xa1-20020a170906fd8100b009bebf31335bmr9136557ejb.73.1699089742905; Sat, 04 Nov 2023 02:22:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699089742; cv=none; d=google.com; s=arc-20160816; b=im19ZcLZACvAL2bM/U/WUDna9tHG8ftK7IbiwXmSYlNO1k5tUeegSTqdXGkUq41SOn mNF2yuhuDpcOTjLoo7w//NOGcQWDXnz+eQuTXv9ZNQd7XNDAced329F1w6p7sAHbUOAs Oe68yyrTBO5Vkbw0ffyzSsWWbvDYqe2mcDwccGNHU1jvnxlvjK7lEbauAuraOcLWPs/4 esjJQv4Iq6bLaQjzG7TgQo7H2k2WDuyRmq7UrUIq+1XjJrnrkUF0ZMTfvRT4xoepd8mM B83iNmYn4csuEz9bFaZDZmPTjAacz/m/yPGevM1JvYZNPtFmzDIXr1CYHb9JafhquiVT cKUw== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=uL6Q1+CPrN1jCR7RD/wEN8mb+lMgydDJ6Z/s+KSJm1A=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CTo9E/vLvaWMVL5cxAnUDxv1bfgdUuxtysqJhP7SVanu+xwu+hrmBvX5wnyID8vlev FYP7c3NBRVpjQ1k7XlpUClrjSCeuMw2WhehfJXtzfVpJvcicoMvCrzbBwA+6RDs2h1YS qqgaIzl9ZmW7f2gBgRRS4kEWWOp9B5Ho6qR50fvEBnc7c9GzgAZ07H67nbiEsUnuiuoB jCuhmMkQEzKBy0KlWyrlTzkCONXQbJ8jJJxDB2GhFIuOUx8IFLNhC51MB1ntv+6bzfVZ MJPXRTgEaH2G2EIclllQqo9sPQzFl6bZjrqIw+1GSLS8UgW52kz8xZRCBdivEjJXAqmb rltA== 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 a6-20020a1709063a4600b009b2c4c1eb6bsi1979467ejf.754.2023.11.04.02.22.22; Sat, 04 Nov 2023 02:22:22 -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; 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 2A36168CE75; Sat, 4 Nov 2023 11:21:58 +0200 (EET) 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 D510668CE3E for ; Sat, 4 Nov 2023 11:21:49 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id C1DAAFC7 for ; Sat, 4 Nov 2023 10:21:48 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 3sfIOxxLSITg for ; Sat, 4 Nov 2023 10:21:48 +0100 (CET) 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 6D265FE1 for ; Sat, 4 Nov 2023 10:21:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2F4F83A06C2 for ; Sat, 4 Nov 2023 10:21:40 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Nov 2023 08:56:12 +0100 Message-ID: <20231104092125.10213-4-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231104092125.10213-1-anton@khirnov.net> References: <20231104092125.10213-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/24] lavc/8bps: fix exporting palette after 63767b79a570404628b2521b83104108b7b6884c 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: L+mZk56CjvNr It would be left empty on each frame whose packet does not come with palette attached. --- libavcodec/8bps.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 0becaa9320..11b9f526b7 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -43,6 +43,8 @@ typedef struct EightBpsContext { uint8_t planes; uint8_t planemap[4]; + + uint32_t pal[256]; } EightBpsContext; static int decode_frame(AVCodecContext *avctx, AVFrame *frame, @@ -116,10 +118,12 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, FF_DISABLE_DEPRECATION_WARNINGS frame->palette_has_changed = #endif - ff_copy_palette(frame->data[1], avpkt, avctx); + ff_copy_palette(c->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED FF_ENABLE_DEPRECATION_WARNINGS #endif + + memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); } *got_frame = 1;