From patchwork Sun Apr 25 09:37:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3023852iob; Sun, 25 Apr 2021 02:37:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8GQ4s//kejNQIu+YzGkI2QdkryVL+XNA1bp/TdWfpFn6Jt78ABEjxGr0T3eg1SElGOlmw X-Received: by 2002:a17:907:1b1e:: with SMTP id mp30mr12843202ejc.532.1619343477928; Sun, 25 Apr 2021 02:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619343477; cv=none; d=google.com; s=arc-20160816; b=tZtRpolXa6dc1NgfRm2PCbwFyxMb3HtsZzMRxxv7hQo45AK4uqPYc9LuNIa0bdeapQ FGT0ULsA78yfNe4Ad+UbeZA+TUr9cSwXSiKTVHC2mwDn8uLXmcPzBzFu0pzBkf603+JY HmbCb5S2Zd3mjePD8LJ5c74YGAg/7igzVXejcl7dwo17FUfva/SLG+L8lHuGRetmpopa GaeykIfXezw9AJCyvc9yGyTucxDlRsithNASYHIo0GIWw09NhVGfQTHoeJGXSzJ0baRi q2O4D3/Urmp9tDrkBaGM45dGfxteJq+JWmjeXr5rsmRilwCsoeO1TXLMtxlB5ZpmRcCW 2Cyw== 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:message-id:date:to:from :delivered-to; bh=OEYDTwcaJcQlm/fKihitPasXizH0HlEyQSueqxd1xxE=; b=zEHk0zcn/WGo1Q5xfRjilS/EtS0RmqbE4asnY9RGWB6F0u/UaYTgCd0vlHHhvz5v+H 0rfFMendLzKsrHC6Z05phxQi7gvxSyzdmOQP6XZMirqS7AclAbgN4jkxZD9B65Ze5hxe JK6joIituTTj58XD+95bLFX/STIEL6GATwFHIRKNHnp2fJ/0vYIApHCKRULIk31pHzAI tHGdlXWnVBMIFkmS/J1Fd1c3btvzuLY1ePwSCu2sVQVhZEZdYpl89F1ZdOa/TsZf8QU1 fOOuRPa4xQ80soFEh4iGrv98uYZCCGOzx7SOLV7emOxWAMKcOt1CqD5IZFwWx9Fttq/p HlZw== 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 b10si3012726ejz.608.2021.04.25.02.37.57; Sun, 25 Apr 2021 02:37:57 -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 7704A688043; Sun, 25 Apr 2021 12:37:54 +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 DB822680789 for ; Sun, 25 Apr 2021 12:37:46 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3EF69240477 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 8ayqrN664We8 for ; Sun, 25 Apr 2021 11:37:45 +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 F137B24042A for ; Sun, 25 Apr 2021 11:37:44 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 1C1D03A0922; Sun, 25 Apr 2021 11:37:45 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 11:37:34 +0200 Message-Id: <20210425093735.15121-1-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] doc: fix generating doxy with out-of-tree builds 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: g0nonmMRGWmd Broken in 753930bc7300dd595c4bab51c5a70d1da9083da4, as the path to Doxyfile passed to doxy-wrapper.sh is relative to the build dir, while the recipe cd's to the source dir before invoking the wrapper. --- doc/Makefile | 2 +- doc/doxy-wrapper.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index fa4996b5a3..58ca3fabd8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -102,7 +102,7 @@ DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak doc/doxy/html: TAG = DOXY doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS) - $(M)OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); ./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT); + $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $$PWD/doc/doxy $(SRC_PATH) doc/Doxyfile $(DOXYGEN) $(DOXY_INPUT); install-doc: install-html install-man diff --git a/doc/doxy-wrapper.sh b/doc/doxy-wrapper.sh index fe0102b5bf..729caa6347 100755 --- a/doc/doxy-wrapper.sh +++ b/doc/doxy-wrapper.sh @@ -1,10 +1,13 @@ #!/bin/sh OUT_DIR="${1}" -DOXYFILE="${2}" -DOXYGEN="${3}" +SRC_DIR="${2}" +DOXYFILE="${3}" +DOXYGEN="${4}" -shift 3 +shift 4 + +cd ${SRC_DIR} if [ -e "VERSION" ]; then VERSION=`cat "VERSION"` 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;