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 602C842623 for ; Fri, 24 Jun 2022 09:53:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6804C68B709; Fri, 24 Jun 2022 12:53:54 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2052.outbound.protection.outlook.com [40.92.91.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56C0D68B453 for ; Fri, 24 Jun 2022 12:53:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ArgolcCTPYy+30Cnro4smLImPrF41dE5CnfG38ZFSLjNPy5LAaueJlT09LdwrVOTjWzf8dGnH5UB+gW+7XplpAkMhjxIsaCcL3GS9MMQcBjcZVwMyd+WJdgNXaxB/j69md3ACzskpYDBcEDGCWqi42uEbRdTdc96K2ntikFhv2/OMKW+8Q2ctxWHdDKv+ytQX7Xl80u3fqjjV3pEtzBCHj+rg3mT75TxctsmjdjVmSZIU2cenJBuALq27qFQSXZDJW904726IB+mfC5jyHsw/wuKB5g8KKO+9XavN7GEUak0UF+8mKYMjtVV5BEeknYe6Rq7YWlIMZHXwXcEvVRRSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4uGcy7PUwWMwJ1Mg7HyMCD2hU/U+pxuKVTQPMJxxNiw=; b=bGK9q2Cw7fvIFXG6qoO3S0kc79V4s4wGcn9R9YNafCd1maRujvHf6MUA0p//Np3o2oH+LYndZyQQ+O8FUjdgx/bBQCm7piaiaKhQk7pD/WRrdqKJamDmyrcpG/95m+Vq7ooTPGqWyI9Bgk9JQaWEg20Aw/zg7++dy+l/9mAe7d48QcwpjZkekxJ4Q3KoaZfkW1nCDWwKA2kW0DEnwgSEIsn7NE6TkE5hqNIQ/kJXLKNPJPLhI7Iv4F3fBkkUvzOA1sUL+QdPH6xWirIPR5ygUI35kyZqr/83aJKKdtZE3LlKG3IojvznsVu4iaC79AnGHggIFQdj4X+RlgNnzetuLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4uGcy7PUwWMwJ1Mg7HyMCD2hU/U+pxuKVTQPMJxxNiw=; b=Yo1AjdiH7TqdV+IhX+PrQh4Dz+TO04RVXTv2XfQ7ENVAwk1MtW17XppYAQrJPP+DcsuNSywfeHTPIkuBTxGMDHQIEuWyqGtDt4wITvB48a4xdbXknFf8dwdkbXYbXbQl8MRtZBwbWVgRVUigWuBDm8QHxLWb4At26qg2hMA05qWhFYEkHm7ZsyC36bKf5KrR31f1ZTze9D07t5/QgRZArzNEraaErV2QvFkfNSEElsN+sA4IHzC7tYqPn9y7TpmzzzCYPgJ54oN8tBLZFBJ2rv7GY+2YST9x6ppvRnCBdrsKDKrwcs2g00hOuEQlPPb5BKaKEFn7byVOpOAQaEi3Bg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB8PR01MB5803.eurprd01.prod.exchangelabs.com (2603:10a6:10:10f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 09:53:46 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 09:53:46 +0000 Message-ID: Date: Fri, 24 Jun 2022 11:53:44 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [PoY2Gdc44IAylFeRZexiKFca5X2ho6fX] X-ClientProxiedBy: ZR0P278CA0192.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::16) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <77d9af80-75d8-d226-834f-7d7dcb899d51@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79bca067-6014-4236-ea3b-08da55c76e20 X-MS-TrafficTypeDiagnostic: DB8PR01MB5803:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lWTLhPDg+wgspeBGKtg+URrXU7213dgvdR59mCPa+UcotHpDQXCTIhG8BHEM+aqAAZyX2EcP2xionOGNZaUVv7y5Z1c8ROZLHKTfdRx5Ob0EEn2ldypGInV89eK6OlJORsL8aY9YXRwtYa5121fFxziUk0EBas6Z9k9hpfuSRleexUqeSHQ/8pMZ33Zv9nE/8HJvaZqswrS0Yq9ZC2q3/iEoqPi2a+NcYXgG8nvW1E8yfhnQOP05Uv2E5TqI63P7PvYfiE8DsL2HoHblQWz2ML2M0Cu9jnifoezCr4qX6C1xd9gs2w4K7A/BkRRIqgLRFiVbv9cPviJLRUObiakceBhPlSmMQLZQDr32BowhXB8e3iJONkaOMnwGtoUl67M4iC73JYjvdWIwexg9pdZ5iOBOd/Gvbo8o/DKQfl0OBK7M4ZfStRxs9mGJn8SoVqyZnel3UpuvmJzDLvkW61FJaC/fHNfFkxhb4GYc5S+xoAN2UdGLjo9fFdA11Jb9JAjS+UkKiRNlSGnN76EpdM4rH9OZoY5kGSQQj8yWXx5ZOcYAQ/39CjqyOu/OP3LAWwLaVipSX0Zg76Xf5r05WeupZS/cAb5M3oB0rkKmkwqXHHgV5kMUX6yoXJ0U+UCxIcj8qt7/mVjaehEcRaz00OVt+g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VEZuQzQ1QUcxei9oeFdPVjlta2dpdHRRdDdQNmIvMGNPVUExRnU4N051SHJZ?= =?utf-8?B?WUNZZkRIQnM1Q0xSbTJleVhDbmIrTXQvWUpxOGdzV2N4QlJQalRaYXZvVldK?= =?utf-8?B?K3NBNmt2MVVjZEJjVGxOYkRUam5KYm02a0Z0Q1BudDJmZ0ZaakZjQ0RvOVlJ?= =?utf-8?B?WmVaTVFiWmNvUUppdThsUnF1SHBHVnA4Z1NITFJFRWE4WUw2ckl6bS9RUk00?= =?utf-8?B?N1hRZm9CQzNSU1dBOHYza3MvYkdFbUI5dVEwNjB2cDZvNDdTNjFQbE90Ykk1?= =?utf-8?B?THlxK3RPL3gycVpyeDJGL1RKdlVRNmQxa08yWjVvWFVvREZvVEY5Sm9TNzNE?= =?utf-8?B?di9Vd241V0UvQzVyUGJTZE5RVjg3MUtPWDF6aGM0STNCbFpOZHYzVmRHNFJG?= =?utf-8?B?UWlrQjVmdFdlU2NCYWo3WkxLYnNYQnlzcUFLZlR2RkFlTG5rbXozNFh1ZW9E?= =?utf-8?B?Sm1tdlE3MkJLS2VwbWNuek5od3QxVGhDTWVZNURHblJ1Q0lGa2RwN1pHUmpj?= =?utf-8?B?L0dJMCtuWW5UWTJ3OWp5Vk1kTHJXZXVUT3JZOW10QmxRZ0UyZE9QK1dwY3JH?= =?utf-8?B?MEZDVkFMMWljS0tQckxjTENCVXJWWWs0OTVoMGcveG1XQ24vRThuL0FXaEEr?= =?utf-8?B?UFV3SFRnb3VjQzkzTUxXWlZTVERsZHkyOWNLMHdHdGF0eWJiSE02VGcvcGlX?= =?utf-8?B?T0ZNWjIzNU43aVhSSUxFWkwrNkFvajRKWWJkbXNPODhjbVNXSDd0QkRieE9h?= =?utf-8?B?bVl1dXNRMXZGZXNOUndLSWlRK0ZOQXlLMUtuTHVld1NtNisxSDljYThxbEh1?= =?utf-8?B?T3NBK1lSQnRJRFVrdHRXQXo0bG9ta1p5N25VK1dFQUVQamNoN1gwU1pwZ0xM?= =?utf-8?B?Z1JsRDd6ay83Sjd3aTYxQ0t2WFZHdzd2bVlSeUMvK0szbHdxd3BPdDVVcUd3?= =?utf-8?B?aU5CSklEVTVWVU5HK2owTndDTXkwMjNIYit2cjdnV2JhR2R5TXZrSFRjKzZs?= =?utf-8?B?UEVuMmI2Q0lRZy9BRVNwbW5wbkFnQktHYkRtMmRRK0x1Tkp5M3pkTHdncjcw?= =?utf-8?B?KytvWUlDK2RvaDdZOWlEMHRQSnVQQ1lHbitaSis3NmtCOU0rOCt2SEliQ3VM?= =?utf-8?B?K1pmeXFFQ3lxaWRISW8zK05WYkorQWJkVEwvemo3YnBoZFpzNC9hc1EzMUJ0?= =?utf-8?B?M3p4bG1DelBPZ1JpMDNaQnlQdkpYdmlJM2k2d2UyYUxtbXgzaiszZXlYV25Z?= =?utf-8?B?Q2ZsMnZEU3ZCOVpQeGpXUmFpT1ovbFRlS0lnTE1xQXM3WHpTMmJXejRHVVZw?= =?utf-8?B?NlJFRmFWZzdDVC8rbVJTMXB1aWZGYXloR3hUV2l4cWFyTVVoNEFkK04xajNk?= =?utf-8?B?T2M0Ti9FNXJZcUJ0cTA2bVNiZUxmNmwrUU5XZEJ4Mno0YVhocUVlZVRZODlr?= =?utf-8?B?OW1nMmZVWitEVzg5bVdIaEU4aXpNaEg3TGJlY1dmN2xhVXErRmkrbVVOajJn?= =?utf-8?B?VjBsU25uSE1JZjU5L1NBclNRN1U5T1dKMDRwMUlteUFRdEErdmN3THdpWUhq?= =?utf-8?B?elRIRlBsRCtyR0Y5ZVJmY0FlRTJVazFqYjlZaUNwdXZZTkdQeUh2OGtneUYv?= =?utf-8?B?Z1dlMGNscEpydjVNUmZpWk9OK2J3a1c2b1dWRWRCNzBmUE90R09ENnFabzlN?= =?utf-8?B?c3hZbnZ3OHhnMENCQWlqdVgrdWRJaFR4enZwWks4TUJ6ZFhJQXlZN1A1VGM5?= =?utf-8?Q?OoMell7c1t2vnKUMZc=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79bca067-6014-4236-ea3b-08da55c76e20 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 09:53:46.3506 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR01MB5803 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/hevc_sei: Fix check for SEI end 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > The intention behind the current check seems to be to check for > the rbsp_trailing_bits() syntax structure which is always 0x80 > for valid SEI messages. Yet this is wrong: These trailing bits > are not part of the GetBitContext -- they have already been > stripped in ff_h2645_packet_split(). And it is harmful, as > 0x80 is a legal SEI message payload type (namely for > Structure of pictures information SEI messages). We ignore this > type of SEI, but because of this bug we also ignored every > SEI message in the same NALU following it. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/hevc_sei.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c > index a5c7df34b0..953633f4bd 100644 > --- a/libavcodec/hevc_sei.c > +++ b/libavcodec/hevc_sei.c > @@ -549,12 +549,6 @@ static int decode_nal_sei_message(GetByteContext *gb, void *logctx, HEVCSEI *s, > } > } > > -static int more_rbsp_data(GetByteContext *gb) > -{ > - return bytestream2_get_bytes_left(gb) > 0 && > - bytestream2_peek_byteu(gb) != 0x80; > -} > - > int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s, > const HEVCParamSets *ps, int type) > { > @@ -569,7 +563,7 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s, > ret = decode_nal_sei_message(&gbyte, logctx, s, ps, type); > if (ret < 0) > return ret; > - } while (more_rbsp_data(&gbyte)); > + } while (bytestream2_get_bytes_left(&gbyte) > 0); > return 1; > } > Will apply this tonight unless there are objections. - Andreas _______________________________________________ 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".