From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1626C410DF for ; Sat, 16 Apr 2022 08:30:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D94A868B4FD; Sat, 16 Apr 2022 11:30:40 +0300 (EEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEDBE68B021 for ; Sat, 16 Apr 2022 11:30:34 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id 12so8713040pll.12 for ; Sat, 16 Apr 2022 01:30:34 -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=jayt9xAnlcYUZE9SyUaqWKnXFp8I6BJzyN8FCVeNLQc=; b=BekUo5Y3PfW0UXhACYrCMyQFUY1CC2fSj2tP9UxWNksBZ/G0l6sT72Nc3o0x7hedRY 7DyOy13cpXHujN+BgZyOO+84xjj15tauR6O0I8YoPsVXVcFWWc4GkkLZO9d1qHF2THHe E8wO6Vd3RTNGtNMUNrjPEnhNw4nPfrVQnPLCObVQ0KWMQpFkdFjF8j+V9kKGoT8dqi6m i92jXqHu0qDUa6+YNJxeMR36F2OwoD6fgtt1drQo1CUW0yhJiV0GNQ3Tw3VZ4z89Gowy vPfJ+TpuAl/SsMUjjEMMPtFi4pUBINyifnx9rVu1VHy0hWMFk8ZVXATxjdnN6H8uxaJy FsvQ== 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=jayt9xAnlcYUZE9SyUaqWKnXFp8I6BJzyN8FCVeNLQc=; b=tP4kMTC+6YY0Bikiz/CfDMe1oZ+ZlVoo1ama8jK5atm93D2+kom6gPDBxrv9bldGcW UyAtTXSyJhnefFu35WcJaisHumfgl1xpRt3NEqlmXohJNhd+xD7iwCXGGYK9Xglcojn4 LLn/JDQ1EW6anvJkJV0VfXXVyJilszecg8u5lOZf+kDMOfwty5/jBfhJZ6Elu37L7s96 p5BUo2c6ZynW/mmXaCyQyAqN0+zgKx95dfnZoboRqvS41BaphNmg/6Cpj6UHYym23GCa Wi4RziqCZ9w9JDQB+jHzFDqO80dbYmjVJ9vJNzzhevJsZ0jKdoNt+22xY37C30BZ+B6P Jh0Q== X-Gm-Message-State: AOAM530Da+HidcvtLqt6rtxnL2G+TOMPuyCh2DMyeDUMkp4sZIj9kLUG jlHtCJctTSOSCPFl+UbyPYgHyg/RFn+2Jw== X-Google-Smtp-Source: ABdhPJzaltN8/jLFL4AsywFXy/v/GN4eTcg/hq3fUWuhfLX2OFO5rBRO/D3sDlLoCuJ95hDIO/RDEg== X-Received: by 2002:a17:902:cec3:b0:158:d5b4:2572 with SMTP id d3-20020a170902cec300b00158d5b42572mr2737792plg.52.1650097832324; Sat, 16 Apr 2022 01:30:32 -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 x6-20020a17090aa38600b001ca2f87d271sm7019018pjp.15.2022.04.16.01.30.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 16 Apr 2022 01:30:31 -0700 (PDT) Message-ID: <8c610ccb-8654-5f38-20d0-7a9ef1c3a93d@gmail.com> Date: Sat, 16 Apr 2022 16:30:28 +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 development discussions and patches References: <5ca902bc-99cc-2866-ec9a-068ac356924d@gmail.com> <164914981025.19727.3038981711097240936@lain.red.khirnov.net> 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: <164914981025.19727.3038981711097240936@lain.red.khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH] libavcodec/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 Content-Type: multipart/mixed; boundary="===============7867316044938790442==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============7867316044938790442== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------gAWDlK3atE55SV0JS4HV8CZ0" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------gAWDlK3atE55SV0JS4HV8CZ0 Content-Type: multipart/mixed; boundary="------------B06Z0AySuZjddwJwN0QWM6lP"; protected-headers="v1" From: Xiaolei Yu To: FFmpeg development discussions and patches Message-ID: <8c610ccb-8654-5f38-20d0-7a9ef1c3a93d@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] libavcodec/hevcdec: detect non-conformant missing refs References: <5ca902bc-99cc-2866-ec9a-068ac356924d@gmail.com> <164914981025.19727.3038981711097240936@lain.red.khirnov.net> In-Reply-To: <164914981025.19727.3038981711097240936@lain.red.khirnov.net> --------------B06Z0AySuZjddwJwN0QWM6lP Content-Type: multipart/mixed; boundary="------------Rjc3QPEIjIsllQ0uZxe1W0t0" --------------Rjc3QPEIjIsllQ0uZxe1W0t0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 4/5/22 17:10, Anton Khirnov wrote: > Quoting Xiaolei Yu (2022-04-05 08:49:24) >> >> For cases which prefer rejecting broken bitstreams. >> --- >> libavcodec/hevc_refs.c | 15 ++++++++++++--- >> 1 file changed, 12 insertions(+), 3 deletions(-) >> >> diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c >> index fe18ca2b1d..7ea70e301b 100644 >> --- a/libavcodec/hevc_refs.c >> +++ b/libavcodec/hevc_refs.cfind_ref_idx( >> @@ -426,7 +426,7 @@ static HEVCFrame *generate_missing_ref(HEVCContext= *s, int poc) >> >> /* add a reference with the given poc to the list and mark it as used= in DPB */ >> static int add_candidate_ref(HEVCContext *s, RefPicList *list, >> - int poc, int ref_flag, uint8_t use_msb) >> + int poc, int ref_flag, uint8_t use_msb, = int maybe_missing) > > allow_missing would be clearer IMO > done >> { >> HEVCFrame *ref =3D find_ref_idx(s, poc, use_msb); >> >> @@ -434,6 +434,9 @@ static int add_candidate_ref(HEVCContext *s, RefPi= cList *list, >> return AVERROR_INVALIDDATA; >> >> if (!ref) { >> + if ((s->avctx->err_recognition & AV_EF_COMPLIANT) && !maybe_m= issing) > > a log message would be nice, so one can easily tell where exactly the > error comes from > Moved the log message from find_ref_idx to where the missing refs are to = be generated. --------------Rjc3QPEIjIsllQ0uZxe1W0t0 Content-Type: application/pgp-keys; name="OpenPGP_0x22AEF7EFBDCEFF03.asc" Content-Disposition: attachment; filename="OpenPGP_0x22AEF7EFBDCEFF03.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEYRw8qhYJKwYBBAHaRw8BAQdAh+vf1kJB/kff/4Me8i9RUvNRzGhaR03N8K57 WGkQ0UzNJFhpYW9sZWkgWXUgPGRyZWlmYWNoc3RlaW5AZ21haWwuY29tPsKRBBMW CAA5FiEE/7Pjp40GuVEUD2hqIq73773O/wMFAmEcPKoFCQWjmoACGwMFCwkIBwIG FQgJCgsCBRYCAwEAAAoJECKu9++9zv8D4JABAIsJiPS0oJfJ+DX/8Mpu8vzh0qh2 qPzmnTz3kGcebmiXAQCGP0hNLRgJDkotCK+4cPGb5LQkH064KC9OZbIlQpZmCc44 BGEcPKoSCisGAQQBl1UBBQEBB0Drgb08O76xaxvzRJuvOc4PEwBagqZ+KVqVGe9c 9Ij5DgMBCAfCfgQYFggAJhYhBP+z46eNBrlRFA9oaiKu9++9zv8DBQJhHDyqBQkF o5qAAhsMAAoJECKu9++9zv8DeUIBAMjEnBZmmeGxAzqlJWypMPXUSWzFO5GSqVC+ KPxI0iMEAP0WzgfYt5i/BeHy8B1fYVqv9tHJB4HXeD6OL76U+cmiAA=3D=3D =3DAsFU -----END PGP PUBLIC KEY BLOCK----- --------------Rjc3QPEIjIsllQ0uZxe1W0t0-- --------------B06Z0AySuZjddwJwN0QWM6lP-- --------------gAWDlK3atE55SV0JS4HV8CZ0 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQT/s+OnjQa5URQPaGoirvfvvc7/AwUCYlp+pAUDAAAAAAAKCRAirvfvvc7/AyfP AQD03P9PJlunBS7Z2duYNW/rRq8fpVDVJ0QcWzAAHH3EqwD+O8ZyCLerRoGG0oE6a7bWuokC5f2y 39/TJWA79lJFbQU= =wc+v -----END PGP SIGNATURE----- --------------gAWDlK3atE55SV0JS4HV8CZ0-- --===============7867316044938790442== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============7867316044938790442==--