From patchwork Sat Apr 16 08:31:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaolei Yu X-Patchwork-Id: 35334 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp645698pzh; Sat, 16 Apr 2022 01:32:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3ZEmoaEs0E3N1PCYW/LNwew7EFhrg5UGYhxOVni2y99rRuK/wc1jSKQpbYUu5mNdufSyI X-Received: by 2002:a17:906:ae85:b0:6e8:76c2:1f1f with SMTP id md5-20020a170906ae8500b006e876c21f1fmr2092958ejb.333.1650097922071; Sat, 16 Apr 2022 01:32:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650097922; cv=none; d=google.com; s=arc-20160816; b=pN2xVbugXKJeBjXUS2Wr0A+GAP7DPptwWbhzeiPoJlXYm7lpSvSSFWn8cy/zn/zi5+ zx9npgodFLidc7kppQbqtDiL4QUTLeTaaMSZNduMrZbFUoGyujKG0DN96FPsJl7NRCbG NIKCxhdShJanc1QJYSJT5Cp3JqFSJ5erUwlFP0ZbqKy1FZzOd+eKbVeCJ3Is5nlpxWZP +DrRHVZGSdCUarjC3skVeTfRIMdK+idkv2WY/YbEjW3P94u/Dm7XLRhvWmxBTL2pkrAm aeprP2Dbk+Lcrp97aeZCSBZMa74sE/WwJn78wUGZVcdx5qsQlwMKl65CUMPHsbeENHLI 7Ysg== 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:autocrypt:content-language:references:to:from :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=+KPRfTQOv5UZO3ysJz1oqOREnZ42WFyHzwjALUFeaUM=; b=dElEgUktZuRnZTkeKKYlQdSVZU9qygGArHRhF620eyk4tY3DaYJe5Z0SXn9+OZL/yV wPjYiADQEZ6D6p0Yt3Mz6n5bHz3A8QoR0AQCHOU7mzIXvIySL4s/D/b19ktPIbcLhKWR QjzftI6IWbMSgkP0wtJY93VimG2gqFPK1ittFqGYGWlqFLJ7r0gY6Siu/kmO0bWyPY74 iPM9AxdyS5FsOB2Wh8pf4ZOaGNYKltkvzC86a0dgMqtpDK6S6PGprC83yYUaGdp5Ev4M qKe5HAZk2SosHeMqlC9npsBf21RgrJsCwwmRQ9fylTv5zzfJ9t2Y72ffhpft1PBI4kro ngnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qD2vLxaY; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k6-20020a1709067ac600b006e8ac0e63f8si2506372ejo.1.2022.04.16.01.32.01; Sat, 16 Apr 2022 01:32:02 -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=20210112 header.b=qD2vLxaY; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48D8068B510; Sat, 16 Apr 2022 11:31:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC35968B2AA for ; Sat, 16 Apr 2022 11:31:52 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id j8so8709412pll.11 for ; Sat, 16 Apr 2022 01:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to:references :content-language:autocrypt:in-reply-to; bh=YR6455KZM7D51fGV21wqTDcklbwxnAlBPL3DszytI8o=; b=qD2vLxaY89kHnhcn544VJVnS7o+PmB00T1mCDWgksdb1bd+ham/kFXBekk1qZX5Gq5 6cVLJ4MnxKzliyvuyqj2+URJ8l1Q+P92bIQEquQ/MOg9EdzIQJY8FIh0e+f2tYMsF5NS bHQCzx5ZNsBqkDZEpwc0a64mVgMcHoTHAkWqUjNxUaLZQl4Z6xvINTGMO0NSnnTA51wQ vQTYbLlhE+6fph9tKBLfpBQLlY4tmCUoS4sYXiQ7iwH5tFhk4lrThMpwjxcb4kCwFq4R e0xAeBvEOun/1fwWbReGaVJKSXvBhnZ5z1k1NHK+/C9TLJwR/+fOanwh/A7kJL/UUn5F 0UpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:references:content-language:autocrypt:in-reply-to; bh=YR6455KZM7D51fGV21wqTDcklbwxnAlBPL3DszytI8o=; b=I5rGkhgwfeUtXXiYL2umur55v+ZxsLCdYRVAWqzRYT6Lc3UaV4g4yH5ywfoUFIpLE0 4+WEt+mZJ4S+8EAsoK7utZ96Cq2JKg8vb8U1Pj9LwzdLOSz/tM6nxFmPPAUhVpnAlvV9 VoD/cI0EWxe2vBdJxrPLdvr6Tgfv2BraTUnLq+0dPi5ZFlj1PJtAZE9CdnkxNge4+sqy 7K4JTvQF7ACP1w/ZoSxHzi97/X57NbQ8Rn6OfChnCB/9BcN+sKf8irlellG7nab2Mlfd vc+U5JnT7csBYqZn0VW7RPBCP2w9NW8liF8Lc2zpMGMQz5nuWkGnpxlr4JKrecKGxyAF wOtQ== X-Gm-Message-State: AOAM533wK6QWxJEKn+jZkZP/+3d8yYLrhr/mB7knZRdJ3/NXAhTKUgHL HfXDvCfVGqy6XRwsHjJTKOwxje4iWn14RQ== X-Received: by 2002:a17:90a:ba15:b0:1cb:be7d:bbca with SMTP id s21-20020a17090aba1500b001cbbe7dbbcamr8140173pjr.143.1650097910635; Sat, 16 Apr 2022 01:31:50 -0700 (PDT) Received: from [10.1.2.131] (ec2-34-214-110-43.us-west-2.compute.amazonaws.com. [34.214.110.43]) by smtp.gmail.com with ESMTPSA id c11-20020a056a000acb00b004f35ee129bbsm5542637pfl.140.2022.04.16.01.31.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 16 Apr 2022 01:31:50 -0700 (PDT) Message-ID: <2912b6c6-7563-ad01-833d-9ae628ffdc11@gmail.com> Date: Sat, 16 Apr 2022 16:31:48 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: Xiaolei Yu To: ffmpeg-devel@ffmpeg.org References: <5ca902bc-99cc-2866-ec9a-068ac356924d@gmail.com> <164914981025.19727.3038981711097240936@lain.red.khirnov.net> <2237ca87-c339-b00c-1562-5c49faee0987@gmail.com> Content-Language: en-US Autocrypt: addr=dreifachstein@gmail.com; keydata= xjMEYRw8qhYJKwYBBAHaRw8BAQdAh+vf1kJB/kff/4Me8i9RUvNRzGhaR03N8K57WGkQ0UzN JFhpYW9sZWkgWXUgPGRyZWlmYWNoc3RlaW5AZ21haWwuY29tPsKRBBMWCAA5FiEE/7Pjp40G uVEUD2hqIq73773O/wMFAmEcPKoFCQWjmoACGwMFCwkIBwIGFQgJCgsCBRYCAwEAAAoJECKu 9++9zv8D4JABAIsJiPS0oJfJ+DX/8Mpu8vzh0qh2qPzmnTz3kGcebmiXAQCGP0hNLRgJDkot CK+4cPGb5LQkH064KC9OZbIlQpZmCc44BGEcPKoSCisGAQQBl1UBBQEBB0Drgb08O76xaxvz RJuvOc4PEwBagqZ+KVqVGe9c9Ij5DgMBCAfCfgQYFggAJhYhBP+z46eNBrlRFA9oaiKu9++9 zv8DBQJhHDyqBQkFo5qAAhsMAAoJECKu9++9zv8DeUIBAMjEnBZmmeGxAzqlJWypMPXUSWzF O5GSqVC+KPxI0iMEAP0WzgfYt5i/BeHy8B1fYVqv9tHJB4HXeD6OL76U+cmiAA== In-Reply-To: <2237ca87-c339-b00c-1562-5c49faee0987@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevcdec: detect non-conformant missing refs 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: /nXPB90e2LRM For cases which prefer rejecting broken bitstreams. --- libavcodec/hevc_refs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 84a21991c7..9f8b6022c4 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -439,6 +439,8 @@ static int add_candidate_ref(HEVCContext *s, RefPicList *list, return 0; av_log(s->avctx, AV_LOG_ERROR, "Could not find ref with POC %d\n", poc); + if (s->avctx->err_recognition & AV_EF_COMPLIANT) + return AVERROR_INVALIDDATA; ref = generate_missing_ref(s, poc); if (!ref)