From patchwork Wed Jun 26 22:08:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 50173 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp108267vqy; Wed, 26 Jun 2024 15:08:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXdXhL+b5gnhSWs6dF9b41EJiyKo+qOjxk9tpUO5ZjJA6+hGZuw8j4nOuCMJPd41eaB2nkr87WFzA2F42uQZM4XKFalRR8ak2/bNg== X-Google-Smtp-Source: AGHT+IGiFih0DxY51rZq38hT4F+ov3BWxjod74DVVPU4sPXhl5kg3Is0PKJlIpfm1pEgzSlMoDqC X-Received: by 2002:a17:906:99cd:b0:a72:5e95:ad46 with SMTP id a640c23a62f3a-a725e95ae70mr686903966b.31.1719439738608; Wed, 26 Jun 2024 15:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719439738; cv=none; d=google.com; s=arc-20160816; b=majh3XqID+tuEmpQzIHbr5ZLAWKK0kWmiSbnwe0yVLVbiYYyV8zGFhEgj0TF9JR1JY fmF9TuBJDOuZXUu5HjNKW4K8/qXMv7qC8C/fJy6snpsfAB9mmmd0qwbD02Yw+yqdIE5y 0Omu7R9++Xq9b4dv9DVNCbcAr2dleZfp9CJHiQ9wDrAs+3O2M75HsFThDIq1pL4J0s9O Xg/lp9HAJDqzhYMwKVml9tHPqqRHW74g3QDMeTcnX9AxSaExYcyRj5EZSAjyq15RqjB2 wNxue1UAtMiU08PCFD+rqM7y+SfWkBLAF3Xpo0kIra5hFXDcU946d4AJsA8bsXjQTZfD RNYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to; bh=+dqZfhNkIrPUVHtNZYx06GcsOqMRjWj3++7Ym/l76UU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=XfPTjBx4y7+wihZQSvxKhiln/MpceqH2JooxB8YaLkA65XRNzHqpc4bNyTpghdudpr K04oNAdpZ1VtHkfaIC/wca3kaXce6D+Dhs82kplFoqbBcNRBJgQhuvWXsF1ltcoxIJFG 9c/xiaLjDwq8EaBk7NbDL4akGvScbSesDvUDeSoqqfy56LlrCxNcb86EZap86rTt4YnX C5eQMCzmouWhc2WWT3+ST3isQ/69Ab/CDMzM46JLWEmNror+w1j3GTPNMsKYNMQbNyyp HKViLV/V6a7+6bS4nY4ghmBqd8kC7hUhLvWQwVY1YmDP3tMH55+u5QjnWmDtu8uGKR8I ppsQ==; dara=google.com 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 a640c23a62f3a-a72426cd19dsi458759866b.410.2024.06.26.15.08.54; Wed, 26 Jun 2024 15:08:58 -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 D58D668D321; Thu, 27 Jun 2024 01:08:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1D6768D3C6 for ; Thu, 27 Jun 2024 01:08:44 +0300 (EEST) Received: from 6f518394d9b192562d438bebf7fb61c0 ([1.145.155.179]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 45QM8djC005918 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Wed, 26 Jun 2024 22:08:42 GMT Date: Thu, 27 Jun 2024 08:08:33 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <089793aaa66d4fc39083cfe4332e4b294a144db9.1719439673.git.pross@xvid.org> References: <5062735ea3804e138da9ebd1d753c6bf4ec334b2.1719439673.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <5062735ea3804e138da9ebd1d753c6bf4ec334b2.1719439673.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCHv2 2/4] avcodec/mm: decode partial palette 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: Pw4Uz85Sghbn Reviewed-by: Andreas Rheinhardt --- libavcodec/mmvideo.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 3038d9ea92..933d895f96 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -78,13 +78,10 @@ static av_cold int mm_decode_init(AVCodecContext *avctx) static void mm_decode_pal(MmContext *s) { - int i; - - bytestream2_skip(&s->gb, 4); - for (i = 0; i < 128; i++) { - s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb); - s->palette[i+128] = s->palette[i]<<2; - } + int start = bytestream2_get_le16(&s->gb); + int count = bytestream2_get_le16(&s->gb); + for (int i = 0; i < count; i++) + s->palette[start+i] = 0xFFU << 24 | (bytestream2_get_be24(&s->gb) << 2); } /**