From patchwork Tue Nov 9 18:01:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31351 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1495451iob; Tue, 9 Nov 2021 10:04:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzs6yGQ4zgaX40a9F7c53UAtDijGRY0N9a49Rmo57cytxsW4z3uupFVHgApk3xwL0xjTMsW X-Received: by 2002:a17:906:489a:: with SMTP id v26mr12337514ejq.305.1636481075576; Tue, 09 Nov 2021 10:04:35 -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 s1si32249723edi.608.2021.11.09.10.04.35; Tue, 09 Nov 2021 10:04:35 -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=h+3uXQ4m; 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 6604C68A8DB; Tue, 9 Nov 2021 20:02:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073093.outbound.protection.outlook.com [40.92.73.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D04768AE51 for ; Tue, 9 Nov 2021 20:02:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cL33ypuZvcAg0F315PneUU5cY8YZY4oHQthtnvfXLf8gRABRAPCziOQ2Q1e4qKaa3AX1CbaH9JA7DAEeZGiKrflTHFUIDUXh6Z8ibL0T7swpcfytKHPgl2N8KQnukqv2B7yGskaqMsu4op0kVrkOiCynahv+kmaxReEfCPfGDtUXvgozfQ1k33RhRBbdNwuyTax2Ou1MCCNgxyJNgtaOlv9UNeeoKLEUV/G40TQOqtnqYAfgzE+zzUPfr1l7Uhs+gp9luRuRioiw67yjQ5Jepf1V2vtPeDawcRu7hICAVTwkiq11gdV9nQRfM2Mz6DIAKNhhg/IYImQY/nOnRyWOdQ== 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=uy/OyyuC8UKR0gquYlTB4gXFdVOLD0LCO2C+jx68Yw0=; b=HJiOWl06mieNXBa2++b2lOwSTVZ35VsQrPELyhA7weGSVoXpAiXnrTBdJ91cwrxrRMCRzur5ZB6FJ5FcpIqPTZKrwiOYbjo1OSOz8maeIQ9JnjV0ZPLjQNM2wvrRksZyoAKWtqEm3wpnAWY9AutEEa+dJayH3j1cNLRCUioNIYQ/6sr+xzRnBWUkYGai4NnFsThH0zlUuCRBuMg9wwiVFi6Vnx9C5U5np2hmtnvAdZwm+jIYWbvfvrUcEpQmrc1EeP/7mRztgFEmpzg9GScdlP+yDeTbQPkjRPAR6la/TFjN+/x86wHDnURqekGD9gpUntim/AnGoxVPk/MZYgn16A== 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=uy/OyyuC8UKR0gquYlTB4gXFdVOLD0LCO2C+jx68Yw0=; b=h+3uXQ4m+NZkNBGwyFYL6MgK7+OEPeaNCITlIwgiSxC9qFQANQtFPtYHxTIwc0BCPCkWCB4IA1wTvd0FjT1VJieNBalXom09J8tcJg3cLrI+yr3K3vh9d/Sk0GIDqJBgsHUupqnlzjyMXuFPcdvDRCuIiu8ouY+38raeUQSKrsqcxuzcXKsqFJ3nBHanK2dwJi8RG7fdvnAH8+pbQ2FHcJqUJil+mxnPgtCU2XujYMODDEx1hHgbvvccSEzqZp64Niyct1GU+sgOAyrdHt3WoDqOW/JhGxfJP1aekTK+5gWLQva/Y1XEWYIVgzMcHHY/dFzZb7zF5e+brJUKjDFOlg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 18:02:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:51 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [YnJqmFBSWq5kJD8wsH/jMmtEu7+7iw6t] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4419eac-9306-4f4d-0034-08d9a3ab220a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+NnZ373470pvvGG/nPAkZZzbUpnr9y1S4lz3s2nYVoA9B1d3L+Vf5whnl1K/OoYR43EMzqf8ZmHTK62EH3EpCsY2s11TsfPZlICQcfU/2zpLTQTkFt5OCVqY89D1nb0sa/4lhtky9ijz8jPMbuxPc/LFwNfsoGbDfMXo/kYoPRFltTDoe0Lg7HEzJHl+yXN80TgPhRMlYS2Lk1e3TTwj5stCY+1nEZO1DfGoVflcHYsDAWBzQLz4Ezi96BaBv0PbtGuJZlZDJd3yUIxaHOZbuIURLDBSgKDPgG5a5w2Qt+VesKZGkWh5iYJZ3uzuPT742HeBVEsfnSLwqPNEAeKrYBt7amDTz1kj+rQ2zsfSEJqr5VXclwxwUtfwGTMdqpon/28ClN4l4de8BpDAZwLZ8HIrWiEdgbilxrArTV54ard4UnmQiIfbHtB1SQ3RNJ3zECKnIvpQHoUvO6a/3n2YhzYe7Q+VmguA1kr/OwApnBvSEOF8TltlMT8vFeJCd0ZuyWc+7GgPV/fRgYgXrkFVDyz2xEmL6oefTHNgO7tyTL52dcKUJRQ3oTaU9CIMm7l0mCGf8+KeXdRSsYOQCfhGIxtsvmVMXJH6b6bpLpQMbj94/yhcxSmyVKHOAqtVkoCxYo7B15QxwiDZrQvKdhlmzU7tYGzmeTj68nnw2zmpLB9AsVF+4hRJPgZoKCRWieiOp7Dyc4UPipbI= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7MHUCLEf/7WkhKhf7uZ8FXu/yapuThUe0pksQNRKpZPH3xNCvnGqtFGdW44LmtGnAjqCLLWx6W5oTkeS4GQap2q/IaPlOnreTnkJQzIaVvu6Pt3oneNWDXn6Nk3O8Y+t2AEfcVwQ7w+CInxvM1w869i09BxEpb6sLIOtJy65mIpQht27PMAZFebudPPT7bLMuRoJqFfbOFe6DOan7r2PTkPzQ9YosU7CsQuLqqm5Y9U0b1o7yD8eISMbhCAFIxK81RfdVlaqb0uqcXQLRMyBX8KKlG7o06p4Dnvce1K1/IG1rme/rPP3mq/IiRcWFVtW3zVy5WA+hoZmLVadl4MuLcBDSEI4ExgL54udVoTKhR0upn25wbTBuhonFsexzr/wCL+yRSUPXo7zt7W/AdOTC1yKUW9FV5EYeOEdyme2C01DMJTeS7aVW5JuhjTcyocVVGmovaeYgqCbX383BBIeBcNvM1jCr5tnYeorDap2zba8qN+xyBJj6n3qTkr4eT9auH9smMiTN4pWShcz2sVvWnHaHYWZvkfe5hAas5LADXg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zruA60gMPgxoJGDB+kCirKGIOv9uobdhUjruRSzsBCCE11jPMF3pdH/UyFwgrFxV2R12dT3qrpHjvMmhgAwAJ3zfCA/Efn4GQIA94J6ZMrBKAlElrPNFk67MxHiQHDFZEQtaFInmHFGq+J7PdhHId88c1O9ODKuIbpcmUYF+HF11nzXBCiWUQkGczaLQuerG1PwAZgG+DV2NnjjYt1japGGnJPUEkvC//YRRHqBmzfarDgn9C1HrWvag7ded3yKcBGTVUXa977q2DluF2mVgZZlNEEym1MQ8UVpNCBMUq8Em/LF+TGkQe3JtgllsD+SGwGFzXEnmo9g2836Yuni3iPA3z6WxcZF9cxka0JSfVEzoDrj8eTwgD1KH2g0k6zPJfuEJvGUdnExPwFPhTwMGMiUpHyMHMZEYoD4cjXIg7lJPYLqph87qJusAGcUbml0RIbPSm5Bfz/EJsnWQGlGiZZLNpN98DzoeJlLdlwbmHvHoimJSoAEaegCY+DY45LozVB0Q7vWqf/tQ3SdG0riYked4aTXteaK48AVRJUImPOYNn+AARNaySxGJOTS2/gsShm8DFqEDXpanQwUD8hfaKAfFvJDbjIuJu7LVnAqD9U4vWqipC62i0v+3Jm9hLX6jzycM8ZFUnKyxGMSRwxbmSiF0TKCrWsKOfJlShbMEnXg/s9rbbBjztaPhSU0jiSc4mXfjzfpTBNGPwFsDXsfovw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4419eac-9306-4f4d-0034-08d9a3ab220a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:45.7452 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 13/17] avformat/mxfenc: Remove redundant DNXHD frame size checks 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: Yp2C72cRHd/u The actual frame_size is no longer used since commit 3d38e45eb85c7a2420cb48a9cd45625c28644b2e; and the check for "< 0" is equivalent to the CID being valid. But this is already ensured by mxf_dnxhd_codec_uls containing this CID. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 326ec6a7d6..83f9a778fe 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2066,7 +2066,7 @@ static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt { MXFContext *mxf = s->priv_data; MXFStreamContext *sc = st->priv_data; - int i, cid, frame_size = 0; + int i, cid; if (mxf->header_written) return 1; @@ -2094,12 +2094,6 @@ static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt if (!sc->component_depth) return 0; - if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) == DNXHD_VARIABLE) { - frame_size = avpriv_dnxhd_get_hr_frame_size(cid, st->codecpar->width, st->codecpar->height); - } - if (frame_size < 0) - return 0; - if (cid >= 1270) { // RI raster av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den, st->codecpar->width, st->codecpar->height,