From patchwork Sun Apr 25 09:37:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3023935iob; Sun, 25 Apr 2021 02:38:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9kPabCyaYs19GxtbwB6TvI7oRXGUjMidKwJ24E5t5+ggq7ZiaOCiZW97fA/nDBJmJETHC X-Received: by 2002:aa7:c913:: with SMTP id b19mr14782009edt.170.1619343486511; Sun, 25 Apr 2021 02:38:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619343486; cv=none; d=google.com; s=arc-20160816; b=uLHUcKlg1taGUv/U1SqW2d6l1T9X7d7VNc0w//nsA4SIIHMaYrJHKqEVIlPLcrZ6vc rb99le8JB/0xNlJD1CBLTkoUyYvSzvDtxsBStwKiy6jWum0/SHhM2E3eoyxYRtmywQUH qRHFssbFmdWEMRrHxqqVYKHQ4Z1dvfLfTTFGvuxJQklcWNPAZZ+rwQl5hJ0gE12Up3D6 KF2Bix7lerdoeQTbLhztl6jzmXWlxhZXAkUigeLQ8dxuSN+j/GESf1Vqc9i8Rj4ljP5y Dk4xOvVT85S2usv200jws1O5eTse47vdku0ofbHCq/y1fCR0lhLzzo9FU7UyVwOGPnf5 RdoA== 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:delivered-to; bh=yDDUfD9qEbcYra5MpRPVpY2TpTod/K7e0UJYqK+RaC8=; b=AEJiluCInwOtPF1AH1s1nXFwh0MaBas4aGxhZuyYw7plGzk0lc6hNJdjXV9H6NbduK Bzdka4aMvPhpltSQ6CgjvjsTuJ+IiTyMePokSCp2tRRNPrfmUybGYQvLX89rd1OWFNuD WGws2Y6Cjt2MeoTeMxnx9hASQcFmUqbICtum+3aEXdB7bH0HgoG0aonczVRpLChvux7W lZD3qo8snqAw4S7NtGaCPkkIrQ4khm8MzOgTg8b9be95FRqwua0R5NLpJpIbDdWejCXs oyGvU0Zf5eKEkYmV/n6C4FmaW7S71Jh0mRFG1UUMDscZHunnB8JEXUylhYjHKHou+auo AKXw== ARC-Authentication-Results: i=1; mx.google.com; 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 if8si3246291ejc.48.2021.04.25.02.38.06; Sun, 25 Apr 2021 02:38:06 -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; 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 AE1C8688050; Sun, 25 Apr 2021 12:37:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43709680789 for ; Sun, 25 Apr 2021 12:37:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A238D24042A for ; Sun, 25 Apr 2021 11:37:46 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 8BA68Z65Xr37 for ; Sun, 25 Apr 2021 11:37:46 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:a640:2e1a:caa3:698c]) (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 mail0.khirnov.net (Postfix) with ESMTPS id 298FD240476 for ; Sun, 25 Apr 2021 11:37:46 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 53BA93A0922; Sun, 25 Apr 2021 11:37:46 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 11:37:35 +0200 Message-Id: <20210425093735.15121-2-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210425093735.15121-1-anton@khirnov.net> References: <20210425093735.15121-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavf: clarify probesize/format_probesize doxy 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: kU48gBAqfE9T probesize is not used for probing the input format, but its documentation claims it does. --- libavformat/avformat.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8600ee1bf7..00e78a4a11 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1394,9 +1394,15 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer /** - * Maximum size of the data read from input for determining - * the input container format. + * Maximum number of bytes read from input in order to determine stream + * properties. Used when reading the global header and in + * avformat_find_stream_info(). + * * Demuxing only, set by the caller before avformat_open_input(). + * + * @note this is \e not used for determining the \ref AVInputFormat + * "input format" + * @sa format_probesize */ int64_t probesize; @@ -1671,9 +1677,13 @@ typedef struct AVFormatContext { int probe_score; /** - * number of bytes to read maximally to identify format. - * - encoding: unused - * - decoding: set by user + * Maximum number of bytes read from input in order to identify the + * \ref AVInputFormat "input format". Only used when the format is not set + * explicitly by the caller. + * + * Demuxing only, set by the caller before avformat_open_input(). + * + * @sa probesize */ int format_probesize;