From patchwork Tue Jun 21 02:34:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36361 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1977247pzb; Mon, 20 Jun 2022 19:34:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uJrcHLhnqf4f41wlesNy3++foR7gOo8GWL5Xj2kHIvTi62O7BupojBAvTN6rQ3g22t6j1M X-Received: by 2002:a17:906:519b:b0:711:fb34:16f4 with SMTP id y27-20020a170906519b00b00711fb3416f4mr24287297ejk.275.1655778897662; Mon, 20 Jun 2022 19:34:57 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p21-20020a17090664d500b00722e3682c3bsi805917ejn.257.2022.06.20.19.34.57; Mon, 20 Jun 2022 19:34:57 -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=@outlook.com header.s=selector1 header.b=hEFpUUz1; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2B5F68B679; Tue, 21 Jun 2022 05:34:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64B7568B476 for ; Tue, 21 Jun 2022 05:34:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LCRMDfryTCvZuJE/1LOzYVO9xGRVTfSyeORCImngQf6Oc9Xzrw/zZJhwR85zViKcRhHLnCKzFS7T8zZzvZch0o5fe5flw7q9+SxELPd/J7V/YRvYq3v5dNecCD4VVhqY93NoT6aID+DVeJyw5PGGp04i4G9XfziSDsoHKmdXoEpxqee9ex0pmbcP9fJi11ocVOLcbsoqLU3N7QAiV3y/JTa6+LK+puNuxYF5vr0ho3Eh0s01uIJ7Nn68D1LvmifXmBQWQoGtXonAacTCV6wwehMcCB7yPVgyjmpkOk1CJLbovaSX1qPA9IKusH2hEcMC/Kfh2F3rR6Cxo6e/QFLe8w== 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=KEiZCuvjHU2LebOipLzEQ5B0+7CH9GwpwZZo4AekplU=; b=E7nfdzyNKFL0c63ZEn3hr06mmhm5OOasz/xQdVBLek/FJAirzA3nRAvphBbaK3ftPH8G/0X9xPFfzmwiKjVzg8N5ZkAVN7DZWxF72GNlEn4V5cNs+hjoiOTX+/OdaLbuCobiXd3TVW4Q8pkJFzoBv9DWcMfnFQ56YLiz1RoFzVcaX8xeLgNoH6LKhn08fsqZvp1t0WI4CXgUeAoWKgwIKucil0ejVzasoXba4jnQxSmo17T5PryTWYGawVenq+3rJLwjZ1YmbdcGFjt5fc5cxNzNmMs/JtC1EYuju+9liTwdWyoevEkObg0VKsLvnl7qhUp7QoPL4jgtHIZhOOU1IA== 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=KEiZCuvjHU2LebOipLzEQ5B0+7CH9GwpwZZo4AekplU=; b=hEFpUUz1lCLO1B8lSQG68SO5aaqkWoGQnWoiPd3lPDuKskM+sdofmB9dxA51azVT5ss2iftRglVUbAzMJw0P46xnaDfCC94yXB1CIQ+i4FVfAn8WQYzweQ53rpxfORdfX7T84M3LbbNx3ePs3Zh6UXwboANGujL/PclcQjNmtwxlQsNGbr/kMTS0YLR0KJhyDfL7Kin5UcEDPqrDljUJ3c59W3JP1IYlzxTTvH75V/uys6L42E+BNFiKCgYNQNaExAXqtAtjhDImaL5mv5Q2zgvwAQIja9c1MQo7JegVXCZ7hZq2CkoYOtIj/awjcK+D3JlToqeFdW1Y9NsaA4zktw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB9074.eurprd01.prod.exchangelabs.com (2603:10a6:102:2b4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Tue, 21 Jun 2022 02:34:34 +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; Tue, 21 Jun 2022 02:34:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jun 2022 04:34:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [TKf3SyW1trOvt0Lc8C3HmCQe8LiOFRs0] X-ClientProxiedBy: ZR0P278CA0187.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::9) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220621023418.3322554-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d8ef8d1d-95d0-4077-61ad-08da532e93a5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX0VAkTI1HkVlw3wOKrPnCsnxKo4EcKmjlVR68jirKv+doUCHzOfFa34C82Qcc3JU89tVgQsXelO8gbKep9AYDtuz5N+v255nVyPXOv8spT1T3CDegk5strLdaZYj4Nj1tSR9dTeTFkcfzC2ySLvnB9ACnOElSuY45poxCZv34a0p9BtX1ljhCj5Pzsfc6/5cDtIpJUKCRRRSzQBhzvgeqM2YkGtnFkiThLe+PiUaxec5Yuy9tGfJ+35s1/TTpoVBlct8a8kWZf9yboTs0lqUvwYyYjYa784NFYf6PvA+E8F7i51u+a5fefsy1miVlAwZvMrzVCKtWOGznHyDUh468qpqKEqJAFQ5MfacnHtnL0HIxKWiiIsBJiXuraCeaFyaO1zpUx3RD7rIFyos4WkXa5ElETMofzF39/vewXwfjy9lUiptNdB5oJdF/54SdwJnuh1iDAy4JUvBNpvpvUo5eAL2yEMYzpoEYD8XjZfGSI0MvgE2IxKfrFyISqq5iLZVQEOniVKuhdoVMHEmRVLiJQsfLu+1oXGRa5wqL1zJFbm3NIR8MirUv/NdTPRoMhQlY2qwxXpfEVpzQ8gEKI8zh68rWd9s200i6VtKCEbtjMKuZS4vxXLo8ECK2OUNupk+0oYvH74rfBQmyhyo8IW4j0VrSNlbU5mhCQBNDQGOP0Er3zpsuzt0MhuDo+QoIsaH1RJUPI2ZyLS2u4x9/dS3yykQQTPKdC6Rk= X-MS-TrafficTypeDiagnostic: PAXPR01MB9074:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B7shujSpgeWgDwiIDnH9/I54xqu6km4JNXvjbX5PgcO5ja51Iv+PZIef9SaW8luYZdMl89M6YMinMzKXQDxIKCgrn+8mZLcCpEMKMjO1er+4WYIEC1R54k40UsvAipxfcPHOwnqNOtn7Q426EviMQLlRjCFcNYGIblxOTGcJavUJex5KOtweHfhX/XL9G0r64A1UOdEq8i1Auazn2lLjD5eomdgVN9PdRMwOxYC9ZyilY6+jMos4OUYPDfafGOcXS4r5z8SbeEQPQywCqO/L+oL4JPM57Q3V7f2pvg6wa7+qhpaYonRK76shy+0opQXSMm+LFc08kz56jifB9rdEIAH4RGVTA62qlwcqIH8cKu6EGGgzoRGQjomm1d35GK5SJqGh2EAEYARvQPdI8DfRWVpqiv7Mvtq0lDSsOaqI8xqoGZ/m77xrZ6QwcYA93dZ6X8u3ixp9SrtsRayavQkbJsGqRPbKUHsUbLX9AD7WK6ZFLnKK4+gF57h+Hk2dblhbImEgiuTpCa00bXWcZtZYrP7r+X3Ow9OkhKSQSOEpyayNfJe10Kb6gi+zuCrCKwIceFQLL5h2PzmO3mUiJgoxCw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q6gUiALXE31OrsLyIqAdJvHhYJBMOeRvoSSvWfBsNqAsyP5L4gtKodNscv3Iexna/e2AuNKPR/bsrTKlZAO1bpFrg8uFkP8BgUv618ryKnZLG/gCqu1aywNOlIX/5n4Al1JBO08JYz8E82HpPwcIBlD4WhjyU1zEuvJi9OjM6E2YB+ZFfd3jlmPU8nWm1UurPXo8g4KzvxAWDaqaTr8/CqpWPIbrcpNGrm9ppwCW5m9X1/lMW1J08wQDEDhIR/IC4sfmfMdR8bPTBlPbD8lcffsd03t/lsyIulZSbL9SIpHoW2cz3MyeoEb4nYJCFSOzdRuQt/R7ZCppBNyoz5+JXaX+jOTrxtk60Rs7JOsoJyF+CpoxerfaIA7vjPG5ro+RpOfKWx1tvc6tm9YuOtIinysZETlninYyupyz5cqQas/oGrTuzeOIE4gwSnVD/G65SYf9DasBZP9aUPwQ90Xqff6R8Q9fIWwGnn8rvCUa8bziz3EoIS76G6wqpkG6xbFaKwVoe5G+5qEao2YVQpzk3X/G0BbIO2HsWMGCLkEqg1Gsih0KUfYZml0yUgmCoEE6KEhQHZ3FSs+a6SMtOUIemc8QnNBDiNrIaTPOBBLwczskJ7ZUvSTHuV7rei4ubNAvnZ1Y4RAVIrc5/j7dEQdyOz9YWYnFVPlY6pPCh2/sdF3RxYig9CU35RC42JJDfVlgawiN2OWNJ5GMv4bXoC0AQkzaokEroWX+ikA32/m1fQmOO6bjnT96PtkTyN4gIvY5b3epdFUsaXslT1VnQN3s/61KizzTnqaxzszSdkKoHfZN2ed7cpJPmGrHMXxpQp7cTfXm3e/OFS8NmY95hFgAafHxxWm5PK2iUtBtjCU5RNn9gxTOxUhOtN5iyKKow9025cAl/SJTlACX/cQkHgUhtB43UZ4vzscRwhcqpxuwrunQvGuyANBS/uAKz7JnNqS/GpO6ZjzOK7rpIpStoV+UVaHVFrt+pO5/jQpT39SgbDQIcZF8DBQKSREuzs7oKdWe0jH5Dzkl2MqSk/K92d1hHsePtRHsoheT2OQu78baLBROZ30qsqp0RDCWK+++x80mBE/8chqQdDtzN9J4mlDP8izpBt9yrFSvZJU4NZ5Qx3zPYlnGJq9T0wJi1PTyTI5osiPflpcSHPffcceCoGZf/O6dnUK/3zoVKechc1rPYoWaAQunpGoHvlmKQGGKyScMiY+vwLDuO31sHqoAxj0hKs17Oo4q02I3ugVkDaHz/egssHubVW2+1DRJjfWYAGAKD6OaMfiQaMi7WltVUkGxBU5ihfOwWuH3kBcosBDWr0m3UBT9/wi4m40EcacJ582hFswJm4iIDsqxAaNmj8o0cHqVBJPITMaH0pIFppX1Cmh3LPaE/gE2mtjFAxpmGdvbUH0GlzxD6NEo0imcBoSIGKpzaOhc0W7hjz9zTNiSaCsX+wPW2NNkPEXay1sqNRaD+KMDI2IgmaL/hMsbpiLuPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8ef8d1d-95d0-4077-61ad-08da532e93a5 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 02:34:34.0005 (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: PAXPR01MB9074 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/av1: Add upper bound for the size of a sane sequence header 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oZvay+inlxXd It will be used by the Matroska muxer to reserve a certain number of bytes for the CodecPrivate in case no extradata is initially available (as it is for the libaom-av1 encoder). Signed-off-by: Andreas Rheinhardt --- libavcodec/av1.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/av1.h b/libavcodec/av1.h index 951a18ecb2..384f7cddc7 100644 --- a/libavcodec/av1.h +++ b/libavcodec/av1.h @@ -175,4 +175,10 @@ enum { AV1_RESTORE_SWITCHABLE = 3, }; +// Sequence Headers are actually unbounded because one can use +// an arbitrary number of leading zeroes when encoding via uvlc. +// The following estimate is based around using the lowest number +// of bits for uvlc encoding. +#define AV1_SANE_SEQUENCE_HEADER_MAX_BITS 3138 + #endif /* AVCODEC_AV1_H */