From patchwork Tue Jan 4 09:08:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 33049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp16811711iog; Tue, 4 Jan 2022 01:09:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoJ6kc//s9laMuKywNqzuhRocSxCLXvShNoE8I2kM4NmcM2JhKKAzOizgiQDi0iiH3yIgJ X-Received: by 2002:a17:906:ce2c:: with SMTP id sd12mr32729261ejb.721.1641287369764; Tue, 04 Jan 2022 01:09:29 -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 m16si18024662edq.27.2022.01.04.01.09.29; Tue, 04 Jan 2022 01:09:29 -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=@nxp.com header.s=selector2 header.b=CcWW9wSQ; 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=NONE dis=NONE) header.from=nxp.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E65DB68B262; Tue, 4 Jan 2022 11:09:19 +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-vi1eur05on2043.outbound.protection.outlook.com [40.107.21.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA01068B257 for ; Tue, 4 Jan 2022 11:09:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C4XHir6sVsQPCOZnSn8ZLgESRZXFJkr8/biC/BkAhajbqfb/HaGNjEBpkISzJdPtGnrd4tnwIqj5ANw2dBFWypz15mdev6PaPcHF2rxxKX7HQcT3E6ZHb+Wh80rEqPbbFKK6kte+YCMAZbBOkaAuZwxgi65xBv+cxQqw46HxA4+oBcRoOndOgQmk7OizGxS0uGrgsaYGlgkQ50BVnphy401ROOAXJ0IShlYixn9nvVsirLyvmG9qGEU3DbJC0gaKntdVcRMO7wrUB8/Ek5R3vyRepqGh/8usrhyuqjUc2D/sgVkB4pLImtuOafoA0eNHW9juvH8Ym5Fp5bE8mBZo4g== 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=jYitRR3Qtt3FUnZW5VoxA1gVvi2GNXe9vxy86mktsj4=; b=TC1lqxaRbP2FtP3sVO3gQELLzEIOelpb3R0aPcuROP3HlsPSP3GOVXFlZ3aBAaeZST4ac9e2dTYl7PY7d1I6yXvSt4Ue6TnMuM8sTHdLIobHxTSu76MmV6KcGozVQ1ERpOH2MFQxWGG6YsnPYd7OeQdcmyzGsho0V/4dYNBLtdtYRdEOdroVqHNAsa3iwNO7uyKwtGNDwVOegXVJl8g3QcBGg8NjgpOcjLUDcf5FjU9MCRBmqsTS318Hoi7ywy98oviA1S3YvsXDC41XQR4ldqbCutm4NBw6DDYGbeGJKwSggIf3VB/274zks6cuNcRe8eMLIUOvkahWaSvc0xZnCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jYitRR3Qtt3FUnZW5VoxA1gVvi2GNXe9vxy86mktsj4=; b=CcWW9wSQomwT4y2/mauviiVKXdUn6AL6sewLL9UQb16AMTqztONbyDhmVzYcdeS3x6GmA9tiGWL7K4mvJb+0Qz6TlgmtxZgvLx1B6b4VNTsWvcUq1qD58RtMOEeqHjkkNMFg5xlC+sa+4PKkOqTNnaLXYrs6G9boAbj530g1NeI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) by AM5PR0401MB2435.eurprd04.prod.outlook.com (2603:10a6:203:36::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Tue, 4 Jan 2022 09:09:10 +0000 Received: from AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::b9f1:7371:3484:95b2]) by AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::b9f1:7371:3484:95b2%4]) with mapi id 15.20.4844.016; Tue, 4 Jan 2022 09:09:10 +0000 From: Ming Qian To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jan 2022 17:08:31 +0800 Message-Id: <20220104090836.31660-2-ming.qian@nxp.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220104090836.31660-1-ming.qian@nxp.com> References: <20220104090836.31660-1-ming.qian@nxp.com> X-ClientProxiedBy: SI2PR01CA0001.apcprd01.prod.exchangelabs.com (2603:1096:4:191::13) To AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57561aca-fd06-4b6a-d22e-08d9cf61de6c X-MS-TrafficTypeDiagnostic: AM5PR0401MB2435:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:747; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h4pXenZw5SaMsrPl1tFcPawpO5lI7VBIkpfimt2z0L+6W0UVrEAt8WHdmGXBMcZq7fHzew/O8AwiYOxc7vWEvDBJwtTVyQpkK4UVefhAnZGwM6t23l1L8qERB4y3+3Njz1RSQTtCB76c/FydjXhc3RSBp14C/cldThtQRcBYjVn+27Eu1pCbSNBxT/hsKU0+BJle11XPbmJ2otldK0L2/SiGSF0h3m8M7+OnQ+zq2c6pI3INWTwJAxzS5S4z/3qQ4JXYMC7/cVNKn6BuiyAUiV3KuP0x7OsAnzkMn0UGmEVioocQcKr7DoOhSbFKBq5zpoQJh4ZC8kmV5rVIvC6tqYi086+5Qk4BAg8xVehDFTB1C+d0mFplYjJCq8gf5BSpct/yTIKpYB80euOwBchI7wr/wWXNjz0N3UZ5WgSc+gAawuuuTrgnpj58ximaQAmgGy1ztSnVDUMZOExFUfeVgK8uALxEJKxgGWma6t8cGddRvtqpqPQGi2OsIrBCytg4W8RlWA66RWe5kwfpikrYW8QnYoSl+cJsrViePgHY4+oSZ5yBW2NqNhCHujqQAE50bkLWuu4eKZlaF/KCnvhJOcRKCvVe57sutmWGEjTaMTXQsuE+N1h60VVN+f52iP+8Le6bC4hVZkS2P6N4VaDiBeOMmLbMBpHTMEaGMWavg7v0vAGVNxZkSCJ7t2M+e1BkuX7TH8IV5aweZzafMBXliX7rsuB1JlSuWznHPnOD55F65YJeGps9KPJuK5x8aV3e X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB6341.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(26005)(36756003)(5660300002)(6506007)(83380400001)(38350700002)(38100700002)(52116002)(186003)(6916009)(316002)(66556008)(508600001)(66476007)(66946007)(86362001)(1076003)(6666004)(8936002)(8676002)(6486002)(44832011)(6512007)(2906002)(2616005)(70780200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sqKXi/gP33iJHR+1q3CyPXOiaQmeB58lK7EHPj0KRlOSTLxwWU6F2PsHQn9uKyHNLBi3k1Gp54dSdOCOqtWu6uOOgQul4X9lCXzDPA4cmkG4UNO7nVHm21eGLQ8SSnwkHgmTjmHCcQBg1/PWojlDNUpyHcEohRVZK1nvE5pTe0Cbu6SNNOo2YPo4PpmQcwxPk66MVYRcLj3eeu1zVIDwCrRI1E/ckcPl4LnDTPpDWgfH6dmjrc3+RnS0YrBidvc2hQwuY9fA5uqu7jxNmdjqQNX4W37+pAdkzGZZCDwRCP6m7E+ZLh77HapzbQNd52PsAzznnS85NCe9IE5V9aNlYIOQNo0LhcxQmGBwpPR/rRl/vYEou0+i3SoktgVb1NozM7cMZc7+vWETNQcRFXtL3u2QpmBGtbEz8ArfO1RF6mUXO3/HSXKdQocPEB7GPpZaGwxgt8G55mmhww9XGmhSDswkyOS5gBr007pHeB2/7eKKPDl2fLTkuMnSnQDlX5xVWFzbSjauYp1VMjETjH1eM80GqN+bLOq18oSfKMIw7/jJOdiVldoi3VijwwxgMnI10CiWdqycHKqqJbVJsmBU/QwYIXsCiRrIysbEm51dBdBp/qFauYu5Tu15oopBuxUJLBWnijAClh7KmBhFomKAxQNuN65GyopQXqCmNj4hNnqhDGkiN6tDm54llxfTpnmvNFTgFmrwHRzKQRKQE+kEkJE8z+2+fiO72gzVSi+k340EM9l4Xl2/y6SC2s2PQXUT093504hgRxoL2kaSonajocqrapMKSSq3oJCoknNn8rl4oYZyCPtQl/wuR2AFrlPAmmo2G/yCV2ZbAl5OsUyLXvyNqF4sca4tvytfwLQw2Jl2b9pk+WmhSyT6Cp3AHRefrLx/BDrkWKylHXh39kvmiqWyUMUMtyJ/Hi0ipbzF4eXUgKJYrJaBl26ezv+b5x0GhZPS3aFJOJ3rVm7EHI6johfgauOkP253xWbDQuxUUqLjz/+9szMsmRKbeTGxhgjJ5an+qqfqOybjv96pfLDyy4oLoy6P7JwY18ot1ddOOTV8dTUr+AEjBllqJnnB4MqHtnztYsSvaWFNr2t0JqN1qOteKG4FXgXCg3zdqJY9qL6B9rXiy0DOchr2ajkONdVhRJ3DNTs5CkssVMa22YuL8V0kuqz/oAR6oWelxrX4I9Gho9AfpBwR530onYnN4ezdRKutwGzgybw4HcGFdEqc0dbqTlYQ6fO4TSfVrKNDhgG8BgXJh8bygbm3/82HriYRrS2E6VIiy8AkRjwnNKbPJS8Vbum8rCYdjT+h9USvRNRlJZ0GvfvfgY+lO8YMUym90OjA3IQzfeMkDDQkvvXqrkrVEfYF7BZhM49wAz+ZPN/x5VyZ0EPLShLsmf3og31+LtsbkPlYqRyL0gVqWzIA3z0xatwp2w7A8BagWDBJ8Z1bS7kwufGbK136Y4txTeF8Xjvy/3q4e8RPochyiEzKi0n2QfVYHmFmhBdLsZLH5WcfoNAXBvdDEq0TS1D+hsmeBPJp36yCret9fxIPEade0w58UIWtHB11IbpYjtZzhGcNNmdOn1jQPBjqf/4L9b5qXp8t91vIYAm9U4DLZDUp9DCmrCHGpDAk7IEND3KStbQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57561aca-fd06-4b6a-d22e-08d9cf61de6c X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 09:09:10.2586 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UJteQo3gxbs1AuO9/bW5mf/dgDK47dUPjoobJKtaxGkJA5cfn/LL0d6LqsOjl9DyvOA7n8Z/weG130WcbYVNKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0401MB2435 Subject: [FFmpeg-devel] [PATCH v5 2/7] avcodec/v4l2_m2m: remove ff_v4l2_m2m_codec_full_reinit 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Jo+CAQhHigJs ff_v4l2_m2m_codec_full_reinit is not used any more, so remove it. Signed-off-by: Ming Qian --- libavcodec/v4l2_m2m.c | 76 ------------------------------------------- libavcodec/v4l2_m2m.h | 10 ------ 2 files changed, 86 deletions(-) diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index cdfd579810f2..a0ee5a201360 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -245,82 +245,6 @@ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *s) return 0; } -int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s) -{ - void *log_ctx = s->avctx; - int ret; - - av_log(log_ctx, AV_LOG_DEBUG, "%s full reinit\n", s->devname); - - /* wait for pending buffer references */ - if (atomic_load(&s->refcount)) - while(sem_wait(&s->refsync) == -1 && errno == EINTR); - - ret = ff_v4l2_context_set_status(&s->output, VIDIOC_STREAMOFF); - if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "output VIDIOC_STREAMOFF\n"); - goto error; - } - - ret = ff_v4l2_context_set_status(&s->capture, VIDIOC_STREAMOFF); - if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n"); - goto error; - } - - /* release and unmmap the buffers */ - ff_v4l2_context_release(&s->output); - ff_v4l2_context_release(&s->capture); - - /* start again now that we know the stream dimensions */ - s->draining = 0; - s->reinit = 0; - - ret = ff_v4l2_context_get_format(&s->output, 0); - if (ret) { - av_log(log_ctx, AV_LOG_DEBUG, "v4l2 output format not supported\n"); - goto error; - } - - ret = ff_v4l2_context_get_format(&s->capture, 0); - if (ret) { - av_log(log_ctx, AV_LOG_DEBUG, "v4l2 capture format not supported\n"); - goto error; - } - - ret = ff_v4l2_context_set_format(&s->output); - if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "can't set v4l2 output format\n"); - goto error; - } - - ret = ff_v4l2_context_set_format(&s->capture); - if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "can't to set v4l2 capture format\n"); - goto error; - } - - ret = ff_v4l2_context_init(&s->output); - if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "no v4l2 output context's buffers\n"); - goto error; - } - - /* decoder's buffers need to be updated at a later stage */ - if (s->avctx && !av_codec_is_decoder(s->avctx->codec)) { - ret = ff_v4l2_context_init(&s->capture); - if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "no v4l2 capture context's buffers\n"); - goto error; - } - } - - return 0; - -error: - return ret; -} - static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context) { V4L2m2mContext *s = (V4L2m2mContext*)context; diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h index b67b21633109..16e0a6d6b90f 100644 --- a/libavcodec/v4l2_m2m.h +++ b/libavcodec/v4l2_m2m.h @@ -119,14 +119,4 @@ int ff_v4l2_m2m_codec_end(V4L2m2mPriv *priv); */ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *ctx); -/** - * Reinitializes the V4L2m2mContext when the driver cannot continue processing - * with the any of the current V4L2Contexts (ie, changes in output and capture). - * - * @param[in] ctx The V4L2m2mContext instantiated by the encoder/decoder. - * - * @returns 0 in case of success, negative number otherwise - */ -int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *ctx); - #endif /* AVCODEC_V4L2_M2M_H */