From patchwork Wed Jan 24 08:16:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1129474pzf; Wed, 24 Jan 2024 00:18:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IHVcgjx1/NLo0hMz0AseWOoFsNW4Czt99SuQffjBLCtKJP5HtrA555v1wx6dhwRECSvd2YK X-Received: by 2002:a05:6402:350e:b0:55c:a84b:ca58 with SMTP id b14-20020a056402350e00b0055ca84bca58mr1231165edd.18.1706084303091; Wed, 24 Jan 2024 00:18:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706084303; cv=none; d=google.com; s=arc-20160816; b=ye0CBktdAmIBODy9kD7GcxkuPOEplU+EndS07K4kiLkC+mjpcrk4ViyukU41M2UWTm rpys+NG97T4r6GrAbNLIqlXFBnWxH5aYXTZO/njzhA/6mHM8Ix1xl5kpwFuOtkZma3BT 0cTHWCJ451RMpndSUeu3ashi3v0p5sQqJX0yTJZWJunX2sLWSS9Uw+UxrLjh7XWsSo/Q MripOHnWMGNLq6YnhNRW1DtYb/itKkRou1xc1ro58sYTqpt8wS0nbYC0Vy3dMzHJXti5 qNLAwb9KQB9Ui66FJvMQ0JdAQoWip13vOO2dNWOLkMhehlg6LFcnOiEiYcE6e/H0Q9PJ ovrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=7lT7wJBH/LzMKClLLWUH6tYq+K7NK/GKSZFDYsmY/GY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=H/wChpuNNEiQkLBeowqXVswN22nfBITVTogUp+1TbLWFWH/hwDdriIIWQL0NhJjrZB pY+4dwaVDQLQWHDTaDms/nWUKNcyHv4sO+dL2j+7lcS5tIYFapkk2lymGd6b8dTLIHOP CpskIzwgtRTBuKsDE3rowcbGQHLGAidJ6d90CN5KYx4/UZlSBfG9RDz9y+9vJCgNYfcZ X4ZcIMYWEaAEcBu2bqyVTCkxaaJe6Wkek+l28PBRIEEo2ChRtbY+AfHEnmSG7sdwnOp2 t2zLqK4fnAsalHbljk4PIN9PCXvnlbNRGAygxOtRlXbMG8oMUgXQmqb5g6cXHwRKogvc BD+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=b6C0PiMd; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b10-20020a056402350a00b0055a8c8e768csi4894604edd.299.2024.01.24.00.18.22; Wed, 24 Jan 2024 00:18:23 -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=@khirnov.net header.s=mail header.b=b6C0PiMd; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45FE068D164; Wed, 24 Jan 2024 10:17:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0035968D0E1 for ; Wed, 24 Jan 2024 10:17:26 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=b6C0PiMd; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 9A9841A0C for ; Wed, 24 Jan 2024 09:17:22 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id xqvhowu-RzLJ for ; Wed, 24 Jan 2024 09:17:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706084239; bh=M+i14zY8QeWYOQkq+X02iyBrMMzhV10dYDySUHblxys=; h=From:To:Subject:Date:In-Reply-To:References:From; b=b6C0PiMd+89lysYTJG43nb/+NRMLqkHmlE1bKLP+7ZfO6TwQ/egSHQcLZ78d+nQVQ mECaXR+88500/9fAB9npFWGVd1agd5Jj1NRIZp/rph0TBQjF+S0WLEp3CMGUP/Jm22 BYZFm8LaE5o4e0MlvgjdiLRk1tHxV3TApENuE6M5sq6xhb/K72iEZhOUwR3G7dHFoK 2rjTO7/IKmxA+rsrpPKM6t+76r5dNmYsZzDGBwBkNI5hDTxWJMKToksI0CkqDQzmNB Qd3DP9aYDt6ZYlytl0Pa77un0i4eqeH0FvcOQoTDxMGHBczO+D3H9fQ2+ncLb4PYnh 0nC116ZS5ryNw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id C61E21A3B for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B10F53A0582 for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 09:16:43 +0100 Message-ID: <20240124081702.4759-13-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240124081702.4759-1-anton@khirnov.net> References: <20240124081702.4759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/31] fftools/ffmpeg: refactor disabling decoder threading for attached pictures 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: vdi8aL8SLlNB * as this decision is based on demuxing information, move it from the decoder to the demuxer * as the issue being addressed is latency added by frame threading, we only need to disable frame threading, not all threading --- fftools/ffmpeg_dec.c | 3 --- fftools/ffmpeg_demux.c | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 7037175a48..e0d8e27098 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -960,9 +960,6 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, if (!av_dict_get(*dec_opts, "threads", NULL, 0)) av_dict_set(dec_opts, "threads", "auto", 0); - /* Attached pics are sparse, therefore we would not want to delay their decoding till EOF. */ - if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC) - av_dict_set(dec_opts, "threads", "1", 0); av_dict_set(dec_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 02add669a0..d804358d55 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1259,6 +1259,11 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) if (o->bitexact) av_dict_set(&ist->decoder_opts, "flags", "+bitexact", AV_DICT_MULTIKEY); + /* Attached pics are sparse, therefore we would not want to delay their decoding + * till EOF. */ + if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC) + av_dict_set(&ist->decoder_opts, "thread_type", "-frame", 0); + switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st);