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);