From patchwork Sat Aug 14 11:36:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 29506 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp380205iov; Sat, 14 Aug 2021 04:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEUFT/99IEnZ8q7L3g/mDORoVvmppgT2zuhEQMTqi2JkfNHLXbcsLpfwsTRpyOK77gwSHR X-Received: by 2002:aa7:db93:: with SMTP id u19mr8450995edt.227.1628941003003; Sat, 14 Aug 2021 04:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628941002; cv=none; d=google.com; s=arc-20160816; b=IcXt6FpzZNDdT0XDRILORX4TD4nPdqpL4ZWcJJJheJbgsYXFJaN4AwCevi6dHwFAIE 5SEs5DkAl35LimyqRlwiK/6Y2Oetv/x3kaR2GiFwMJD6MUCyn/XWqkkI3wky/QOSKZU/ Tnbw+quFMEQnZz93E6oeSocx7hj8V0/B+ndBCzXxZ/3vXihpsl6X+kpr5EOnrcAOb/HP y6mdBPNeYxJwIYHHAcQK4T1vilDAbOboq2uEDWbM6ums8BU9zHoN2gARWmRkk0+2rAy4 grb/zJyZqepYBy0MNg8PmLbSoeBrPNtMs26E5t8T2Yb94mcHbhBc7MGqnioq6PCDN6Q2 1qSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=jxM/xlhtB3VpvQ41bWw247CVPApEQPxikQSQDHLaDbc=; b=ayGGI4Hz4U8kz9RKM5SzKo6wtTLcTTePoDNOdj9uTlcT6LW6yji8KAqj/4sLxIE8Kx YP35HZooeucrrKmE4YUgj/B9CqHQLUEu/h2RD9Zb5uO40cWPJaGeqFU9X/lFvsxFzI+d uJiJFlBboOjjx6pYmI18IC8elKf/V4eMbs5qcXCxdXHAi+PRUGXKXUiaLwIo7KcKdT4+ ywSSMW+NIVGOSa7icadAhCA3t+/aak6mte1DTyPoiAquaYCy8jAC4xMjuYCERpc0E6Py SiudNB68jegUFXe5IuOj2ELZZYjNKq7V01RAxc3oKhwLeY0B7I2+AEQLWAF+uKulDrQB Zc1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=KJdzP3ZD; 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 h11si4425176ede.433.2021.08.14.04.36.42; Sat, 14 Aug 2021 04:36:42 -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=@haasn.xyz header.s=mail header.b=KJdzP3ZD; 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 0873868A603; Sat, 14 Aug 2021 14:36:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DB44689E56 for ; Sat, 14 Aug 2021 14:36:32 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id A59734356F; Sat, 14 Aug 2021 13:36:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1628940991; bh=92uGGRoCmg7bfyGCihhs+zwg9v1UmC+7urQNWijImZE=; h=From:To:Cc:Subject:Date:From; b=KJdzP3ZD4+Dp1lKF+4Y7AKjM9hyXota9tQ5iYvLQmJz32evbv/xvlC1ht0SGdLf4q jDowKYYdSndk1J1OHwwtAIOLSXRUvXJ5lcHMvvu+RlJKra22j2Vpz+1dxbLGoqqh2A GuWvAjbwKlrj8nog3+i1DUtbzxVwr7BKG8FFgPvI= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Aug 2021 13:36:17 +0200 Message-Id: <20210814113620.39290-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/h264_sei: fix H.274 film grain parsing 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5vngxNhQFris From: Niklas Haas The current code reads the wrong number of bits for `fg_model_id`, which causes all of the values downstream of this to contain corrupt values. Fixes: corrupt SEI values Fixes: 4ff73add5dbe6c319d693355be44df2e17a0b8bf Signed-off-by: Niklas Haas --- libavcodec/h264_sei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 7797f24650..329c2ea4f2 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -424,7 +424,7 @@ static int decode_film_grain_characteristics(H264SEIFilmGrainCharacteristics *h, if (h->present) { memset(h, 0, sizeof(*h)); - h->model_id = get_bits(gb, 8); + h->model_id = get_bits(gb, 2); h->separate_colour_description_present_flag = get_bits1(gb); if (h->separate_colour_description_present_flag) { h->bit_depth_luma = get_bits(gb, 3) + 8;