From patchwork Thu Aug 19 08:55:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 29613 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp107815iov; Thu, 19 Aug 2021 01:56:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwn4o1hKuX4vL3U28YwGmVH1YrQ5ls8V1k85QUZ4CvoHnI06wIw45gpu9MQxzVP72p4PwDG X-Received: by 2002:a17:906:e8d:: with SMTP id p13mr14769335ejf.85.1629363384692; Thu, 19 Aug 2021 01:56:24 -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 e10si3293584edz.468.2021.08.19.01.56.00; Thu, 19 Aug 2021 01:56:24 -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=@nxp.com header.s=selector2 header.b=HYFKSfcb; 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 3148068A176; Thu, 19 Aug 2021 11:55:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2049.outbound.protection.outlook.com [40.107.22.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 900136880AF for ; Thu, 19 Aug 2021 11:55:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvd/hDTretNnqZm7x9g6KF+JUYV2INF5YghPw/BYUM3n0lrziaxLUjlkmv+wX/KJQBjK0N+zv4mwn+wfw+rjY8ktzyWZou69b0Z2rdDXbLVG/brbAX1XXGr7qI9SFAxp97mDQqrb7rsMQbFwu8jcsVFINMFoQuu3XH/zBqugNoMB45tDWuQQQj03zRY8jVv9z7f79LxmLSS6l5MXWy40Q1IDFqfI7/36zZhoe0lGUztIZyE6fGUvHmLjPuLp76ZnQwQsrakuQLoFrOyz5G5mqDiDAQ+pVOh4vnTIAHdRjeIST8PkP4lCzMHpPzRRPu+PG++euP9FHilNXis8LtTOCw== 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-SenderADCheck; bh=+uFDMLMQA3ZNF4SbU2xK+FMj1DOBDd6Jg58Room9W8s=; b=cwI/7+SiAQe5qgqjd+pjOxHz8VzDdEZvL0cWuXTawogrMFmJnr6XtNVlIkf3/jN8hYzL59cG+tKUhbQz4AiBOcRHAbIUii2o+nsb0UB5Nc2HDGiQRo6VY4T4F0S/z3FpGxPS7PMdTeGnWk9VFxOXWsrRaGLRcKT7wL+ek6bx6HowGlHViN/LZAveZPc8U9JXmsl9g5FPHG15+tnTqbfpgD4UKiHPcup1b6RKM5ErTsOoTkQ4t97mH0zK58AaXGDLPEQM+4gxOevB8d2UQeiQOMgEwUCAqqv0HHqVIs+QyzINT/N08tGNTwqAGr7lAhtnK0nhpuXcBIOKbeUcKYLpaQ== 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=+uFDMLMQA3ZNF4SbU2xK+FMj1DOBDd6Jg58Room9W8s=; b=HYFKSfcbjdIhaCPdSctNZsr1u0Ut6y3J7XHgzm8IitrMWO5YmR1KMm5+FNY9tp6p9kJNQvPhxhPlTokIzbRkabuQbd1W1MRSGwx+NB/vPtPmg0yV4UVKHrQUeKZUkJXJwHZqfIQkpUC84KBERIBCD0xLnqK2+Fbf+lzRm1MuB9Y= Authentication-Results: ffmpeg.org; dkim=none (message not signed) header.d=none;ffmpeg.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) by AS8PR04MB8280.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Thu, 19 Aug 2021 08:55:49 +0000 Received: from AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::9cb5:bd97:8500:2384]) by AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::9cb5:bd97:8500:2384%6]) with mapi id 15.20.4415.024; Thu, 19 Aug 2021 08:55:49 +0000 From: Ming Qian To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Aug 2021 16:55:31 +0800 Message-Id: <20210819085533.1174-1-ming.qian@nxp.com> X-Mailer: git-send-email 2.32.0 X-ClientProxiedBy: SG2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:3:17::18) To AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv11149.swis.cn-sha01.nxp.com (119.31.174.70) by SG2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:3:17::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Thu, 19 Aug 2021 08:55:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 214b4868-0ce5-4c7a-d45d-08d962ef23cd X-MS-TrafficTypeDiagnostic: AS8PR04MB8280: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1850; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y1s0trRxAUhwQ2Avtq1NdioN1Qsm/xd4EHB7ROhRluXOW/Uk5PXMV+2CrM1PSLICJOeZyv1yb3gcBgbvjzrvcR57M5xZNffUOrtwMPws1ZtZwjnPrh+ZZI9UQebnznDQ6PCEm2I8KNGb7Qf//ts8AebHE1xp36DLH43Iy0Zk9CVKJu5ysx+vGp79Osk82ybhkVZ6MrT61fmXjUb/ZKWYG/jXM8YYJ4hdZp1x91spEsFUKKEXFDvyo7UgLlt+3fWcdN9SQ6SravkUQf5Od2qntsE017M3LTGrIUsl6WmdDjG4JRgg/3UxVFGbaIhBE0hqKQttSDsFS6DYFWdyN2iGs+yUunMxIh/1wUqWoRqMtr39aNkH2oEDihj+XAOOq7aPXCoIPR29oTEGzGwBkaa3JS3szf9le9qpx/XZDo5r1AzqKAadMEGpUnRg1tsKv5pFJvbsYNdW0IMbx1xZYTG5arsmk+xbCsaVQaEIIfV8MlwfPv1HugQO464xgSELovctdIun6Cztf/Wa0jZw/T3QC26tpcUFrNchIS1CpTmajlMXuL4MzS9vk0qXULqjLSL3vitmAtNDuTR4ME3Eor2e9momYLtqiZq4/WjCOamtOsGMzFf9zSR6DYYccIYxLdmry2zXBpQDPR4zkoymb4rt7fD4Hw0KkONjC0vRTBtwsX0BTQ+MtDODb1AoP2QI+tJnUw/S24abB9qS7AKP/gp7IQ== 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)(346002)(376002)(39860400002)(366004)(136003)(396003)(2906002)(8936002)(52116002)(83380400001)(6666004)(44832011)(66556008)(66476007)(478600001)(66946007)(2616005)(6916009)(956004)(6486002)(1076003)(7696005)(38350700002)(38100700002)(186003)(86362001)(26005)(316002)(8676002)(36756003)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lf6/ltZVvJ9Vixv38CcVSCgLncOmzEaO7su52pnBWY1AJ7HyVNDbEtoza+zPCzwhXBqdbPk8FQyAYWrFTiSVKkcf5ljFPG8bTC32gxe6Hsnt8nei+Z66QTPb9nEh2SK1TE5q3h5zspbwPKUSdshKdx32qq+WcAiT3BSIIzt0HzLeTAIpgPmYTAeaX9kfWl7szlOQ9F6W2EQqSo6YkJRunEz/hFQpwLK6BuPHILZ79EcEw0auVwIBZon/LQZbi+tvbAt4yUEAyM8TOPfCZfSrNvYBO3eoeTzNWxQotYV3wwWCGEqNbUVUA2MkC3AY8FI5+r2dwXd2Si1+zqhQ4quN6u5PPtHIMnebQQ8yRIS66MOP3Hsf0mZObgBTyFDfOTnnJaWlUmymB8i0/py1mkBwvuxnLg3NR/MWu/wp40qymNhHHTczUfFHvhUXWSNczcwxEvzzDheEHI4oOpCSc+GKDNnb+NisYGyHDRUYlWCeRrxcT0VmvxG0FbNWNI7zcKgU1aUTDVqwrY8WAU7/dtEr0tJrIcsr2+VCq2fBQ4XkXF9Hopsd+i1GL09ntQdLHLGIxuvlvD6TIo8tdhHhUW/imfRtGj7bAjQdqyJfnAb+ZcvPVtEi4EIpw0of+mvNRrqqeQhWOtCWTxSjeItCdimVYI37ZB6m+DGQha/AYDZt0BPHj03fWI0v0CBd/A5rOSLs1YFX99ZoVd7+LhwU0HUEEUUkWi/32oBAWylUzmVGyywxJuMxlqt6HjmtZlIoe3Ddim9cEy4t0ihNhbHN9Ci/mWcM/vj6RSLXw1Z56cWtWENS5lKDlvi1NX6DAPn8DtPTos0OFw0AAmv2Bg4kztoYtGXqTj3ndZRfIWsfHEPrJ/864ECWA+fnCZeZgu5yJrN6ggSq82KLy0gNRm2L5mWCMyAc3EH612Tuei2+14GV6g2Ss7jdRzKt2qLoMbSl03CZB0rJf05liKF/DaE97Y9gtJgswm681XcsrbYAdqpWTao/h6NUol+PaLsHKOci9p2p3pZvzh3Ee35tbxieiJcbIakpF0YoZ7c2ovF0yTXjnNYsqy51I3WWrjUrqyB57+h/Ay8o8srZmUZMT8yseqPLQpIqTDe4QVjwL1CbkNt+iW+vPHYgj9wqbotTOUWYLOsT99O5kHRYz7gZoSw3k6FbKc/VhsPIhnSmhnkqhKTyJ8z3OBv0Xi3KXkkR6z78QO744pONYaBqX9TnTDX5rryfsq8uSru6ypykX+XouAwWoUYju62G0LVmXtMj3K5cdnLOytMhQMQ7BbJpulXYQHAGWVzvG1AnZ6D415+YvrsRUfFApKospfApsr/zXH+PCqd+ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 214b4868-0ce5-4c7a-d45d-08d962ef23cd X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2021 08:55:48.9532 (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: T31n8a2UXoISztcOy/63KXWP5YF7dqonb27ufN63S0cauhVw0UYoU00ybzEjUK8DB2Yh1GQVM9Hdnw9fKWTl7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8280 Subject: [FFmpeg-devel] [PATCH v4 1/3] avcodec/v4l2_context: don't reinit output queue when dynamic resolution change 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: 8UQ+eUTnIw2b in the v4l2 stateful video document, we can see the following description: During the resolution change sequence, the OUTPUT queue must remain streaming. Calling VIDIOC_STREAMOFF() on the OUTPUT queue would abort the sequence and initiate a seek. In principle, the OUTPUT queue operates separately from the CAPTURE queue and this remains true for the duration of the entire resolution change sequence as well. so don't reinit the output queue when handling the resolution change event Signed-off-by: Ming Qian --- libavcodec/v4l2_context.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index ff1ea8e57b08..dda5157698c3 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -162,9 +162,8 @@ static int v4l2_handle_event(V4L2Context *ctx) { V4L2m2mContext *s = ctx_to_m2mctx(ctx); struct v4l2_format cap_fmt = s->capture.format; - struct v4l2_format out_fmt = s->output.format; struct v4l2_event evt = { 0 }; - int full_reinit, reinit, ret; + int reinit, ret; ret = ioctl(s->fd, VIDIOC_DQEVENT, &evt); if (ret < 0) { @@ -180,25 +179,12 @@ static int v4l2_handle_event(V4L2Context *ctx) if (evt.type != V4L2_EVENT_SOURCE_CHANGE) return 0; - ret = ioctl(s->fd, VIDIOC_G_FMT, &out_fmt); - if (ret) { - av_log(logger(ctx), AV_LOG_ERROR, "%s VIDIOC_G_FMT\n", s->output.name); - return 0; - } - ret = ioctl(s->fd, VIDIOC_G_FMT, &cap_fmt); if (ret) { av_log(logger(ctx), AV_LOG_ERROR, "%s VIDIOC_G_FMT\n", s->capture.name); return 0; } - full_reinit = v4l2_resolution_changed(&s->output, &out_fmt); - if (full_reinit) { - s->output.height = v4l2_get_height(&out_fmt); - s->output.width = v4l2_get_width(&out_fmt); - s->output.sample_aspect_ratio = v4l2_get_sar(&s->output); - } - reinit = v4l2_resolution_changed(&s->capture, &cap_fmt); if (reinit) { s->capture.height = v4l2_get_height(&cap_fmt); @@ -206,18 +192,9 @@ static int v4l2_handle_event(V4L2Context *ctx) s->capture.sample_aspect_ratio = v4l2_get_sar(&s->capture); } - if (full_reinit || reinit) + if (reinit) s->reinit = 1; - if (full_reinit) { - ret = ff_v4l2_m2m_codec_full_reinit(s); - if (ret) { - av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_full_reinit\n"); - return AVERROR(EINVAL); - } - goto reinit_run; - } - if (reinit) { if (s->avctx) ret = ff_set_dimensions(s->avctx, s->capture.width, s->capture.height); From patchwork Thu Aug 19 08:55:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 29612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp107809iov; Thu, 19 Aug 2021 01:56:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJO2Rzgk6Li+QJ1mDc/BnKQvdOHm0T1O/EoJiQqP7RsOfNKvz6zld7UyKmI0qPODzrrLGL X-Received: by 2002:a05:6402:5247:: with SMTP id t7mr15591173edd.25.1629363383777; Thu, 19 Aug 2021 01:56:23 -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 y15si2625771edu.593.2021.08.19.01.56.11; Thu, 19 Aug 2021 01:56:23 -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=@nxp.com header.s=selector2 header.b=N4CXj7dN; 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 5F7F868A255; Thu, 19 Aug 2021 11:55:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2076.outbound.protection.outlook.com [40.107.22.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E10068A13F for ; Thu, 19 Aug 2021 11:55:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=juTMbygmbZXMS5csWkEqrFjxTwiRP6q0OuhsyWp/MAXzgkkkgqdeZ2Ps9lgzeL6HtIl1wJbBdmqz3aEbxW0IT9/tnl/+ZR50WwHNoRnos5hGBSDfKM0cl1hnbeZ74m19HbagZpN6mBWlt7te+KvsJDz1wEzXLKDOteBX6DNTs+MMEZ0tAFVu+XrEJC4wut+RDTR8Ag6vUMx4xLiOGeO/dpitmj6dDV6JR1/pYd8+BotPbWlec55MvFibIhJjzXdE73QB9x89s7VaS1aovraepBpf0DBPKVn7AQnBYt1Ih3ut6uWhFl9PBMzpt6+eYmcy2sQHWXhLpzH8DTapDGB1gQ== 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-SenderADCheck; bh=M49mVBGtxIZ7gJd7DDfqN73NnO63DnQJualIKKpOwDg=; b=bYe+D2piaQEyJkCdE9OS4OTWJw0PzRJt17G5hmxFrrgwc+YhXWVaYkFNdt4HSyR/5kF/h/13S13LTJrASN07TdqMYgUQaGkM4nJxVSgEhqaVMkO8bqRsDiAqbs+cQegB46r7aVYmItIpRlXT7KCrke4lBPd83WawXJsUN6nATT8J4t+8KkiI3WtoK+YAqzupqL6pQmPitcv80OrztH0QyR6n8UD0v8H0R9ATKrgA2DlPCaeT6+V3gunUv5QGS2Ds42O7XzUOEHG0TK/PhQfjSMud8KAq6vIVxFCqlbY80cGv6XXuOwYejuj0HxURT9bDn1Bcs12pCoYWubGOUj/ZlA== 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=M49mVBGtxIZ7gJd7DDfqN73NnO63DnQJualIKKpOwDg=; b=N4CXj7dN+Va97N/u8bm1Z2uQ4QTmo4wUd5BJTk/F+JjKEnjGgKq1Y603PmA03tBxSYGMpS17nwG+jzHQhAxME7KzUrt2aU4eJGZcTeWXswG8SFQE2WcOg3U+mw6jeVqW8vg3DyJRt8s7cRM6+L33Txuv9jDPLfFjDqjTO59lysM= Authentication-Results: ffmpeg.org; dkim=none (message not signed) header.d=none;ffmpeg.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) by AM6PR04MB4791.eurprd04.prod.outlook.com (2603:10a6:20b:3::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.21; Thu, 19 Aug 2021 08:55:50 +0000 Received: from AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::9cb5:bd97:8500:2384]) by AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::9cb5:bd97:8500:2384%6]) with mapi id 15.20.4415.024; Thu, 19 Aug 2021 08:55:50 +0000 From: Ming Qian To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Aug 2021 16:55:32 +0800 Message-Id: <20210819085533.1174-2-ming.qian@nxp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210819085533.1174-1-ming.qian@nxp.com> References: <20210819085533.1174-1-ming.qian@nxp.com> X-ClientProxiedBy: SG2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:3:17::18) To AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv11149.swis.cn-sha01.nxp.com (119.31.174.70) by SG2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:3:17::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Thu, 19 Aug 2021 08:55:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e0ff06a-f713-4892-b9c3-08d962ef2499 X-MS-TrafficTypeDiagnostic: AM6PR04MB4791: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1388; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gM8RC6AiFmMi866bPNahI3YBDLRmoBcQVWCIgJzaj3DxhaQcU9ceyDaGfHRwUrRLhi7/XEbD44sNWkGpo3f+iJGoq4M+uneZBbPP6+jZzcZVha2w7omQu/9swhXkd0ZLqnn00r46GyFbDx6YyPb/nyW4h0FfeMuGx+AeftLV2J8xptJwGLJGfPUEF4igI0Ukt5qN5CKFRmJNYA8dYs9wEWKZFxResnCz9WuF1Dl8FNZkvXTPMW6fUAWsPVi/RKcr5TLJNhQtoAvN8xJIMzC+2guEKDYiluK8blQtMzWHKdbtyEXwQOL9EFmQuimAYEPQ0RpASeEFakXdL782NXi7iDoPEYc6Jb7aWJRdtM+sC7r1ilnzDKB2zkRg5EyzOpuPLVgbN7HrjNd2G8PvN0QoJqFS5Jz2g1Y9JY/Q3ZQ8EyzcNeaQ3vNlpsbrPc7+y+kq3+Is8bFdAJhVbIG9xPxtT79Vhlis+jYPpwJTkZ2iPaG0fvzIA/INoc6D+0C9ydejOWSCzXCes0jqSK1kJhvR6WWDANIV6bU4BEQBFQeKeq6iowojmKOTH49yowg++qRAioSmFN3iZkBdkO3EzSaxm4w66TERj4MZ7yq5UWQNYEx3wGB16zGdFX+HmkZDKccJZSCoR8HDRszT5LQAop0CDsIirGv+Kg7tY29AjthMBLEQ/F+N9bBlQCwoLJEpMz2+07D8B6ZSwGF73txN9ugsuQ== 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)(39860400002)(346002)(376002)(396003)(136003)(186003)(66476007)(66556008)(6666004)(1076003)(38100700002)(86362001)(8936002)(66946007)(6916009)(5660300002)(316002)(26005)(83380400001)(478600001)(2616005)(38350700002)(956004)(2906002)(44832011)(7696005)(8676002)(36756003)(52116002)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e7cpfRZW6X2kp52qz8e2ZJ/7UkPTzo6h5H3PNm3ZPjTVmy2D86tSDzSo/nxuxRD3ABbx70id1Vs4T5OoLWoR9XIMCOriBnb3pCpAFyXqYGHRWtL6MUZv5TnRM8DrXSSpDEznHecx37RxfUiqlj1Bci5A8xwDonNqTAfuxygVnDuipAmgxMUZJXlxG1wzT0pR8evzvelbkTAX5k+6kGJ5RehXxgCR7N0aD8500yrXtyGVmZDf87rIDFMGTnLhCZcnedrK+RomnRBFWKvpcMZvLvePe+SvOWb4SUB4ndRRVpu3osijsUnYMfwFkfhNk7hUiqFVjZf4d5EJEFnWPiVoUdFYCBG7F0Cq8rQR2GP3CYj32vBi2BXXXyImvsyWuNh2cAh01AsUYpqqLg46JKO+Yf8oc33roeQoJVRw37m5ufnVM68SGZwn3J5cgtIo0EZDRPzdlQiYISXq4UkvKSbmbQoaTclM4LJt4cP2ExxNGtrKT9FZNv8YhdSr/6oOWBFoTkK8SEGYhNHfi+boUOn/rrCjYzOWKgQ/jkxTGr/wa4GvG4kDjaINzHpxDeu00CKUfxjx7bLZy9zJgXY8nOUN3ZLVmqKviRVSPyqEv1RfBjYIoPpcueEUldRH6059c6o1l9KX1fWKn9R15hrMhveaqjwtATzLeGhPN/UcLb4G9qszafEuqupvMAPh6EU8Tpe7ctgpDgGZJv9J/pIQ4KDUVL0tiI8YEDjf0SWK+7hCLIxtBZc1o8/2KKesH8AQE9A6zc1xISTgvcy+Lo7F4mi2pPkNjkWKlk07QUIbQt7jV12jGdexY25TEEBSlhNgp0fk36pb6Pa02cxXVz8ahjj1DJFb3chf/ZTLWge/X1hM6eKL3+dejra4BpGXaQyExTOrxaV5uWlpbSItFoV1ni+HBsNiI4PvMlqjQXZrKK+cxK5IiMjREOr+T1ItX1uU+oWXJvUljCSLcJGMcdD64WDkQWEUBFBk9EDmUa+/nKEyIDrcExkfXIyg+mn+ERvs+P4NzbVKJQAQHvLaOpgurJf2uNUN4QxQGMR58fMF6pzPyCDWtxCn0+8q4zhVWrK3V8V9NWyKQuqHprskOURgpkZN5oLXswdEjglvNVHj4x8AEj47qJpUtQ94iQIfbMNZsK82vWk27mwanCHlGtiJOQgH6onf9JEFVh5mGx2xLPDxNeGLO176RXlS6q4SRQy7NM896fSP+oNMeekUn1xE4jd6pcmdD5CCFXkn3O9cTM35C0LgmNwqV4/b1N+tp1t+0VWbCEo7te8P7q0MmgeiJEAxyaOU2He5YQwQovRgHtgKuPRgSW/bY6SyXiBsAGA60ZbT X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e0ff06a-f713-4892-b9c3-08d962ef2499 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2021 08:55:50.7901 (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: CEFCn47GftGDiswjBz5xyHnWBwBUK+ezO6BpUuWVAapmoaOQYkM/oKn7WV9uoPjh8L8HjT2AYBkivskpfB32eA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4791 Subject: [FFmpeg-devel] [PATCH v4 2/3] avcodec/v4l2_context: resume the decoding process after source change event received. 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: d7Yebd0uAZgF client need to resume the decoding process after it dequeues the source change event. no matter what's the return value of v4l2_resolution_changed(). if the client doesn't resume the decoding process, the decoder may keep waiting in documentation of v4l2 stateful decoder, we can see the following description: The client must continue the sequence as described below to continue the decoding process. 1. Dequeue the source change event. Important A source change triggers an implicit decoder drain, similar to the explicit Drain sequence. The decoder is stopped after it completes. The decoding process must be resumed with either a pair of calls to VIDIOC_STREAMOFF() and VIDIOC_STREAMON() on the CAPTURE queue, or a call to VIDIOC_DECODER_CMD() with the V4L2_DEC_CMD_START command. 2. Continue with the Capture Setup sequence. Signed-off-by: Ming Qian --- libavcodec/v4l2_context.c | 52 ++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index dda5157698c3..b08f0015c2e5 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -153,6 +153,21 @@ static inline void v4l2_save_to_context(V4L2Context* ctx, struct v4l2_format_upd } } +static int v4l2_start_decode(V4L2Context *ctx) +{ + struct v4l2_decoder_cmd cmd = { + .cmd = V4L2_DEC_CMD_START, + .flags = 0, + }; + int ret; + + ret = ioctl(ctx_to_m2mctx(ctx)->fd, VIDIOC_DECODER_CMD, &cmd); + if (ret) + return AVERROR(errno); + + return 0; +} + /** * handle resolution change event and end of stream event * returns 1 if reinit was successful, negative if it failed @@ -163,7 +178,7 @@ static int v4l2_handle_event(V4L2Context *ctx) V4L2m2mContext *s = ctx_to_m2mctx(ctx); struct v4l2_format cap_fmt = s->capture.format; struct v4l2_event evt = { 0 }; - int reinit, ret; + int ret; ret = ioctl(s->fd, VIDIOC_DQEVENT, &evt); if (ret < 0) { @@ -185,35 +200,29 @@ static int v4l2_handle_event(V4L2Context *ctx) return 0; } - reinit = v4l2_resolution_changed(&s->capture, &cap_fmt); - if (reinit) { + if (v4l2_resolution_changed(&s->capture, &cap_fmt)) { s->capture.height = v4l2_get_height(&cap_fmt); s->capture.width = v4l2_get_width(&cap_fmt); s->capture.sample_aspect_ratio = v4l2_get_sar(&s->capture); + } else { + v4l2_start_decode(ctx); + return 0; } - if (reinit) - s->reinit = 1; + s->reinit = 1; - if (reinit) { - if (s->avctx) - ret = ff_set_dimensions(s->avctx, s->capture.width, s->capture.height); - if (ret < 0) - av_log(logger(ctx), AV_LOG_WARNING, "update avcodec height and width\n"); + if (s->avctx) + ret = ff_set_dimensions(s->avctx, s->capture.width, s->capture.height); + if (ret < 0) + av_log(logger(ctx), AV_LOG_WARNING, "update avcodec height and width\n"); - ret = ff_v4l2_m2m_codec_reinit(s); - if (ret) { - av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_reinit\n"); - return AVERROR(EINVAL); - } - goto reinit_run; + ret = ff_v4l2_m2m_codec_reinit(s); + if (ret) { + av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_reinit\n"); + return AVERROR(EINVAL); } - /* dummy event received */ - return 0; - /* reinit executed */ -reinit_run: return 1; } @@ -551,6 +560,9 @@ int ff_v4l2_context_set_status(V4L2Context* ctx, uint32_t cmd) int type = ctx->type; int ret; + if (ctx->streamon == (cmd == VIDIOC_STREAMON)) + return 0; + ret = ioctl(ctx_to_m2mctx(ctx)->fd, cmd, &type); if (ret < 0) return AVERROR(errno); From patchwork Thu Aug 19 08:55:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 29614 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp107810iov; Thu, 19 Aug 2021 01:56:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr4QSMnX6Zr2AZWvu3DhrxGrMmJ+nORAVqowtZ/BNmJg6ra5BWQNPF8HASslMhcYYDhBGs X-Received: by 2002:a50:d4cf:: with SMTP id e15mr15169788edj.2.1629363383819; Thu, 19 Aug 2021 01:56:23 -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 f11si2475780edl.305.2021.08.19.01.56.21; Thu, 19 Aug 2021 01:56:23 -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=@nxp.com header.s=selector2 header.b=c4e9LqpP; 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 7DB0A68021B; Thu, 19 Aug 2021 11:56:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2076.outbound.protection.outlook.com [40.107.22.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44D3C68021B for ; Thu, 19 Aug 2021 11:55:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F/S+6G1yGvgs01ui/YTbPBl2eUO6PqDvJZarMdIE3wwTPPr74GMpchC6/WyGAXVtSta84ZkVjcPaL8O7mjuJw28JecPdKtEJU2RPx7bFMEJWtl2Mfufe61nA/bBOk+vqS0ClsdFJPhXGmEeTkMdhckAoOIGVxIQ8XAekuhNG6OLFseCQcURGIysWOkdDUTL3Mu2VYbWq6VjcZXB6EoWgHMxUwHjHwoJw5ABtpesRLD+klZMNYc8ONl+pKuMm91vwAWW/uVTkDGSh4cg8x43bOpXl+UMa0UnEX+IYeTvoMvx6/v7emQXnxUK7ixx2psxHAE6IXFeZzCQE6ucA3hdbZw== 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-SenderADCheck; bh=qI1ucDM0lKq28ISOnN4u6O0mdX9bIdASDtFdjfMKbYo=; b=cInx5spmOnpS5sZGMzDNHl1a+gRlU2GCL6K6G7L4Oc6KC9qSWgcAULeBt8CWo5AKH+6FrzBoXdBKQuOJ21il2q+REVM7amiiNS2/81WCWJmbs8dmXlTzIcVMdRHCGdIstfb83W+ywQ+UnYmrArU73tgc+p8TGFA4GafS2AywLUCnPhvOHynAT8UfbX86J4KNHxWoSRymRBK/Lfld+Y6h6MJQtaw5MN4GldysvWhuc41iCeMIpu1lgp88nAMHLZffTNU0l3ziDReG0udJvoYzMPKRD1nioXRF6Td3a1LNm2cPyV+nBZOC2u9dyfZ3xUDV1JPlZ4snKWqUc7wf8W+Dng== 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=qI1ucDM0lKq28ISOnN4u6O0mdX9bIdASDtFdjfMKbYo=; b=c4e9LqpPfdoJRC5u+PRSB5F3y1bi4KaUMAXVNO8kku49BmywVO4FUhihilvOHkMXDqF82B25efuASULJ/AI6lOc2AyOZYjpfoycDE0JlBPaZ2g8tgxetadK4XDCpQ0KegJAL/iTyC7fLIX9H3TnQW1BReEU7SfFVhHFaTcJoOng= Authentication-Results: ffmpeg.org; dkim=none (message not signed) header.d=none;ffmpeg.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) by AM6PR04MB4791.eurprd04.prod.outlook.com (2603:10a6:20b:3::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.21; Thu, 19 Aug 2021 08:55:52 +0000 Received: from AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::9cb5:bd97:8500:2384]) by AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::9cb5:bd97:8500:2384%6]) with mapi id 15.20.4415.024; Thu, 19 Aug 2021 08:55:52 +0000 From: Ming Qian To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Aug 2021 16:55:33 +0800 Message-Id: <20210819085533.1174-3-ming.qian@nxp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210819085533.1174-1-ming.qian@nxp.com> References: <20210819085533.1174-1-ming.qian@nxp.com> X-ClientProxiedBy: SG2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:3:17::18) To AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv11149.swis.cn-sha01.nxp.com (119.31.174.70) by SG2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:3:17::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Thu, 19 Aug 2021 08:55:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f566e03a-851f-4a3a-954e-08d962ef25b8 X-MS-TrafficTypeDiagnostic: AM6PR04MB4791: 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: tFc6xCluXLPNujRqZQxA/FzZ0AeasHUowqkR1rNTopySOWUgIKl9c1asFhQ6Sg7o8pfiGwwL/Oi4IgeKIa92Ch3FMc01Np1KJQ/ZGR/TRa4Ror1J9S+iB1KaySiupphS8os6+1yrTQ/KyrpvPHLAQ0BHStA0wXImPOn1PZi34dz3pedAP7XyeEkPkH8Ph92nMnGrd+GTP/zFnQoVvATzNcbazlQzBN0jJIaE2ZSXu3RVypFW3MEshAOiQSnnK6Nfl8jUsjBpTgJtcoIFLElLK5nkV4AF39BYcAIPaddo0mpS54VCcy8mmpAzgs6YSjrTsZR27GO77/XiXN039tbkVHJDE6npvxr1OiQIuT76Cb8MqHi16tmVradpnV5kR4a4M+msaYqXBLdUAovF++NvEsV+9pu5mFkUuC0cyya5iH/ORtqAbbe1iRppmbp2rFy7dkMB9RFXGQkdhKuteJ9CtdRMpmijw7sTKVvqKNST8e+8l8w5w9nK2SM4H7vXKrFQPy+t0vkMRLIptG4XRY5msRB8ZxUGyPERSuj0monjshtOl3EwSMBhtv6uPcWOQIW1a9SI1Uhu9bZE4Kep8HmyN+0oZfk6TreGWTi3XiC2SEd2A+/jcmnq6SzFhKuQEPdmS/V7P/EWekAsvC4PafbPpN5lP0LKrbNWavF2tw91P6gNmRS12AHYeuhAlNgLYnAfxKMIQwsEljKhKX+PQsFpdouirl9TGQD7I7KWp+DcLQ0= 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)(39860400002)(346002)(376002)(396003)(136003)(186003)(66476007)(66556008)(6666004)(1076003)(38100700002)(86362001)(8936002)(66946007)(6916009)(5660300002)(316002)(26005)(83380400001)(478600001)(2616005)(38350700002)(956004)(2906002)(44832011)(7696005)(8676002)(36756003)(52116002)(6486002)(70780200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YoYP+YKzzl0DnRWd8DTX6K4m3+ryoZ7TAPT3mhecMBrtlPMPaOFYhtxcK0/Eo4H75ULTXVg3qkhmYOsbU2rGHLRPdg2UJjYg0X23THKznBIOfwwKdCUVfSoj/O2ODr2cs4xkhiYumElof8OeRPNufyyhbXwXy5WM5XozBkjmXZ/skldHanRkjw/0rMDbckiueYerB6mxSNyqdKvqBcCmew/lXwx/Bnut7ekXqgjlnQTwPT2+kcaSp6CZmx20fvtCb4P/Al4uD7pIvfJmERk4wWUkVoHb6zbW3RP14WDIFTbE/H9XTKPz9QEnzYJgywWokWsf2Gbkrx8DjVafZ96DsEKIldzTdsGaF2TV2qCqZqt9sN6o7R+eseWEPHzQ6eheCBKyMTdBDBnlflMuRsaDOxSNwi82Ge/puadNmZWqNkI01gS5+eMVtxPvtM6LsYs6a0rdNmjrbFQSm+cx01GEzEKeP/UdZPsrtDAA827ZzBJLRD3ngfsdyZ5zP+LySOh2GaptPCkG6q1B18OwTzc1gUJsi20jtfJaZRZb9pZ1mqQ3BzOKpSr171fRsDNJHglplsXXZ4pQ6Y8N0Yq44Wvgmd/+2tFAjMFNVysXkBAdZYhD0FU9g6fqKMteLbYG9JHkbtbDYo2Pa4OlsHZOyghGH0KoSsg2Is4svh4kuToR/UEJ659wk814nIobj6BjTMAwZy9OR17sDLLtmE4iVNMcRvGuj1PIvILKZEG0eaBvgRMzjDVpNImVBfY/Idwvb5DIVcJ8YMsBgbCIPZqMY7l1NnRHiGsO0ULaGOjUrw9TWi9cmga/OB1riFw9iP5YFC8rzGbBFRgCjb1ONIjsvZnHkQ0dxgQFl++jR5/LzqfoBWnoiSZd1xzotaCijy42baLfZhvNAXUIGQcJ/0aqMfa0z0/fs+pxwXo9UGaxEBFCenAPd8tuSZeM1t9Ni0JK5JCXjhdj3VCMOlcrLKXOr0EHCwpOn07zoOD55oe31LaW+j8eavFBK857YwpKdcUxg/IYwfxhBXbSvh6RjivUm/e9GVeFhegW8VnlVnlLZxRWCjDlpJGRPbH4u/wWiTXPLsxfkB7NW5VKpjFxL8NK3PxYBwGqXwo8NzOeb8B5eQQu1lrBk4Vn7UDeNDf0yOUyNVhZ/dibfekWgcBSxbnry1prAdzJM0I7D4R1MQpYRYdDAxrekj4C0+HZZfYM18A4fnrzt0B+koAledMywKiDGlz0DncCmyP2HyUCKudF19CmriMYy6475QAe6TzlkJdr8pb2HJdU3REq0UcegndL7fN1kPlFxXstkUfcq9HbR/20cs4NSP8YVC+FuaQX/bShK2gR X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f566e03a-851f-4a3a-954e-08d962ef25b8 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2021 08:55:52.0644 (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: ikBEueJ1Qk7euNhT6cien2BnZVZ+ixjlSifK3flTeG2OQiDEsDsuiDKvtmKHiuo7l//WDi5eziZox5rCU7NaiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4791 Subject: [FFmpeg-devel] [PATCH v4 3/3] 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: o6qESZMijMoZ 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 224eb3d5e7be..6b936b6df2a9 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -149,6 +149,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; @@ -157,16 +165,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: