From patchwork Thu Dec 23 09:13:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32865 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7106556iog; Thu, 23 Dec 2021 01:15:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2keqKbO2fpnfjBS1jz0mZnP5PqZwDpN+CzNIV1V0zRJSVl5813Xsmp42YRwh6D2T2pCYj X-Received: by 2002:aa7:d94d:: with SMTP id l13mr1278987eds.208.1640250957120; Thu, 23 Dec 2021 01:15:57 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q10si1781504ejt.668.2021.12.23.01.15.56; Thu, 23 Dec 2021 01:15:57 -0800 (PST) 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=JQG0rQ4Y; 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 A537268B18A; Thu, 23 Dec 2021 11:14:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 734D968B190 for ; Thu, 23 Dec 2021 11:14:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NEJ+0aN067CeaNz+3+FcpeL+0+0NkMx6Y6oj9CJlqkLBnTGPQ6s3KY7kSOeSG7GBJTAX+vt4vjk07/taSmAjooeVoSfrJysuMqwXEiApaMaWeH6IHfRROjULBkVUAlCsooC8Q7iBvG6kN6AzC+ZYQxhkm8Db6V69E18OcineJRIiFzbYO/+QdCKHSAQBc0ifwhl39zt+Ei2cX8LFavrcrb9e29I59feHo03K/PrdrAFvPFCK7rGIIMq2iSEns1c0m+x7SlpAkJkfBzpWzqeNs8Nf8nHmBcqw+FW2p3poWIIWjesmdnMDwd0J8VFX3F5ZXLZJTLviHj4aB0zIB1Rdtg== 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=uRbdu/SPFPh1Ix5RlmCpMtOEwAKPVBqu5jtCozMDN6s=; b=XLFoa82u1kpCuKZqfxXaszBSOCkkAozfMvW9credJeCBrHbUIPMZhUGFxI9WBwTP1Hmf6pEyycv5tvCA9L5mT1PVG/9DOMJ2pIsPhp8hg+VDpitnTa9DT8qveLnnPOL6bsQo4otqEiNEfBPPCkbt0+x4BaF/K5Xs/IBfsYfxG0nEfdY2ZtjuVlgQwQpj1xQGGmr9rVWzQ1PRjXB0X72rhgI7VCpm0YbBUGbBS+P9i+COcqFZANuFWYEGz8PtgwuZq/xOiEdzz9Osh47LA6AXWC6ouRcpk1ImUFGhv7Lv81rc9MXSnCCGDCpznFAudd8Y5hw8YuzjKjdtjaqguIwwug== 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=uRbdu/SPFPh1Ix5RlmCpMtOEwAKPVBqu5jtCozMDN6s=; b=JQG0rQ4YxLHCsOWF/AO7kI/zZqZxOCQpfpr0qMy9gtd8IwzS1ZuMIqbYGtvWH+KUJ07OORT17BfsRIRBFTKxcYk22c3D3yeXzqo+RXMMVF6i7fi86M2FrhxZ61cfl18GIe07hz6llflYvRjHPH+D6L3qTp2snIGktcZyRrMdlo4r+8qk3ciHk5AYtma/VdTmvuA1KioyvwzbZUBHdlx4vzn+8ZG24ZCbpyZ9ZTjn7XJN/SrcZxrzzNgZ2ehbtNFGxd3+lq6x5GilbDmU0IxN0+DZpPxmFmLSNzVGbCkIucI/e74eb3TTCExNotXUsUgrObT/9pikezGaax/83kIl7A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5607.eurprd03.prod.outlook.com (2603:10a6:20b:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Thu, 23 Dec 2021 09:14:18 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:14:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:36 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [cM5luj9OB+4Hc48ibKrnwuEcgsR/qLbt] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e952ce24-1b58-450f-bf43-08d9c5f4991a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1Jm3P1O0EroPXx9Guf167VC31GoJGU4uizR2VQ0zugpthb5R1WBNRn9IUNsyWCZcVz5irjpNrtZNmjSK3MrG+Vu8NwbY1LzOnjb9vGVFzza4pW8gImim4jJxxnrZ6luacmv8Tjcw3bbicjnljd8U6pMYUdkh5gOppTj2hEqJkH3voPVANL1vBTHlcI7iv61UaLuMMRIxAtFcM7yjBN4wj3lhK/YV04MgzgvC/VIRxQwqFPFHdVheTJqMthFw6LHbVrnYLCdH4w2KqBx2uWvnXaLMIwJOLBvE/osZL1/Y+Zi32b4lwPT5QV/pq3xlTWyhIFhvJGoJ0ED+RA+kmjPRVkbvTKaYqOU03ci1Xbhvx8KIW1EB9SpTo6cJyWvXg16gCPRNfu0cBcEBwI+z39TykY10RrhHQmZBq3J8fYQ7msc1HxoIVgvlCHO4KTkCr/JujOuUdQFNmtFxpIB5jS9AgxU/Z1NEVNmqTjJjbBWwOGzsfu14yH5PLDi/7X4j6mJrt+S+5b5NP5CelpeBv6BDzlYL5tHiI614jE6sw4i2gorCZEthhmjApqHbN6EKx9n5Ui9usYbujRbV8xPPPwc4rtPWZuUWAshO4kJ86bHHeF9U5PFw5hFYH8KiacUsUyovE2gFlQmGeSl07cOWLBSOAst4LPek2IVn/xpY9czy2cFqJ0XahdZbGrT4ygFFxyY/5+yQ8QQPEmUfk57TC6l5AqpGCeUmxkl+mN6Q7/fIvPAjE= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qovmIkumjDAPkniQ2g/9t5KEr6VZgHVy7L5ViIXBNk3WI5sSuGmCKP3YgmUaNtNUfQ6k4tMIU8bTJm/RrTSjeMN88G7wmf3+sjOz9cDnqfiKbiKhwhgCCqd/mDXHbWCVOWuzqtgf/f0hpRZPYg5hgsazxMXmAtvq/poBdwC8Iw92q6Xdy/XIAVZad3/b8aKqlPrp/VGq1OU0538WwxXEM9widI1CbhpgkANQKLBYNkw7gHtFnUXCI2HOCuwTTNl03IrWNHKlW1DLyMfOUU3TdQ2Fql7ZVhjyc944Bvqv+idtmL91UcMl6ipIH5ncYw7iTicf2kjafs7nbhs8ytMOKgIPkEG+6UAiDjBBD+49+ZbgQqxumjDqAkHjU4BvIXwF8PvlthYhrVHoewjZPC7EZjE0fWBA7dOYMfaIjrEm29/FmWIPNxUSPxnuTjmzS6nKkhPFtwR306L4asseUBBt7INI5wQkOzexfSqB7XxnpgG0xWRvmgLCCvfWqsk+QLWaEHWKSnK/tBc1Y5/WgCPIR7OC7y8iUaNcc8Ya7Fsd58w7PhtTvj8N4pF2GwI4QlmQPbNf0KkfXeZuzPdwZm2+xw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JSz0lV3xzzUl5eYpguUy+1jUYGEYy+L0SSexmSc8yErXauC7zDfJMibwjp1OupDP8Fy0t7a12xm5iN33QKNrGKsfdxvcdZRbGqYf3DLcG+VxpCv8fGZo8hcSxHzoeA5KIwBDAqGQF5yfnFZIRp405+syoAXwBcpfANVWIjaim+tTKIVgavzr2+Cx3qN/JjVThHhkf19uSGofqMNEeoso5xXeSW/krkbu/yhcPeCUuNVO6ejMpuD04HyfN9sutTl3PbKA/8tQDYp6zmy8WTK1seqZ+/oDO3prnLIkjZWFZU/gTfLlq+ERH7/9vCp3H2Dq1+bJ7jfRhJfW6xnQHSEdfCLEIoLX4aRu7+8N3pwLtO1T2LWQrb4JwtFElsVMYVb0sgXjYTos9hrPc0W9aaH9qPd18QoBchRtHT9MjpiAjlJd73ylD0NKaNGYeyocHlkv7039aEz1J8VdOEdZwboDiPjRO5LRoNnuG4M9d52qkudcvaYWg6ZL/vxSx2IZc8sQwaNRwAofECseRn8jlnvtj2xwBKaSDuhDXUPfqZZxeMldlfe8KmWcXxiFXG0qTYKjLowSLcRAG1vPM+s0kXS8BD3JKevkcMgy1i+mJi1FAOe3fJxOtRfkGbFyUq2a/p9q1ekS8gY5qYjB76216jd87rur6AxsRjDZe4VQ/J71c4J/vUfpRPVrX9AJ9V5hy6sM6E1LBT6X0NcN6b9LAmRm28GF25mnpde0dkya2eQd032Rz8/UhdDt1RjcVdOX6VHFeq/BLPOFg3L9FGKdGmn/FtATlTJpyNpri9WhX1eCNwTVVEi82KuhXjhQhOG4EpdjQjT5JplJXr1mzoLQun/gcr1Hz/UYCqovHi2P1Y9eHigtc4HYgAX+e3FvOPoPJAZ3QzpbNp/AAPh3Tt1bGAvHo3Y53Su4ezUMZMbms4eE/Q/HSy3C2Q1N+0N3Qi1yvRwRG2O7HzRILlk5KTaYJ0ErHg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e952ce24-1b58-450f-bf43-08d9c5f4991a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:14:18.3182 (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: AM6PR03MB5607 Subject: [FFmpeg-devel] [PATCH 26/30] avcodec/mpegvideo: Don't check for > 8 bit MPEG-1/2 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: F15iIIFeQKCP It doesn't exist. Signed-off-by: Andreas Rheinhardt --- Apart from the mpeg4 decoder no mpegvideo decoder sets bits_per_raw_sample. Should it be set (in ff_mpv_decode_init())? libavcodec/mpegvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 3a42e08a04..4e6ad92473 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2128,7 +2128,7 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], } else { /* Only MPEG-4 Simple Studio Profile is supported in > 8-bit mode. TODO: Integrate 10-bit properly into mpegvideo.c so that ER works properly */ - if (s->avctx->bits_per_raw_sample > 8){ + if (!is_mpeg12 && s->avctx->bits_per_raw_sample > 8) { const int act_block_size = block_size * 2; if(s->dpcm_direction == 0) {