From patchwork Thu Apr 4 19:30:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47803 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp539890pzd; Thu, 4 Apr 2024 12:31:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWq+T2FyV/CUp3YddLozlfEQ2vG+M5mRGwm6tFBZuj9m9WgPHOPZgOqwLL8d2B66ttbvF2a+uGGPXgjNjtOVotHcihYv9FZuJVpPw== X-Google-Smtp-Source: AGHT+IFbTQQ0y/6NhzP0TJR5Zbg+W+radHYTNxrZ6KjM7Bdbvz+JVh9jYKRx1izDnD0XRXMUT629 X-Received: by 2002:a17:906:395a:b0:a4e:7b34:ef76 with SMTP id g26-20020a170906395a00b00a4e7b34ef76mr2274823eje.4.1712259067533; Thu, 04 Apr 2024 12:31:07 -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 f10-20020a17090624ca00b00a51955151eesi457428ejb.418.2024.04.04.12.31.06; Thu, 04 Apr 2024 12:31:07 -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=Cjx877kf; 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 14FFF68D14A; Thu, 4 Apr 2024 22:31:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2095.outbound.protection.outlook.com [40.92.74.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A96EC68D07E for ; Thu, 4 Apr 2024 22:30:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HTmEAtKWdj9H2e8MDnPqQ3CFkkQ7XmgqpLgT1FshI210jzGOzqac/JNHiFuMC5WtT7zRlsoH+ODFGlvWfSsn2zZZNTGE38z3ezgLWWkewMGyehQcznZI0u4mEi9oYbWY1whYyf3F+daMsdOOeFp17gO+R7TLbp0tAPqECuRYQxkyLTPmi0FDxvvToNJVk7r3O/Bs+QboTMWWqGMVjF/M3Wbr0Xq0q2nhNO0er4Nv7pscJa3gNvDZlSkxBHlMtgIrqggkzygDUXszBrkc3eYtEB6VHvMB+pop1on1U4AiFoLNytiaAg2QlCsmqDGQlGCFu6A00kMCuRfsIoFvytNMWQ== 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=gDY9BVSJ5po+Iejz3Rr3OYASQDbN4ILuOLAsuloas1g=; b=KtsgWAAl5yPqoNkrbhy8zC9BzDm1b5R4n8Xy5NOAzaFm3zDDyPFd1uz47yiwCIRxjKQD79Yt4fG0OwremQ+2j2qbx+NimYn72V0uIw/sxqKOWd3Au3oRpxo1NTrifhLJ9+hYSh9TIvjKhm78YS8XcRxJ1swg4f3DhvkMfWd9YDYxufV+RH/S8I9p8VCOeIMLagIL0zd1tsSm7GWIs2gv4WJXZv/r9/OtudcRPu9/M6L7cNtxQtUwDzrNKgsU8F7Yi/0X/AtBKinm3KndhoNG0sjw515r3wkUP5io2hQMKVf41kPgoS9OjkMhzWGa9hYwPzroZyqLzometwHRov1xzg== 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=gDY9BVSJ5po+Iejz3Rr3OYASQDbN4ILuOLAsuloas1g=; b=Cjx877kfJMJpWgjRClhNkHDWzvn+XsNFchVsnBbmMFZqfZ+CEHc7fHIMeU3KxgnjrJzvmSdWu6hGPAAHAX6T7ggDisK0oBX8ZKfpRv09NUxgfeSpq3lSySpSG0dK9uTnl56ZR7JLv0I6HVpM1A9wUPkqbMXxtPJT5D6zAvQz2oYV/wLY5ey+o/YZkqMZS9mlu72dl7NTAAsLSLkYy3oIXVjdk/3ISHG22yCoWWb6klcDgP+ELJUmr9GEWkGb8I06/QFkPv1hbr1ss8AnaV8zZW+R9Z+H9sIZfOu2I6CqXrQUyLsCO0KeNt0ncybsrWElEKfFFJTfJs6+htBTgbd5iQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0428.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 19:30:54 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 19:30:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 21:30:47 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [1wsGtWlf+eOF5Aord0DcKMzhTB7mBONji2fFNupWiAw=] X-ClientProxiedBy: ZR0P278CA0062.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404193047.3969122-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0428:EE_ X-MS-Office365-Filtering-Correlation-Id: a0c5a412-b86e-4ffb-5841-08dc54ddbeca X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sW6CqfBulsvFI2sr9zuzK0WK/lkF51ZnKtM7b6DkCx7It2+djzc5xpndOj6cl75neMZgCATjVujt/lJ3wBZGn1jT58c8cMYHVtdowQArLHhpt1OX+0Y2Tk2Tq/iEAZ+xByH6z8/onTY3+EaTztYPBaWbindUDxuZcDeGWEV7g3VU66GQ1qZjazpj9SOlyWNX0TQK5k7+OhmQTqirEJpJz3TKXbRXrTt8zvgSTZW8090AY4m3rag5cIqEdKh4FkutaWrUfQc3p130ZKElspRIJwK5OGFrEmXtonzUcgysKLoAMdDy4VhJdNGZVO3QTC5LjQJ9calEJXEGZwnCi76NaIK1JwqjMmUOFfqFaTS5JOMFZB7JrXaQo0SO3/ITk78WbYAh92g60ufM81UkIJ8Ib3s5kl4rU8mYz7YXK7Y+qFmPFc1+gMSLNlbhYmcw1TjDsC1dYTPNXqNBC3ukhYkgTRcGW432/eBYBNK6cCoFPR1Blt5D5WETZWs7rWZ1avlvlcgVENHla+mJl0Av9NxV46YGrAzHfjWLNPbWvfZC0hH6xTTB9m+jKd1R9BdNwYSA4wEdA+3Nya6sX8BEtu/7xzTeqAVpdEZ7z/zU9c/jjHM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EeFqI31H631PIMo8U5JGCprRcaSSlWn0XJjxk0Bk4poZu4rpMpVFJ9phajecwZSSwj13QmQ6pG5o873ryEKhEmExn3Y1UypWBat0+CCjyBXEc0gXyyHH23xG8OD7FpFtSv/lVwHjH9tsIT68nYOt0gJukWzHtE8VQ/fcejKmsVC24clJTEh0G7HIKt16shUMoYBWOwDcjJ8rMiD9yarUoVhrI3VFX2GpkbMAlbwPpHSPclq2+nRTIsI/dMPG4RWUE5t/FsfdTjCO/RdeUskeTF2YAFtzS4IZNR99Ys25SoFFa+tj+DAxEKSm12b9/t2Gx3UNbbH/9XJBqtRm7PEGULur1jWSlJi6u6w1H57oGNfd1uCZyRPb6mvywbqmQAyvMa+gGY+sRXozKjmgAYCTdzS9JJ+3HiJLig79kv4rdjZQKq/BpgdiaYJDLBZgibWbgQwRAKBVQKDG1xRUF9mfrmCQq1HacTt7oHD5l6Rum69lsnbfitdEp55JpKYm6y13qDuzVJ2q4BFd87qInh0p3xXq4pTvo28DfPUbCnhlXC3udioQ93Sk+QqePx+EQJcY9CUkN3TFQT5661j5IgU50myOe33vy50vP3Mph1gMQkpUUkfSn0NKzd5+grsDfaAMdGjOTusH+ilCmElhhAVXtmQh+fRXu14tNI0g8Td/o2i3c5CDziJ6y97wbRAIFfiN+Bh+t1suQHAyYUOIdLvthjxBM2KzRvHx2E5KDxx7F0U6Eg7X3MB8NijRiu+uO24/8PHsq3DPMD8AghTzADMoPFkGn5+UODuYzVlExhfDPp32iAQiekQ/vP+YUn18Wt8/7RQ56Rt0o7U2Cn98Nm/9h0l6HrsjlqN/M7HZw6H91oWMeje3893rxzxHmjikuqaQsPtixe7c8nG9Uf4qh0prnrwhSvhRO6d3cGtHME6a6F1LqWxzDDJzj45XcdrrWAEcNCCnCPXSKggIIQ7Vqq9y5xAhsUaSQn/hTvM3wf0SLXz2ONW9WdNgqP329tx9envsMUrJIYifvJnRxRNcHuCAUiA/5nvA+xBqaEDI5riy8PrXKMCc/xT4qufyDJXK+Tg2JoLCJeMbePBJcvkRBpDFSKAGQnUgyrcmyVZnwq9fqGonLUO0HaSfO9IKA2GJokBkiLKR49dydl14EbSRPc/4+bwobKZoUJEM8kDq+OBCELaNdmWLcun0jsIL+KC6B13/pJIpp/GKXux9CYOGLz9sktKZNY03VHxkOXlet5vtXJ7ARdBCZ4m2elQKTOu4PPiB7pocyP7HAcMRctsJ+vmkuw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0c5a412-b86e-4ffb-5841-08dc54ddbeca X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 19:30:54.7051 (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: DB9P250MB0428 Subject: [FFmpeg-devel] [PATCH] avcodec/dv: Don't pretend initializing work chunks can fail 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: nROYo/rs9auY Signed-off-by: Andreas Rheinhardt --- libavcodec/dv.c | 4 +--- libavcodec/dv_internal.h | 2 +- libavcodec/dvdec.c | 6 +----- libavcodec/dvenc.c | 6 +----- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/libavcodec/dv.c b/libavcodec/dv.c index eb49978ad8..194d982562 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -166,7 +166,7 @@ static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan, } } -int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d) +void ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d) { int j, i, c, s, p; @@ -185,6 +185,4 @@ int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d) } } } - - return 0; } diff --git a/libavcodec/dv_internal.h b/libavcodec/dv_internal.h index 4b4151c88d..05e26a8138 100644 --- a/libavcodec/dv_internal.h +++ b/libavcodec/dv_internal.h @@ -32,7 +32,7 @@ typedef struct DVwork_chunk { uint16_t mb_coordinates[5]; } DVwork_chunk; -int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d); +void ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d); static inline int dv_work_pool_size(const AVDVProfile *d) { diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index a06e4807e7..9e8d40187d 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -637,11 +637,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame, } if (sys != s->sys) { - ret = ff_dv_init_dynamic_tables(s->work_chunks, sys); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Error initializing the work tables.\n"); - return ret; - } + ff_dv_init_dynamic_tables(s->work_chunks, sys); dv_init_weight_tables(s, sys); s->sys = sys; } diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index ce21247081..3afeedbb87 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -93,11 +93,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - ret = ff_dv_init_dynamic_tables(s->work_chunks, s->sys); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Error initializing work tables.\n"); - return ret; - } + ff_dv_init_dynamic_tables(s->work_chunks, s->sys); memset(&fdsp,0, sizeof(fdsp)); memset(&mecc,0, sizeof(mecc));