From patchwork Sat Feb 3 11:25:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45991 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1508242pzb; Sat, 3 Feb 2024 03:57:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFkpCYBC/9gwmS6o6c7TVZ7YbsOzr2lS+LuunQscyqF2uIguDQVUHFlhvfc7K0gfHg1/5uD X-Received: by 2002:aa7:cf06:0:b0:55e:f0f4:1b8e with SMTP id a6-20020aa7cf06000000b0055ef0f41b8emr1493774edy.13.1706961472897; Sat, 03 Feb 2024 03:57:52 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVDMJLKQJQ8KO5EtltOeN9eZKfWsWLez6P1xHZzoBbz3mI5/kjLbaOCqs++blc0H40AuUkgJP8jCqpLNQ059JxRoMJ1LxdO5fSFo5swEGcmowRupOcyyO8UaeBgYac5NQ8J1jU82h116omYWvilNuFPm1DrwxDSiUMGze3lay15IGRZav/ZAZgo7+FLuMX+CuX7RSu1qnAUyA7qOLDbLlJ9IT6wo0VXKqPmjo8J/Zq9+nCjNMxNYqVBmvUGrH8mHFFJ16Dl7StSP6lm2ZQ+R2Vlww4DIAfBDG/LIepclhPln4GhzWFkfcbdPxiGeERCTdQClnxnV/Zlk9HANNX+sqw/hzKHKn/BKOL2RjBwnBCvezjah5zPsOGK93upYC8hKz92vAz6YXhXFR753WtCAe3qMgcK9riOpk5KWOSjVFxMoyX6gcPQfhpZvd7iFwefIN/3b9V7mZbIUcqPSPUhcX8y4wdWViCwBorQ1wdL96BqUuNr4xpEEX7hxys1lcnoYygKPX/eh9mEmm5ShkhmAcixG2Tj2BOmh7bli/GQrTi3aY41qQfDUcg7/QIS51G8rcmE0QK221v8g7G3tSf/qHC5XvAVdJ7VQ1MqrxLuglo+MT2KcyJ2o23gtnlhm3NO0Hzy3SOyZ4X9TRB/XxcmSW55lPaM3M9wqLbb1/RCk9ZU/4jMN0d/S3NZ92CJgpkD3WbTtQKQZUrcLbhZmn0PYyjon9m7dc7BtNvboVCID+X3ZDVjBr0RQLKMdwZt5ygpK8mfoznhX64pJ71z4qrCtQ/FPifepRBG0ucmK6CLkXfxx4V0uGAlq/5EzEYju52ymWGu8Gb9mAiZJjzcVsrMJ4JX1hMrgiBW62PRtKvlHj04duTL11hqpIgtIj2tTpvySiPOZ5i7H2P/CPnOFrmClv/z0RdbUD/2GyAkIywo2u4H3ZHTutiZPi25U+jdF0tVPfa6Mo gtNP36GVXK8m7B+1dnrNVIldLz9cMD+gKWjuDHmekwx2MbzUWoErLRDIJHz7CH/nAC7jcpj3Z6e+f2p1GxRldFtbXTpcY81Ex0tlyu89X78yvM8mO6rIvDEtDaLp+zpwc0xvln0Hz3HFamj5EEhHN2pxxSjtAkAiLgjpK2T6pCiDfu+DRRdcPO+wpffM5/CuCafaeOM6m5mR/4D2Ir70rsLiZLmZTKk5UkIlWqE5SmCail1ER33ugvsNGEf1lDdEo7EMAPr1hF4g8GyCd5VYsiTo7V0undYIY6R14YMwsUR9MXMYseCHLrlNXNY52ijZVkKiNAWjynHkguv7ugt1PhI//sCDHFFwadzlKIQ92zZnYl91dBEbkk+2eLgc4SLLLCfiG7b0WyKNr6yDbil+zyb2JXjYQh8gvMZW6lAnQLCL6Q0RZSwKicfStOZNZF7blq5pZkjmS5YCfEQ/S/GSRr2A0EnvrAosxn9ZYx4nvPEGR+79p33YbCfHN3n7qH6P/tCQO0+88D6Yd0ZChmENdnZEITSooFf6eM5iLio7FmSxLAAetm3z8y9NE5aMyLnhPpcVwJlH9UhpUSREqIYGmL9ymRIp0iDqrn5uLpK+YsNG577h076O50vnPd83Y5vKbOiIAMQ4EXtAI= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eg13-20020a056402288d00b005588b35087asi1706571edb.307.2024.02.03.03.57.52; Sat, 03 Feb 2024 03:57:52 -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=ab9c5XLt; 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 18FB268D12E; Sat, 3 Feb 2024 13:57:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2054.outbound.protection.outlook.com [40.92.66.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2A1068CF80 for ; Sat, 3 Feb 2024 13:57:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BiRazNJ9YQwdrUJgHqLvp2jRWZlfFv4ZIsyi5ZfE5kEq4VbG+UU/h7dLBfQAz5EhV2XIzx9CXemkmkpbQA0v+LHsIqy2cF3PVeHEqhRBG6N2OjwXJqwEtFyRQwMNbRzMjhvKDcJo5cIwJyXTssfWBN48WwfMzfpRwRJ2hUzKyK64HZjRWQrqo7ksEuGhrgT5Z29SwzZO7Me87IzFK2Ru2dizmR4JgTNx/BwG8GnKLuEcEm1WeiUmxZmmaog/TLIQt9q5VbmSeS/F/cZPf8B43IU0sOF2w+Im9Y79/waXbvxeHHUlb9+IixNjf4pG9Qym9YdSbtbEFVwTLn6PcRMzHA== 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=bvDm7k99dGjuplk8kVg0XyKPd6C2+S5Vdjy/4FrtZHg=; b=aYAU0njeJuD2jr2lMBCHBnMQMIQxvV7CVdm8VmnzWTtHnQjEHIxaX374opuWZVLlTBc/u++Ab6mrgVZgRICG+QVVcumZU5GHPavy3Aedr38Q3EUpr053VwR930G2dmngH56v8grC9dr901DabvuyL83Lfkq2cH7KniQhNeuwyMerxpQ24STC47E0vDrOfhkFUHjvyzpsTQZiWh/tY7AQl6219zDqS4uYb2uBg6rpYAfeRCGSAvgcFcouuFqsMwQvzcrGIHiVS3A9MphDbWrBfMeldkLHIUNdmUoWf3R6b6QWs1xqjmCTq3Bl6mlPbnSLj1uUTKcLdGcJmQ1M6RP+Rw== 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=bvDm7k99dGjuplk8kVg0XyKPd6C2+S5Vdjy/4FrtZHg=; b=ab9c5XLtfJ1HcvsixWmg0Sv6BMEllH/Be27I8kR9HVmGl5DyXs6Rk7nfULvqBolSTZ89rMxb7yeWIQegibz1HwoHCG/1xc5k9TgK9KUM6DPkVU1Fo7Kbs5Hrj91CqcJOnT+TuIevr+m1g5G0Uc3EO8gieaFBeA5iOljdG47gRr/GdTnONgnu0Bq+M7MR45k1Sp407CjFC0FyBkfQYnfDncchwzzmdifFs7u38X6/HYPsLGuT0D8NuoE/CQlsp/FwWBwoMVdWX7JX85Wvl9EjX5PlvL8YvQmK5EOKsPSCTCKMVkp5w5ius7O09GgATUdOMSeyIoCV1Jhc1R7f8nEx8Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0122.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 11:24:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Sat, 3 Feb 2024 11:24:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 12:25:58 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [n+3VtxvJWqi3IrjeJNzjDDJ0G16Q9QeRKMgAHPcNnX4=] X-ClientProxiedBy: ZR0P278CA0151.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203112600.1922079-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0122:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a83c7cc-afb3-46cf-d649-08dc24aaa7c8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JlDku+q79XePsoJkUlDtBypTS8fLx+ZoUt5YtG0cmhz8WmgEcL9VWYMq03vQwzAF6cNZjmZKEnq5v78Hf953L7DciRDbYoJxhU+6CWjOV7wee4iJk3FWK8OdO3959wKXjbt+yuTGgHxJJTMFJJEJkMTvFavBJ00ABWJ+AuNytUpfnOPj1BPzDKoiAmydhBmuV+HJCZmrdioGO/WDro5UgUwAP8kMa3u0FcEjFZ5jrza5frs7dEftI+0kGPccs+kg+4lsd2vTi4UY65V8ktOzQQNjDAu5EtwkjZcWY95SKdlS1Hq2yNcPm6z2GG13CPwkzUR7Q8jMCi+Hvu4dGVf4zenkrir4Kw1nNB6IjM2QRYsBvoGisVlki9Xxy2nbLq+JptqJ7WywtaNbMmIotUD9Bfoex5EHfXkaZrXBfUxj0HLrwZlfKYsPeuqMYCweKtpVqY2VV5MH15G53y24tuKVlX5rXApfGjQ8ZufiUMKTEkKJlA+3vuEW30rXY/vyq40Cznf7zlR/G7u5vPNPoGpY2j8+jka5z7SsBiOQzEBas/9Mtd7hTJIiwYWC4YMtZnToI8UWJQCyYGnuQmhExc2UFQTxqlQeNXi4+gPoG+2B1DmJNjdDwEIJZ2WaPdg4AX+j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nhPYul39O1wJ5/F532/KP4s2ZrBI0fc5xbgOA5PklVxNwvqF+DHoYeXEnMK8UYj0HhB/T9VA5u7bn36CqG7nUDousNIIMe+pOv6GODs3PEazd3opjJPuhAzjZy2xRn9GG9dYU+UIZHx5VdE2Sh0nNMXkFkcC+EpF2X6DsYoxwiaB3C9khjStXPCSigPoMKDdv+TRw0BN+gAajLXC2uaU/ZXU4kAbj3K1xNmyASrHEIuxdIipnW/Wo6/aw6tCx8JIsi+AKgsGY/wTCgqombUlGets0zNOGdWHj0Olr1HvJ7pHEsoTim3MUx4W0YjUxmOtLR9TplcfIGPlwWXzWNuKj3rXQg1+gugIpTiurGrTyr2nZwBPOhWlcwqkKVGOaHzhgQFRLjn9xgkaK7/Fgppd67AeUE9vxWL6VJMHD0qo5cIQ1bRNMhcx+iEmuAwJlPQyIfZOQRY1RpZDuHF3QloedfPsyoPGG94QGR3dh60C1T3ez0EYM7Yxb0ryxGd49BDrqH7vFz2PzKVux2+zuJnfN2X+F6NcWmDQvgGaiNOSsk/NIHq01qh1NC7d1+es7zkNkhQgsWjIvH9WfxoZIRJBG5TuohZdwTsRnKsJrsqtQRmCiWCV4UebSCDbCJhDrrk7E3tFWVv/mtCLH4e2+GR6oxnGPOvS0xbqLo+EJcVooej4TMTUOyHcxrOyFvpFJJsCwKElAoMkBKxPkaipgpwwyqgsYGxBJkL8XpGqQJwdV0Kg53Sh1Y8SY4FuENmzW7BbTdPqty920SLygjsGpWbCy/41xUD28UUM0DVSTMuFggwYNXz0t9B05y32Ahak8oIa/QSlCXiFLV9z1F4JgH6z0Z8l9QZLU1xVHODBKVBkyJ4o2iUlM1rS8bpNqcbJ/BopVJL+DI3eix9nZ1SwNdA9t957oKM78MINO6V4xgXvU7VmNb7w+iw17ZyRnUtSQXjdpmSvk3YPgfh35d5di3cJjpItgk3uYbswfvFmBPeyB9Fp1d2SsNskLB4Vcs1qXu7VRNR+ybQw9avJRw1Y/gMLjQwQF/b1QPRppPun59n9QG5TiS0s9L+V2r2GsYeNM7ebkXXh0M8hzv8Fl8GIXQDnc7GMoYqBO7Q2T9i2YiTYiajBB7Jg8tE14IdbGVApZ6pxwTCPzwRy6vIq8xLmXK49FHbD5lgV04zESuv7drNJLn2OLfLP3yuQ4BwaWn+fcf68+hnsXa20mV1tdqIponB4AKxBKuN9uNpqp9mRXIPhnjSNjG3pZ1SO0DH/6I9Xds2C X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a83c7cc-afb3-46cf-d649-08dc24aaa7c8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 11:24:15.9739 (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: AM8P250MB0122 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/avformat: Remove dead check, write-only assignment 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: 0oT+BOFqovZH For muxers, the internal AVCodecContext is basically unused except in avformat_transfer_internal_stream_timing_info() (which sets time_base and ticks_per_frame) and av_stream_get_codec_timebase() (a getter for time_base). This makes ticks_per_frame write-only, so don't set it. Also remove an always-false check for the AVCodecContext's codec_tag. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 8e8c6fbe55..1a99598d6f 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -775,11 +775,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, || copy_tb == AVFMT_TBCF_R_FRAMERATE) { enc_ctx->time_base.num = ist->r_frame_rate.den; enc_ctx->time_base.den = 2*ist->r_frame_rate.num; -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - enc_ctx->ticks_per_frame = 2; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } else #endif if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx->framerate.num && @@ -792,7 +787,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #if FF_API_TICKS_PER_FRAME FF_DISABLE_DEPRECATION_WARNINGS enc_ctx->time_base.num *= dec_ctx->ticks_per_frame; - enc_ctx->ticks_per_frame = 2; FF_ENABLE_DEPRECATION_WARNINGS #endif } @@ -812,7 +806,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - if ((enc_ctx->codec_tag == AV_RL32("tmcd") || ost->codecpar->codec_tag == AV_RL32("tmcd")) + if (ost->codecpar->codec_tag == AV_RL32("tmcd") && dec_ctx_tb.num < dec_ctx_tb.den && dec_ctx_tb.num > 0 && 121LL*dec_ctx_tb.num > dec_ctx_tb.den) {