From patchwork Tue Jan 4 09:08:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 33052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp16811966iog; Tue, 4 Jan 2022 01:09:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJyfZQSA/U1+GEwm2i8DisQ5KhdOHOQS4Zdlx6cMMC5GHsUk05Q+Qtj/r+FCZFiXdzeFFa X-Received: by 2002:a05:6402:455:: with SMTP id p21mr47438299edw.384.1641287399589; Tue, 04 Jan 2022 01:09:59 -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 ht21si19690519ejc.442.2022.01.04.01.09.59; Tue, 04 Jan 2022 01:09:59 -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=sDgZgChm; 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 CA32968B27F; Tue, 4 Jan 2022 11:09:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130082.outbound.protection.outlook.com [40.107.13.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8919768B11F for ; Tue, 4 Jan 2022 11:09:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TuoIg04vI/6+6Y+NYfB/5iMTUOMudp7xgciAa8IpOfRgZrsWNrPqv1ki+SNNAS9p14UayAQPgWItlxl5kx3YBc6wxJC4V02UfUYc95TIBQlZNf33e87VeRi3R6Sa1X36P7Eq13bzIC6d5boMwbTfptEhXtSJk+6DJ/6umMhm69Xiw4dtLhJXiN5Wc4YamLLUM7b2NQdzd6UCLcQvu7CxuT4a7LdoU5i8KyzB1gRVAeOY87NNrqm3eZLh4hTYVbRaj68/mQUso45uROf86oMFRuSQH/yggOr/PPtIHuYjl7DLZZl43hsfwbBAnoXM2VdwQMfclhFh5FyMC7IwA4Xaeg== 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=p+9tSbaHYi7e8yCcNkjj4LKeCORANjgo5zRFTu4LSAQ=; b=X+tnf5GLvFwXAPP7F1ckckQxmDTuzfdzSB2n7zg0U1HrZmZqFeqf+7Wc6DHunsNXVhfd3ERvTLQlX8nb56EmVbLYUaaI3lYE9/Xh+C3l5jx46NlMb3MZMvV6MEMfdhHkqBYEYEv4rCNpagTSdkDwuJhS3v2fhdTv1HQ6hZLCQGPDR8LS0jSuM7DVMDolGJsPbgmem40EDRHEUhC60/ZVNwfeBCh9u66NmvVmowkn1MFfLuvW2JS6L2j5UOrHUVPBl1peb3WcfktVDwNvN4m1T/2yNr77bxKfBsSOzq/VpnPNsazGrXKBVPhjFTbpBCOw2Zc5kdz92v93vvpKeHrN+A== 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=p+9tSbaHYi7e8yCcNkjj4LKeCORANjgo5zRFTu4LSAQ=; b=sDgZgChmUF8otsxlpPQ75w+3TuiyJ57o6emrzYUx6G2XgxOv7/P8axtsyVOrmjmIdKhl7vwhPq2gI26rZIhNbaf7RB4my7tcZYvpaOt9WD4mYcJM+As87MBhglaos1Q/vqwy2TyeQCMfswOnRWdTUUgqZYUWYBGiRlxsE/GTgoA= 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 AM6PR04MB5928.eurprd04.prod.outlook.com (2603:10a6:20b:a3::20) 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:17 +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:17 +0000 From: Ming Qian To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jan 2022 17:08:36 +0800 Message-Id: <20220104090836.31660-7-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: 0075dccf-3d2e-4494-1dbe-08d9cf61e275 X-MS-TrafficTypeDiagnostic: AM6PR04MB5928:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zb2I5HyOQepPk0WONnEWOKQLwwqeGItXIy5pjUHQzEHONhVyk2BWOXsNcW4fCMtXMbAoMaAnYKmtBKvkaFwJY5TuilIwcPQPyCeQxAqpFdxHcwLNxRDzQgockJzV3iwze7B8Z+uLuUqGbrDAABFKnS3gKRY7JPtnV1hHiiTVFhtd7VnxihIcA0cWioR3PCsVvIIz2/vEmA0grq5m0rI7OimP/ILo/N1kOxRX9j9b+GEgtAX+b09BGj/lvc8d5jmToD1wEYzGDpz0vF1nZdtW6VQHsmQUO5mL4Bnj2H1jILlqqssKCS2cQyw5vyntSezQaGnbx3yu52wTiczwZdVrQ+5zC2DEiZJR03dw8at9zN2mItBCYE1TRa0r/XG/gqcxq0inG4yP6G+yI9eDVHT5p45bwIhs+upj3TUJcXtPL83pbsldxW9B/qbd1fkPUzu399AROZwiP+O7VJ32wzmAxonJ/z8H5jTRZYPsz4Xmxyu1xFXunDR7Gn+ObsAWMXG96aOt920YGdUSbsVzRcPwWQAv0wNfb9o+8eVI0fUOcgKE5eqRqrnHaQ06/mxrdeY5Ps1B+5WV+PKnpIS9eNFACrO+a83vaCw79JqZjXa8Ke36y0mUnre/JB5JawlouzyQb9NfM8n6DcTiGT+zOGDCeZslHCaLaAANrY2ekL9wCWAEZbtOF8DOvLduRjjyzVby/4W8jB5bHWLTEAdO6djcjcCelBSlfRGi60ObK/9ZUXw= 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)(38350700002)(6506007)(36756003)(6916009)(6512007)(2906002)(38100700002)(6666004)(2616005)(6486002)(8936002)(316002)(66476007)(26005)(5660300002)(1076003)(66556008)(66946007)(83380400001)(508600001)(44832011)(8676002)(52116002)(186003)(86362001)(70780200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Xp5uHHFMzEkQTdWijCY/rW2Ou2NjrI/f4LvOw1TZUUzzHqoWefCrC5O7O1jeH5Cgcx7A/2rDsL72FZFbTbCMNGMZZBOpHuSzT8+heotk8i/+znFxY2MQbwso1KD3HD+36zvqmkyGBTAB7JXlrWzgMXh10/tr0iFNz4ECiF34y0yNTs8ShhtZ2RBuCQvz3s4gymHfmq07EGH/zHR9xRtydhzcby0dLgmcNNGUYEeXZy0rHv3czw+D/I5UdnbuYiCSucluNXoYUpVAea2HqRJB7NUuQs05R5jHuAsZNRJBGOthkhtAWZCdHtD5yEZFyn33ipcPqCTjLb/Z8HdVxjnTWOq0JLwZEGmua9NoouQgiqHLGeMLDB4lDh7zO8FO91Jl8r27s9jz06kRppSQJmA5fprsR7njWzvhbCH1sQkxUJIgVaTOX9lFYwp5jLHuu19TqyKdZnJUYlOuvvmSiqDu+jKF4DSbYV9H8EpE86dS3LMKB1iiNOlppVPUOm5Jw3o+b6yVHQIka+UYmGLpUQq9zFLr6CiXr+sUKy5Q6+BYj+gQdhKlz79CuZYz7+UtDb4dhuck/y8P1nZrVP9Hf0FgBgtRyPLJhbzREMIomZfWlCwVB5Gr0rUsYttJVchI06VbwNx7BIFxZA25Fjaf1M93G+5OTsH0pwx76mkPgUsM+B/Jqzkwxes0sRq9c9PuX0unnBEFtqrH9IWpzz6Lqip7Z2WpYLAu7YPDsazAb+t8wrYZ8O9wkZ9p8q4j6s43ILWG3y1yuohEtrmL57p+AFSmkrNWS3sJNgTIOkoqHD1SM0ocqq3TNd5w5N4lEqLPMNXJnaiAXILQr/nec6dHgdsVmv16DDiUvRsdj5rHcIqezPQDjLzbzVGexC+xnD4Ra6mDvwz7UoMwrmF9iSwUIAAqG00AgqqpPr4+ZNms86f81at0yrDMlNkTLaEoCvOPByMH6/WVZmmWzA59fBRcE6vOo3eBaRcAF0ApmH9tAofreV/ubS+oLgEVCkg+2Fi6amB/ZEZFRP7ETS34LIaqiOzsNrHBwpwLz72XcgdSWSrLpU0xeMB96cuB55fN2/pz0nW1cvsGMUZvuNAtsKzASsTEaEdI4FHTKcpO+/jbxonOrNIp7OWBaS7c0Rk8M+hbKVJ3f+UEEr27VUYboKq7+ntbCsU41k1caoIepIVpMtHxZvkscOs+LGJt0cEWE5US2CJi02fNHhQ0cjb871vULdXGcyDIp7z24WQY/uQq2NXiSmTsfVU2WOHzPYswhm0k1iFEFIGcWiTmU1KKesfoKAEt5dVdgoQ5fLSsmcnzMF3jrJfHYeZ2Ge7Snwbj1gizVlmzmy5h1oHDFQ6D66nMCR9RS5yAaWCMEvGiHVx67JZsSabNCl5I2xPmtVQIrA/2V3q1X1SwnhYOAXR4ebyVPw5yUX+k360RBSxqhTlf6Cn15zz+3iX7lwkXYME5hGwhS81Od1O0Z4i128+3KDMRIinuo6lKgav9qkWOw+VcOgOwWrWl8jqQCeDOng+a+Pf0AkXlkozzOYPYW6ywIYVR9a3v1Cmn1aa6lOfmVkJigEDocHNwaeIaatcXaa1FmahitfUXs20hdEfvfEUGyX+ZCoRr6bs3Xdz/a7a2yanDFHuEuxs= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0075dccf-3d2e-4494-1dbe-08d9cf61e275 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:16.9926 (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: mYl9KvWN6wMaMpcsrjnDLicRM5H0Xsy/VVbOpoj0tyfZ6QQJpD1yKXmYURVnXZNAxeV0EuUsBGC7YhvrtMvwFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5928 Subject: [FFmpeg-devel] [PATCH v5 7/7] avcodec/v4l2_m2m_dec: setup capture queue before enqueue the first frame 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: SC5qMMILqXZq there are two proper ways to setup capture queue. 1. client wait the source change event, then setup the capture queue and streamon 2. client setup the capture queue in advance, but to avoid time issues, client should start the capture queue before it enqueue the sequence header to decoder driver through output queue. and the sequence header is always in the first frame, so client should start capture before enqueue the first frame. ffmpeg use the method 2 to setup capture queue, but currently ffmpeg enqueue the first frame before starting the capture queue. so in driver side, there are time issues. when driver has parsed the resolution from sequence header, but the client may not finished setup the capture. so driver can't decide whether to notify a source change event to client. and the following flow may be chaotic. And it's OK that client setup capture queue first, then enqueue the first frame. Signed-off-by: Ming Qian --- libavcodec/v4l2_m2m_dec.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index b0c3d30ac8ae..e67758531ace 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -153,6 +153,14 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) if (s->draining) goto dequeue; + ret = v4l2_try_start(avctx); + if (ret) { + /* can't recover */ + if (ret != AVERROR(ENOMEM)) + ret = 0; + goto fail; + } + ret = ff_v4l2_context_enqueue_packet(output, &s->buf_pkt); if (ret < 0 && ret != AVERROR(EAGAIN)) goto fail; @@ -161,16 +169,6 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) if (ret != AVERROR(EAGAIN)) av_packet_unref(&s->buf_pkt); - if (!s->draining) { - ret = v4l2_try_start(avctx); - if (ret) { - /* cant recover */ - if (ret != AVERROR(ENOMEM)) - ret = 0; - goto fail; - } - } - dequeue: return ff_v4l2_context_dequeue_frame(capture, frame, -1); fail: