From patchwork Fri Feb 11 08:51:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3025480nkb; Fri, 11 Feb 2022 00:51:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCLfWB9dARQS41vdiw+9Fku/TITs2Sl6H2gQEkXTwRfQTVQSpcrAxcbmn0fgCHeFPNcbmt X-Received: by 2002:a17:907:60cb:: with SMTP id hv11mr504280ejc.122.1644569510980; Fri, 11 Feb 2022 00:51:50 -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 gn10si8212229ejc.539.2022.02.11.00.51.50; Fri, 11 Feb 2022 00:51:50 -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=QW+QvTBx; 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 5398068B24D; Fri, 11 Feb 2022 10:51:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069068.outbound.protection.outlook.com [40.92.69.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0179A68B1E0 for ; Fri, 11 Feb 2022 10:51:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mrhedcIBRZwhdXZlJLEz9u1X+X/NmI+16HbLhCpCTpOR6xuTu94HpoB4F1Vu7SnksncYW8EZNOsO5xTfPjQBR/8MAju/1n8Mk67A95+T60s5o5U16eFecZIOu4shqJVEIgYygKKnSF/ISnwjKVRIgXvtLqPZQrRy/uYXZUzTxoRlrMfh+3kzGE/NwbjkJgTWsOGDlJAhxCtXiMeuX+UZgkdkT/FvnkrJXWXSp7t2kbEltGCLAAmEfXi180Df4Knb+iUn2CGvwzsaoR9CpsfSPXvYckcMpiFTNfl1iw0Pddhcz88xNum2l8rHHXGXZPm2qKEuo+6YoNqMItdywl8KYQ== 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=74Q11YaM8U5laqox5L+ru54FRzLIRzqRSQRrQy7800o=; b=PHj7PqCH4iKfBsd48UJBT/96fPPpIWrtCu0BJnjnKGg741fApdGyV2r1GfYFn8fhWT/dya6fv4sV48824pzogdbrF5XJR9EDLVi8mbEh24Jk35ejcktw+XBJjfOGWsPKKp1dMzKqCQaForaXePl6Y6CMB6AZbZJIuKwGWVHvGk/9HsbLKD9zmMBifekbd1ym49wnoFN1UlLTCzLcQx9pZ2vSEMfxO/wrfx4lRQoBLCqln55Tk84sYHf1kSObUbJtPOGr9ZnmeY/Ovf2bq4yzv+KO9Df7Evu9493FFpYSKKx8++brtoxJj/n1CQbn2aIjfYAMnkahppVxk1go2sGggw== 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=74Q11YaM8U5laqox5L+ru54FRzLIRzqRSQRrQy7800o=; b=QW+QvTBxjbMPDZK0seqB+aovNCcI2EcQnGzOLvR9zrtaLRflUePujGxKdF9n5JmIS2xLh+RcLq7UbCkmyOTTcqJzwQcJfOynh26gFSW9jxcgP/Mjg+tK6Be+k+dxSd8zV93E46GSCdGIZMHTW7vNsuCQKwX0XM6HgAcXyPiTAQFkLAd7Uee0f3dZSIht2P+P/+rF+xH0g3IraBqf6sEI+5g5tJ27FNtQEpRwJibPQpUKBXtwqpuBP6X27yZMqBtKI9oqaZKoeMAvtt+WrnYZyChlvtBM/3XSpl4ImLn9Pb4FddJ7VLfZVrwAaxLJ2Rn+C6a2yWDhgdgrddIZ6ESBEQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB4884.eurprd03.prod.outlook.com (2603:10a6:208:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Fri, 11 Feb 2022 08:51:14 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Fri, 11 Feb 2022 08:51:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 09:51:00 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220211085101.1588296-1-andreas.rheinhardt@outlook.com> References: <20220211085101.1588296-1-andreas.rheinhardt@outlook.com> X-TMN: [x83QdI7QragzMblO6NSLuwK2RatJmyUC] X-ClientProxiedBy: AM5PR04CA0003.eurprd04.prod.outlook.com (2603:10a6:206:1::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220211085101.1588296-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5ad7b3c-dcec-45a1-66c7-08d9ed3ba923 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSJybpSSbCo5zX4av1Jyrl1vFOHxAwnZPM2X1saJBBF104IWDbOj1oSrmzZ8XdCyXQypLYuT9bk1i7PtZVX9brI/qkNKaImjUidWtY3rkrpbQDKOslZzmBZD/E4bQmx8/NKebAfLAETzxaNRBv53akD8iYEB915fc7ClqBQ5CCu7n3zxddpD4ssahpMDbUNZdbgNgZdoSgUuPxbG/pM29/Bph1C9czvyFj8mxzmdMRdFpVnmCRcxt7AK1tTVMjepUdTDgRaCT9HxI6JdKRq6hZ9p16lEgetipFRAfN93pSNSa7ZOblEzu5EYgf3NsN0aqLfTm4wdYE3nj0/nzc2lBj+vT8m0wtHHC81IPPBHHc1Fu9I5CHUEwm4IgSXBYrHUywEZ02fFk9QsZCj8Qr5rNRVBh+psqro/hcq8t6utGV2+QGY4q2wLCWuEMcbcqU1hnWwXyzdhXpN8fiIgMJfH3dm67CtYMqPe9vdOTLAcXQfxt7jaIFadurU/wPIxygvKHmrfTWMQ0ImOcWtOHgJQGazAKx6kTZtcXDbyEXM3Nt+yp/64oBwTVjQIx7wEgchDNs/GrEjdd6sBVs1PIkl5lgLqNZQfg8FX+rVxKk1asJOlcJSj+2dmRLYugv64/VuzPmYp+5tmqOKRya3PJdT2i0NibTmZY+0UOKhglzAfWQlWfDKOCRuaDsxgoKM+tPHsK/3gUuf+mKir85L5idyfhz3n8bESB14RIOnlW11Kn0Kw5O8bCgf4oPC6LTYw2oapdE= X-MS-TrafficTypeDiagnostic: AM0PR03MB4884:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UTA26MQ6gyj4J6GLZJVWKJwPrVYooMFR6E0BgbhRzuhC8bpNS931QAjvjT87rb4Bjuc3/pnxzLXMOLZa7KwSluctgD79tsKZtybKp4ncOpce/tOQ4AMxgjDGxg7Z8LpYOKKa7ogJGBpgKNREjZTkI+6Xnzm3saDvxDZcgXncF0ueteXZBsvjT8ct8MdprnkJcE+zZU0PcdOworObQAOGRMr3dvz1RALqsE2u7SiqqjJLPv9m+gFIaRoIf9TD+h9eYc/GxO8MOcQtjaYjl/ySktMhCsPqXXFtEezok6g30p0qoejY/cBClhVpZ+njPkenMvonFqNgQdQqcN8OO9Q+Q/nm8MNyFY1+7sfu9k7B1rhp95xRGgA1lFZ/5PsPmMMbZRgyOVumxvSpJfOVyrKKtHDCE9GReLL1jnP25qY9OxzRMOX0AyCk6iJRjhnLgb+ZHByj07ZogmlETFvnwZd7cLLtZ3CEsW/L0fMyuy9fzXf16ZKF/Ol96J9mDwu9TsENPJEk/0faMMa0ei6Ce3xQm1rYm6vxQy597P4MGCQbNA7NWz/QNRIG4WTdzbzGgryBFXDdUziW8l4w66JYPpfSSw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S8q6FhyJsStMHnCI9S+OwV0mDG9KlDYwmkUdfxLWiakZBJV9OsuuFav2y9F38RnPw8ieg8apnaAvA3w55yybcu7cF4fi3YYbaORieV9dJLaDv7L4fc6aT+nR/5rUrXI4tJdG0YUw6uxzhTOw0X2NoXx99qcdS9bnrwuFMj/+TorY36YBbe0O7Z+G0b1Tqw595pFS0fHfYo6ZcKHPvaFFCddKmC/nhYzIPtY9TcKDl/IQQAmS0qf7mFmZo35Pl3XNMfnKjfMWuq9SUSyfTFZKdGUFrXAeRtBsixKrrqrhMBtigIUwLFOEZc411gMUl1HHSrOHPqqSKuVtoUtamy1/UpojhMrqKOmlyv8mVOFWUyu0jbvqo1IxanLwAe0cwqq475XFbMJAIFVRhRGhMWM9lwIfFJTVFLkYcM3BhdSyaKMQZTGjwGICAWIvuvV0unC6bVla0c2rzKNfUlNEghazleaBO0PSURoANdXVlKX5YEp86WKODa/rwiZiRrdJnj8QLVgagLqiKUNnfJr9EK0AHkTHO8kVnt4Wei2P9Xls0KH/s/q7Q8bKXAvtUGV+oGA69lIJxz7qYXHKnreHXpUpbHCK3qpfX/mW5to8ErhtykK5oSn+HjBg9vQhV/VB/Fy/T+7KuR79jFvOyN6Chmfd7xtpjrNXV+5h90McnJ321ILAQUVHd/5RWWgLQgVHBDK0LXM6DJR0XJPJ83XhScEd8/oqBB2O5mhOhCwO7+crzNrT0/WfYVHkLvhtZNkuZBouV+5Ud5AMYrW1U0oyac4eHMRR3mba842cQJ7zv8KTfQPaNKAkjxbsLc57FjGF2hTFP4G0N1x0iiZ18SNhzF32cllD7iLSuGhJXRIRCB8cQPQFRo474J9Er0ylJHcInXYMy/9EMs4EVGLl2sZ8o+IUj+SledeKkDtbYmMrSk9t/cktW66uUODWFpiLlMJnkCvnBhLFr7Zrw9awX5Zef8iEQQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5ad7b3c-dcec-45a1-66c7-08d9ed3ba923 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 08:51:14.8033 (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: AM0PR03MB4884 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/vp56: Avoid functions with only one caller 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: esmQlEbxgmBn Signed-off-by: Andreas Rheinhardt --- libavcodec/vp5.c | 10 ++++++++-- libavcodec/vp56.c | 12 ------------ libavcodec/vp56.h | 2 -- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index a3c3da7ba6..dc24f5b096 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -282,7 +282,7 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx) VP56Context *s = avctx->priv_data; int ret; - if ((ret = ff_vp56_init(avctx, 1, 0)) < 0) + if ((ret = ff_vp56_init_context(avctx, s, 1, 0)) < 0) return ret; ff_vp5dsp_init(&s->vp56dsp); s->vp56_coord_div = vp5_coord_div; @@ -296,6 +296,12 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx) return 0; } +static av_cold int vp56_free(AVCodecContext *avctx) +{ + VP56Context *const s = avctx->priv_data; + return ff_vp56_free_context(s); +} + const AVCodec ff_vp5_decoder = { .name = "vp5", .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), @@ -303,7 +309,7 @@ const AVCodec ff_vp5_decoder = { .id = AV_CODEC_ID_VP5, .priv_data_size = sizeof(VP56Context), .init = vp5_decode_init, - .close = ff_vp56_free, + .close = vp56_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index d4184f59b4..9819393447 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -773,12 +773,6 @@ next: return 0; } -av_cold int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha) -{ - VP56Context *s = avctx->priv_data; - return ff_vp56_init_context(avctx, s, flip, has_alpha); -} - av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, int flip, int has_alpha) { @@ -830,12 +824,6 @@ av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, return 0; } -av_cold int ff_vp56_free(AVCodecContext *avctx) -{ - VP56Context *s = avctx->priv_data; - return ff_vp56_free_context(s); -} - av_cold int ff_vp56_free_context(VP56Context *s) { int i; diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 0a9eebc7ea..e0dfaa8981 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -216,14 +216,12 @@ struct vp56_context { }; -int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha); /** * Initializes an VP56Context. Expects its caller to clean up * in case of error. */ int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, int flip, int has_alpha); -int ff_vp56_free(AVCodecContext *avctx); int ff_vp56_free_context(VP56Context *s); void ff_vp56_init_dequant(VP56Context *s, int quantizer); int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,