From patchwork Sat Sep 2 15:19:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43467 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp225977pzb; Sat, 2 Sep 2023 08:20:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFX348A596AtlNBzGihiTgHnY4CXcZ3gn39fw8HQ63NXy/OyNk12KbvlocO5UHywKEMUoOh X-Received: by 2002:a2e:7812:0:b0:2bc:fb79:d165 with SMTP id t18-20020a2e7812000000b002bcfb79d165mr3840608ljc.39.1693668025855; Sat, 02 Sep 2023 08:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668025; cv=none; d=google.com; s=arc-20160816; b=FOol09HgP/M6azaJWMAiwt5EjE+Vsf7FqYRA3l0toybKpoXpIZNzMEpYta+I36F9N2 UjZt3VZAighTpjGpDFIAAtx4tBWzGoIPY3Bn2zk8mrKy6Qu27susgQq3uxAjmSERU0lX IiukctDkqmau8V7qXEN/XAzGCxJiF85czTdyJzH5o6z+QWT8Aqb6d7oS6eEmEPff8EvS KaUfkrt+0xfa7dFq3sufh/03y0eelxJUI1OKeSgtkunX98aGELW9uXLK1Wly07zXHzHN lrljFbX0qFSvxHEXXbOvpfomEaX9b3zf+bpLWy9daV0ecxAzEBAoaJrOQxbDASdX1UP8 3abw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=XjBZf89CcPXOb5HpsHGUTTk5SBrqrNh9HrOzhbC9J2g=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=nC8IjkFXXtizQmbYGs1CZtA1wMKGDTmKddi+jUH+Kh6dMSOHL2AZRQcW7pY3ZNRGSV kayBdyM8MedYQ/IQ62G57Pp5GKP3gTtiXgqFnTwdrX+fMOu7BbsnFJL3a619n5I/5kGK 3zY01Lw8HKh0j4xman3ziAlpW3Y98sb3/ziNsRtrgpLHpgRuBbSQyrmhI9+43fisAEdR yuFyiAkBAhp4lFCCUIs8avBeb7QfoYmuhTH5jp7HD4Ng3Y4pLtWlI/ZXYemFj4HjT3DK 6s37Z4OFeh7sjltu1urcF9XyIU5J/hyySz4s/uoG4MWQDsjOZiZg7vjz558L36QjvmPI wfUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="r2ZO/A/s"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ox3-20020a170907100300b0099cd6660994si4182244ejb.116.2023.09.02.08.20.25; Sat, 02 Sep 2023 08:20:25 -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=@gmail.com header.s=20221208 header.b="r2ZO/A/s"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDAFD68C7BB; Sat, 2 Sep 2023 18:19:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8047668C7B7 for ; Sat, 2 Sep 2023 18:19:39 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3ff1c397405so456695e9.3 for ; Sat, 02 Sep 2023 08:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667977; x=1694272777; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mLqQrWRq7tERCZ7GWgRSlrc5E1Z1nQY73FguvHb+eEo=; b=r2ZO/A/sxzd/dn7SPuri6J2avZhE3cISiGoZVF9T+RdI5sfibiVEVH5T3RDYwevdEB HTyA9tRXdJ6ZJemU4Y1+f17p8feSLXDT6iNomGnjtdxzcEVUXg1MxjltiFT6dySKD6+I p+pVVe+rLNIrBofMM6rEjN3DGM34Lv+Dcj2v5Y2Pg55/JszyI+5ouNzNTHgGoprdCTTK k1HR3a+23Ziv7jZKvKz7BfzMATNeTXc+uMac9bVcIEdY+qT6+KLoHqlkLUK3tYxuKEvN 21nRBfNxMQricxjTCAyK2dqDI/XWxLX4FGPoc1mcijkaPZmFonAeDg2a5aGjCR1f3WJx 7ufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667977; x=1694272777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mLqQrWRq7tERCZ7GWgRSlrc5E1Z1nQY73FguvHb+eEo=; b=aigScr9sbP7je3QU9QoCvbWeMYOJamaXkMf0/0iTqVym0p/JiuMXebqQXYie7VWS/g bhkni0iYrR0jcKDoWWNaBtP7Z5IwY52G5y2GEOCupzFDX303DfFpc0BPQvVTSoaSsPb/ yp3iPZRvEuPw1qYedBw8SxMYF+iLguHPWoqB9IuN9sg/+ewEQA1vl6KLJ+RmKJ3/5amI EQc0cNNFtrKkQBbIIEGDSu9URD7kkZPNTEPrUvgPRnCGqfqgpJa7maKnYetkEpZ79sdo XWrnHsZSpr9rMM6GKksLOS6rH+yL7yclvOOsloM6rNyDB7qjdBVXz4mhB0/9L4B2Fsbl a7vQ== X-Gm-Message-State: AOJu0Yz44EXXKrgSxl7wUFXgs2HmPmgwAORQXHioxsGQ5kto2tgWEL8W KIJ3mByYIYdAaZZPlEMwmK8ZPb9BLvI= X-Received: by 2002:a1c:7c17:0:b0:3ff:ca80:eda3 with SMTP id x23-20020a1c7c17000000b003ffca80eda3mr3843714wmc.10.1693667977425; Sat, 02 Sep 2023 08:19:37 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id j22-20020a05600c1c1600b00402be2666bcsm3652091wms.6.2023.09.02.08.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:32 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 3BEEABFCD8; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:11 +0200 Message-Id: <20230902151921.1712373-2-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/11] lavc/avcodec.h: fix typos in AVCodecContext.pkt_timebase description 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XL6mrNntDcrr --- libavcodec/avcodec.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 649411ac79..070e36795d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1794,9 +1794,9 @@ typedef struct AVCodecContext { enum AVPixelFormat sw_pix_fmt; /** - * Timebase in which pkt_dts/pts and AVPacket.dts/pts are. - * - encoding unused. - * - decoding set by user. + * Timebase in which pkt_dts/pts and AVPacket.dts/pts are expressed. + * - encoding: unused. + * - decoding: set by user. */ AVRational pkt_timebase; From patchwork Sat Sep 2 15:19:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp225717pzb; Sat, 2 Sep 2023 08:19:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGS6sU3TOMoeGu2c+uHYyOTXXfOPI3C14cQ4ePNoFO6hCt0yLS5KiUzSB8IZX9nfd8zk60F X-Received: by 2002:a17:907:a075:b0:9a5:c957:ed4a with SMTP id ia21-20020a170907a07500b009a5c957ed4amr3786748ejc.46.1693667998430; Sat, 02 Sep 2023 08:19:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693667998; cv=none; d=google.com; s=arc-20160816; b=YTSt0X9Gy9HrIME/MdbEn02inc6G0in8V3CymUMS+Gwwouc45In00mXWX/4gVHHU+y E1F9MN2DBYK0hQLg8GG/NsIhSgeGD8jWRJydSo6uIu2bnyOuTxU4WeTtCp4Ajvx75bhY qSpI8zvNb4WIMAYge5ezV0DrlfV/T9Tmef6mH5dTjiDcYCSWTIssZLllVKC6h+7NaG7I mVoIrW5nE+en8pHe+VlIH+nt2RnZhhJH4JwNc8k0v2QlxdZKw6EXR7oIy288si/1wQCH L48C3BHoGVxxzZpbw6lKC29/7HP8BbFyzw7KCLIMi279P7ID+BKMjqd6DtyFtgRQDsy3 C1RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=ajHbX2NuTBrJ23ek5fxRC8XWg53louHx8qN847vbPII=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=bI4QQv3vC/yhdIeE+TGcTyIpKW58jptHtuhB8l8TcnJp2K+e38AiL7WwuSPCVidviI kZ6P5PzqaV+/TAiLoo/9TdXWnpyFq3tLJ3i+g8P0kNUEPhwzwmblDPajIWTywcofNrnn mBkMBhCGKT3PbYEyrYTThUOxy/V+PIHEQNbjF4PhM8uULsvLxYqb0IF2HqUPvgzvnoXZ SM2AEQZYouYCsPO5SrP93vJrUhOfOl7UQGnMwRQYP/yOX9/cTj1roslr/+YU4gyqazyx 9ahSA2t2eSSRGwfn+uM3egVjH7VqhzYPnvxVkw15iyw+rX3XkwzRAUd4n8v1Zc+w+bPI UsKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=F6qC5Nkb; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rh28-20020a17090720fc00b00992b54ad681si4029292ejb.773.2023.09.02.08.19.58; Sat, 02 Sep 2023 08:19:58 -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=@gmail.com header.s=20221208 header.b=F6qC5Nkb; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A297268C7A7; Sat, 2 Sep 2023 18:19:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CB0F68C64C for ; Sat, 2 Sep 2023 18:19:36 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-31c5cac3ae2so2445397f8f.3 for ; Sat, 02 Sep 2023 08:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667975; x=1694272775; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Jv3IXg8al6xj/TXRt/CbQXsOSFsLhbsocywh39sJr6I=; b=F6qC5Nkb/1QETaz5IebWkFYMbPDpc7RZeh2w0if2GkE5ZNqaUzaFJIqV9K35wddtJE hdxdg8domtRDzh9yMxXFzs8jGfNMKvf00HdW6a8bujzYkmKV1p65gEJqh+lTJMY5ydz+ R+lazQXvdytDvPOFPVk5wr9X/KqwxY0nPGqJiCGL+cNajAGafa8Nl9o/RmgmYuyZJ3A6 Dua46qYG9Tr32E275XxWv7Mo4gB5TKl/JvMWV1UEu8Ip3Guaj2jAv/NucMcJ3X9WXjAp 6hWy06ORN3PVemer3VUp8wRZc8BQEW3Rd0OGXwRBgHfP2CrDwsqPYOBuhSfAP75xV3eY EDfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667975; x=1694272775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jv3IXg8al6xj/TXRt/CbQXsOSFsLhbsocywh39sJr6I=; b=YHoz0sJfo9fngMk+pCl+iz4BzwrW44IvmmwGtWsK1JKfXP65/lWDIRqPT+cOE0CmGc PaVCLB0Vh6l+9Kk64ShSZGneAfOTYTIDvgNY7vUiVpvLsl1mYrh/dp+JqyrNVvdKRI2o PnLg8e+F7+WH5S2MVFInp5qgKUCNqodcPCMGp6FfnPFrHiP1HYZyp3TQ4e1CB2vvC9IZ HWYpNGXvzP/cGyqXsq5kgtYWXMvg6FnzxkM0sCpSTCdH1SE9CFRaEHtN97fzFQMGBLOB uah0P8IamHDq+/P4DWM2IPiPY6kGGIct+YlyD/LNnZuToDkx26yyDsdKOD01w3Be2n1+ O7pQ== X-Gm-Message-State: AOJu0YxbcTIesz8KVEi/jCs8zD/mmMH7Qxnr5TfjbroVbFrzElGb0VjS rBy6ga1f/WTNPgnSQvHvsmmxVNxKKKk= X-Received: by 2002:a5d:6ac3:0:b0:317:67bf:3387 with SMTP id u3-20020a5d6ac3000000b0031767bf3387mr3519768wrw.60.1693667974634; Sat, 02 Sep 2023 08:19:34 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id m13-20020a7bce0d000000b003fed630f560sm8292882wmc.36.2023.09.02.08.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:32 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 4057DBFCDE; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:12 +0200 Message-Id: <20230902151921.1712373-3-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/11] lavfi/aresample: show time_base information during setup 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ehpY8EmF8iXH --- libavfilter/af_aresample.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index f4bcc45616..b71ed5b91c 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -28,6 +28,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/samplefmt.h" +#include "libavutil/timestamp.h" #include "libavutil/avassert.h" #include "libswresample/swresample.h" #include "avfilter.h" @@ -164,9 +165,9 @@ static int config_output(AVFilterLink *outlink) av_channel_layout_describe(&inlink ->ch_layout, inchl_buf, sizeof(inchl_buf)); av_channel_layout_describe(&outlink->ch_layout, outchl_buf, sizeof(outchl_buf)); - av_log(ctx, AV_LOG_VERBOSE, "ch:%d chl:%s fmt:%s r:%dHz -> ch:%d chl:%s fmt:%s r:%dHz\n", - inlink ->ch_layout.nb_channels, inchl_buf, av_get_sample_fmt_name(inlink->format), inlink->sample_rate, - outlink->ch_layout.nb_channels, outchl_buf, av_get_sample_fmt_name(outlink->format), outlink->sample_rate); + av_log(ctx, AV_LOG_VERBOSE, "ch:%d chl:%s fmt:%s r:%dHz tb:%d/%d -> ch:%d chl:%s fmt:%s r:%dHz tb:%d/%d\n", + inlink ->ch_layout.nb_channels, inchl_buf, av_get_sample_fmt_name(inlink->format), inlink->sample_rate, inlink->time_base.num, inlink->time_base.den, + outlink->ch_layout.nb_channels, outchl_buf, av_get_sample_fmt_name(outlink->format), outlink->sample_rate, outlink->time_base.num, outlink->time_base.den); return 0; } From patchwork Sat Sep 2 15:19:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp225895pzb; Sat, 2 Sep 2023 08:20:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHF2mSzqhGxo6TEc27VQ0LPGpLPiwq4eCGcOznU+4jeRNRubGU1u4vjM++gcTuiaNYnt6qG X-Received: by 2002:a05:6402:389:b0:523:47b0:9077 with SMTP id o9-20020a056402038900b0052347b09077mr4058477edv.38.1693668016546; Sat, 02 Sep 2023 08:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668016; cv=none; d=google.com; s=arc-20160816; b=EHCb1zz2t7PyQmiVNgjsYFhewPLaj+iEzO49jEtgq0puTcSXpAg5Pi/6eJVDCee5ck wXoj8PwWjixqeyaKRBtUbddB7BVVzyPz47V3cpcMQHBXOCOfIM0Lw77s06LvTr0jhi8M VaUlfnmntD9fYmgwQtcq0CQjhAj6Z+cQNpQSER54fvJrb9fFFb6ij01ihl5DvYVAbTcs +oBpXuVPXTBCOM4EKOPie+g1O0XUc2aG4yIxm/rglVBqVf69VN1+vxsPmmqfQBhn37xU BMMSUbd0mo6AJ1xDTzp3Yj9ETXx56d02HDgK1BlMn/EiSB9HbjdPo54L9pOriZcvqJ1F fGjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=fDsnB38wtng0k0GkQFEFZQGj8y6Z5hMNjpdUUBV7exA=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=o6hwxklWDSu/qwYBVMiselSZx6P8QxhursrWr8QX+c73EoC7d4yCExNx7PFfNX5Dpr USAI451Ti0o+Q9GDYzy04DppfPK2oLoXG/jxMu/CI0a5GNRo1JSFyRqMyljLGFgGhFoa A728sPY0cowr9wNwvGIsjB/r6vO0YozEJXSEc0+tJU4+VNlBxAVgGKLGHQhYkNp//l6Y CJvilCsUQPOvV4SeLvJrT1DQIj7cbZuMAaK33P9SpkOMZbCk3O9zwjBvIXs1+aslysQU 7RWY4S+Zm75OxcZ5Wvtn6DOYuwUfvaU08yGolOS0TkpyUb2m4055MsFUhL4zCkLlEw83 Az5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Au8+LPsz; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b9-20020aa7c909000000b005234af90321si3761474edt.665.2023.09.02.08.20.16; Sat, 02 Sep 2023 08:20:16 -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=@gmail.com header.s=20221208 header.b=Au8+LPsz; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AEA2B68C7AB; Sat, 2 Sep 2023 18:19:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D933268C7AD for ; Sat, 2 Sep 2023 18:19:38 +0300 (EEST) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-31adc5c899fso2689909f8f.2 for ; Sat, 02 Sep 2023 08:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667977; x=1694272777; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=adnY1sCbPKu+WLPcXb47tNpPDEAqeFFPHwvAcAPULyo=; b=Au8+LPszvGg2TEvAqEUd0U6niEfp0a436o/TIfPfhZCKG3NosZX3u2tr9Y3H7pkRgh I6gQYOLCo0yKQqFfUj075liH+Qa+aF3Nf1IQuJ6sSvhIM2o2u+M31JY0NYnO+xj0Oqex 337GtDjvoxFC1oAO57pUY7fybUPgSaqk4DTR3R1Ut5cFM85G1yfWHg2PPGHM3Cfxlodn dLFG3OrjQP0nKvpxsql74sR8f1L8U/Mz0y64km+wlVuYdjtaVSpU4kHqQ8EZ7wmgSLQ3 bi1PAw0qkbJyOKodjhytuqlF2OaFFXY7inWvI2rlxZYh1HaRFrJROFZKXXdUsHTSuwUt L0jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667977; x=1694272777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=adnY1sCbPKu+WLPcXb47tNpPDEAqeFFPHwvAcAPULyo=; b=Q2703gnFq6cALEf3E3b0Uy91V/NCLEQDY2coD4M+muVFbkAyW5FGA33EG9U/3u4duh JNLZIv7I+0pVhLK53sLTNahOJkAvhRLBGXf/ijk7RFVRgj5KNq01i+hmsuucyt9P28Dt QyDp4iFtG7q1p+31Ms4kBlWgzFziMDl7b09G00lyFcqO6FvW4Z1DHVByf9u0E7s9hWUf MFVv2mKEWgM0wTADlY3ux+Sk6VTqyWPfrAN8mgwglv8zydeJvHA4O372bgs9eTP5B9Bt scHQtb8y89FkJ2//t7U3Wr+FZfOeJoQ5Fc2re0KNvov3lflJQmWZOCfnVsEFY23EPoBo 6RbA== X-Gm-Message-State: AOJu0Yy56exbgi+eeHk1YL8UdhVx31XFRkGfe1I1GxmGsKaxCA05pcm9 QF/EwcJCh/fxUBs8lkw3BK8tpLZ+M28= X-Received: by 2002:a5d:4ec1:0:b0:314:3740:7f69 with SMTP id s1-20020a5d4ec1000000b0031437407f69mr3730592wrv.37.1693667976944; Sat, 02 Sep 2023 08:19:36 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id m6-20020adfa3c6000000b0031f300a4c26sm3664679wrb.93.2023.09.02.08.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:32 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 44CCABFCE0; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:13 +0200 Message-Id: <20230902151921.1712373-4-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/11] doc/examples/transcode: apply style fixes 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BBTRn+w6ykj0 --- doc/examples/transcode.c | 97 +++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index ed6ac9fa03..81a88dd577 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -82,19 +82,23 @@ static int open_input_file(const char *filename) AVStream *stream = ifmt_ctx->streams[i]; const AVCodec *dec = avcodec_find_decoder(stream->codecpar->codec_id); AVCodecContext *codec_ctx; + if (!dec) { av_log(NULL, AV_LOG_ERROR, "Failed to find decoder for stream #%u\n", i); return AVERROR_DECODER_NOT_FOUND; } + codec_ctx = avcodec_alloc_context3(dec); if (!codec_ctx) { - av_log(NULL, AV_LOG_ERROR, "Failed to allocate the decoder context for stream #%u\n", i); + av_log(NULL, AV_LOG_ERROR, + "Failed to allocate the decoder context for stream #%u\n", i); return AVERROR(ENOMEM); } + ret = avcodec_parameters_to_context(codec_ctx, stream->codecpar); if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to copy decoder parameters to input decoder context " - "for stream #%u\n", i); + av_log(NULL, AV_LOG_ERROR, + "Failed to copy decoder parameters to input decoder context for stream #%u\n", i); return ret; } @@ -103,8 +107,7 @@ static int open_input_file(const char *filename) codec_ctx->pkt_timebase = stream->time_base; /* Reencode video & audio and remux subtitles etc. */ - if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO - || codec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) { + if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO || codec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) { if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO) codec_ctx->framerate = av_guess_frame_rate(ifmt_ctx, stream, NULL); /* Open decoder */ @@ -141,7 +144,6 @@ static int open_output_file(const char *filename) return AVERROR_UNKNOWN; } - for (i = 0; i < ifmt_ctx->nb_streams; i++) { out_stream = avformat_new_stream(ofmt_ctx, NULL); if (!out_stream) { @@ -152,8 +154,7 @@ static int open_output_file(const char *filename) in_stream = ifmt_ctx->streams[i]; dec_ctx = stream_ctx[i].dec_ctx; - if (dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO - || dec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) { + if (dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO || dec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) { /* in this example, we choose transcoding to same codec */ encoder = avcodec_find_encoder(dec_ctx->codec_id); if (!encoder) { @@ -241,8 +242,8 @@ static int open_output_file(const char *filename) return 0; } -static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx, - AVCodecContext *enc_ctx, const char *filter_spec) +static int init_filter(FilteringContext *fctx, AVCodecContext *dec_ctx, + AVCodecContext *enc_ctx, const char *filter_spec) { char args[512]; int ret = 0; @@ -269,29 +270,29 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx, } snprintf(args, sizeof(args), - "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d", - dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, - dec_ctx->pkt_timebase.num, dec_ctx->pkt_timebase.den, - dec_ctx->sample_aspect_ratio.num, - dec_ctx->sample_aspect_ratio.den); + "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d", + dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, + dec_ctx->time_base.num, dec_ctx->time_base.den, + dec_ctx->sample_aspect_ratio.num, + dec_ctx->sample_aspect_ratio.den); ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in", - args, NULL, filter_graph); + args, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create buffer source\n"); goto end; } ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out", - NULL, NULL, filter_graph); + NULL, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create buffer sink\n"); goto end; } ret = av_opt_set_bin(buffersink_ctx, "pix_fmts", - (uint8_t*)&enc_ctx->pix_fmt, sizeof(enc_ctx->pix_fmt), - AV_OPT_SEARCH_CHILDREN); + (uint8_t*)&enc_ctx->pix_fmt, sizeof(enc_ctx->pix_fmt), + AV_OPT_SEARCH_CHILDREN); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot set output pixel format\n"); goto end; @@ -308,45 +309,46 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx, if (dec_ctx->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) av_channel_layout_default(&dec_ctx->ch_layout, dec_ctx->ch_layout.nb_channels); + av_channel_layout_describe(&dec_ctx->ch_layout, buf, sizeof(buf)); snprintf(args, sizeof(args), - "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=%s", - dec_ctx->pkt_timebase.num, dec_ctx->pkt_timebase.den, dec_ctx->sample_rate, - av_get_sample_fmt_name(dec_ctx->sample_fmt), - buf); + "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=%s", + dec_ctx->time_base.num, dec_ctx->time_base.den, dec_ctx->sample_rate, + av_get_sample_fmt_name(dec_ctx->sample_fmt), + buf); + ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in", - args, NULL, filter_graph); + args, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer source\n"); goto end; } ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out", - NULL, NULL, filter_graph); + NULL, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer sink\n"); goto end; } ret = av_opt_set_bin(buffersink_ctx, "sample_fmts", - (uint8_t*)&enc_ctx->sample_fmt, sizeof(enc_ctx->sample_fmt), - AV_OPT_SEARCH_CHILDREN); + (uint8_t*)&enc_ctx->sample_fmt, sizeof(enc_ctx->sample_fmt), + AV_OPT_SEARCH_CHILDREN); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot set output sample format\n"); goto end; } av_channel_layout_describe(&enc_ctx->ch_layout, buf, sizeof(buf)); - ret = av_opt_set(buffersink_ctx, "ch_layouts", - buf, AV_OPT_SEARCH_CHILDREN); + ret = av_opt_set(buffersink_ctx, "ch_layouts", buf, AV_OPT_SEARCH_CHILDREN); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot set output channel layout\n"); goto end; } ret = av_opt_set_bin(buffersink_ctx, "sample_rates", - (uint8_t*)&enc_ctx->sample_rate, sizeof(enc_ctx->sample_rate), - AV_OPT_SEARCH_CHILDREN); + (uint8_t*)&enc_ctx->sample_rate, sizeof(enc_ctx->sample_rate), + AV_OPT_SEARCH_CHILDREN); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot set output sample rate\n"); goto end; @@ -373,7 +375,7 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx, } if ((ret = avfilter_graph_parse_ptr(filter_graph, filter_spec, - &inputs, &outputs, NULL)) < 0) + &inputs, &outputs, NULL)) < 0) goto end; if ((ret = avfilter_graph_config(filter_graph, NULL)) < 0) @@ -401,20 +403,21 @@ static int init_filters(void) return AVERROR(ENOMEM); for (i = 0; i < ifmt_ctx->nb_streams; i++) { + AVStream *st = ifmt_ctx->streams[i]; filter_ctx[i].buffersrc_ctx = NULL; filter_ctx[i].buffersink_ctx = NULL; filter_ctx[i].filter_graph = NULL; - if (!(ifmt_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO - || ifmt_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) - continue; + if (!(st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || + st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) + continue; - if (ifmt_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) filter_spec = "null"; /* passthrough (dummy) filter for video */ else filter_spec = "anull"; /* passthrough (dummy) filter for audio */ ret = init_filter(&filter_ctx[i], stream_ctx[i].dec_ctx, - stream_ctx[i].enc_ctx, filter_spec); + stream_ctx[i].enc_ctx, filter_spec); if (ret) return ret; @@ -477,8 +480,7 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) av_log(NULL, AV_LOG_INFO, "Pushing decoded frame to filters\n"); /* push the decoded frame into the filtergraph */ - ret = av_buffersrc_add_frame_flags(filter->buffersrc_ctx, - frame, 0); + ret = av_buffersrc_add_frame_flags(filter->buffersrc_ctx, frame, 0); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Error while feeding the filtergraph\n"); return ret; @@ -487,8 +489,7 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) /* pull filtered frames from the filtergraph */ while (1) { av_log(NULL, AV_LOG_INFO, "Pulling filtered frame from filters\n"); - ret = av_buffersink_get_frame(filter->buffersink_ctx, - filter->filtered_frame); + ret = av_buffersink_get_frame(filter->buffersink_ctx, filter->filtered_frame); if (ret < 0) { /* if no more frames for output - returns AVERROR(EAGAIN) * if flushed and no more frames for output - returns AVERROR_EOF @@ -499,7 +500,7 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) break; } - filter->filtered_frame->time_base = av_buffersink_get_time_base(filter->buffersink_ctx);; + filter->filtered_frame->time_base = av_buffersink_get_time_base(filter->buffersink_ctx); filter->filtered_frame->pict_type = AV_PICTURE_TYPE_NONE; ret = encode_write_frame(stream_index, 0); av_frame_unref(filter->filtered_frame); @@ -512,8 +513,7 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) static int flush_encoder(unsigned int stream_index) { - if (!(stream_ctx[stream_index].enc_ctx->codec->capabilities & - AV_CODEC_CAP_DELAY)) + if (!(stream_ctx[stream_index].enc_ctx->codec->capabilities & AV_CODEC_CAP_DELAY)) return 0; av_log(NULL, AV_LOG_INFO, "Flushing stream #%u encoder\n", stream_index); @@ -546,8 +546,7 @@ int main(int argc, char **argv) if ((ret = av_read_frame(ifmt_ctx, packet)) < 0) break; stream_index = packet->stream_index; - av_log(NULL, AV_LOG_DEBUG, "Demuxer gave frame of stream_index %u\n", - stream_index); + av_log(NULL, AV_LOG_DEBUG, "Demuxer gave frame of stream_index %u\n", stream_index); if (filter_ctx[stream_index].filter_graph) { StreamContext *stream = &stream_ctx[stream_index]; @@ -636,8 +635,12 @@ end: av_packet_free(&packet); for (i = 0; i < ifmt_ctx->nb_streams; i++) { avcodec_free_context(&stream_ctx[i].dec_ctx); - if (ofmt_ctx && ofmt_ctx->nb_streams > i && ofmt_ctx->streams[i] && stream_ctx[i].enc_ctx) + + if (ofmt_ctx && ofmt_ctx->nb_streams > i && + ofmt_ctx->streams[i] && + stream_ctx[i].enc_ctx) avcodec_free_context(&stream_ctx[i].enc_ctx); + if (filter_ctx && filter_ctx[i].filter_graph) { avfilter_graph_free(&filter_ctx[i].filter_graph); av_packet_free(&filter_ctx[i].enc_pkt); From patchwork Sat Sep 2 15:19:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp225809pzb; Sat, 2 Sep 2023 08:20:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrhY3b+P3L30scoyrbs7HpEIpD2XOdqA0WdfB/APfCZ7S4hLIny57bvyUT9MPJjHNnb72I X-Received: by 2002:a17:907:2715:b0:9a5:a543:2744 with SMTP id w21-20020a170907271500b009a5a5432744mr5189281ejk.33.1693668008032; Sat, 02 Sep 2023 08:20:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668008; cv=none; d=google.com; s=arc-20160816; b=T8wLzGPNivRvNYEGuWZZ8nTJzTfxYIPBYaEwh6wfZ6+o0glpIS9CPhZq/IETQHTIm8 cGDAGdMfoL1PkluEXGL/xmCViInAmH/M+V6NqYb7ilSJmAPTVWCfc6omhWXnn15ZROvR BkAqp6aO04LtkljcxrHIRCFholYYriexmbIUUIuhL7n/OVibipK9IRu+SqIFLvE+mASJ 98rG0pVnCjzv9ZuLLdbgaQB/SD/DgFNvqCnOeks1gK/7rpXEzXDZ2aXyvYZiSNtkuoKk L5cPdE8r0+MGH47T93dtked5NDovN78s6zqGDUXNQkiLBOb5+uskgPALHrb+mGFNskdG Jzrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=ZgDzcspn9nOqhMLTLWQtHu9xsef3IiIIt1yogFx0VZE=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=kLjXsksGQpzZkHN9VRQAJSzrQq+I3jsK6x+RNNFefvMLk5ms9cxOSdTUOxfI9Odl5Q 4WmsOjBnVFOUdONnVSjo0GQ0m2wxahLQywvpt2Bv+kN5ULxwUwlzA843i77ItCXGgOM1 dVwv63KkPQ/nADjiFrB0ZU4kzvdV+G3LgOd5euT/vJIuI6ykf2F6bWhQZdfel8BKbZf7 HzMlpcO9+MkJWK4429MKARpAqbI/GHihE6GaRiuTY+j4K2DzL/gW6yZoUODivUUzKMZe nQK74Q0F/xqFpBqvtyJxXEM5KhumXfnPTb252B1GZbj5KqlproEoSD6x+bJ0UMuRUlRZ w7nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=rVf3hPa7; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qx14-20020a170906fcce00b0099cc4b278c9si3850538ejb.208.2023.09.02.08.20.07; Sat, 02 Sep 2023 08:20:08 -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=@gmail.com header.s=20221208 header.b=rVf3hPa7; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A857068C7B7; Sat, 2 Sep 2023 18:19:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8701B68C7A6 for ; Sat, 2 Sep 2023 18:19:38 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-31c8321c48fso521200f8f.1 for ; Sat, 02 Sep 2023 08:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667977; x=1694272777; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=01o7AQ10ugpLRNi3QqZrRHATw2k6hkdhAk8K1LSbVXA=; b=rVf3hPa7MAo+9Bq4Ezltaf2Sdav1R+dWtKBJoNzC+ReCCDZFgr2CgRmGShh1IzLa0B LbTxkLXi2dT0pSf/uwpdRjCo6lxnfCgK1+yp97z4/2pEKTCav1B4YLmKu00DGaBtRgYE nODNYTCYNRuXIIFao/RxFgUfUMjmUOqVr0djeXf+RAfnx6wODirZfWvu5to6F8QIZKA6 d8MAAgpKOChUTnN9og7QzzS8BEQypdmCL8Yazk+ZFRQsQlgBiKw3R9bXj9hGQ88Vry28 ixci1ZeugZTLHge+ioIrOK37DtHevuoKqT+1enAh3/2M2v3Auzi0AO9+/unYjAx9O/LT NBAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667977; x=1694272777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=01o7AQ10ugpLRNi3QqZrRHATw2k6hkdhAk8K1LSbVXA=; b=ZCjOksRyBL77ahR494EqY/244EkGqHSUNUIUlAxP6qFGh+1IQTRiCvcHssE2bqfoxw 1X8c6BFusFUwaoJkzSYBReEu31lrBDenoVe4k7ZicnTtT/eSWvhl2oQyS06jVAWWdv0W KnNY72wrLL4RIcA5JU9wZS2h9rJAoxyfX7MiOsrPDSL8ksdZ2LPit5VtWK+1sBZ+Ftvg XoTVHhpZQyvFJbzzqgJKIANS7LKfBU8C+1bikdDLoyo8fRAQrvhMLiY+ewQPbpctYmKm L4E4Ca9zbx/TA/zVnZvG80FK/yl2Nj2UEBmi8pqoUkie7jSmprcgaubiafm8rPOzP0Nl pbbw== X-Gm-Message-State: AOJu0Ywv15ccgv9EhKe4wNiq4Jr+Qbx9wi0nz6UB1umzCEMibrSWAvah sjT1A0JHq8JU0SMlGHmb4QoQQvM/dx0= X-Received: by 2002:adf:fad2:0:b0:319:6997:9432 with SMTP id a18-20020adffad2000000b0031969979432mr4179628wrs.1.1693667976492; Sat, 02 Sep 2023 08:19:36 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id v16-20020a5d4b10000000b0031981c500aasm8881205wrq.25.2023.09.02.08.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:32 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 49043BFCE2; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:14 +0200 Message-Id: <20230902151921.1712373-5-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/11] doc/examples/transcode: factorize codec_type definition 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KrDm7yiQQagP --- doc/examples/transcode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index 81a88dd577..3c57fb36c9 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -82,6 +82,7 @@ static int open_input_file(const char *filename) AVStream *stream = ifmt_ctx->streams[i]; const AVCodec *dec = avcodec_find_decoder(stream->codecpar->codec_id); AVCodecContext *codec_ctx; + enum AVMediaType codec_type; if (!dec) { av_log(NULL, AV_LOG_ERROR, "Failed to find decoder for stream #%u\n", i); @@ -105,11 +106,13 @@ static int open_input_file(const char *filename) /* Inform the decoder about the timebase for the packet timestamps. * This is highly recommended, but not mandatory. */ codec_ctx->pkt_timebase = stream->time_base; + codec_type = codec_ctx->codec_type; /* Reencode video & audio and remux subtitles etc. */ - if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO || codec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) { - if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO) + if (codec_type == AVMEDIA_TYPE_VIDEO || codec_type == AVMEDIA_TYPE_AUDIO) { + if (codec_type == AVMEDIA_TYPE_VIDEO) codec_ctx->framerate = av_guess_frame_rate(ifmt_ctx, stream, NULL); + /* Open decoder */ ret = avcodec_open2(codec_ctx, dec, NULL); if (ret < 0) { From patchwork Sat Sep 2 15:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43468 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp226104pzb; Sat, 2 Sep 2023 08:20:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGeuklXBqAQOEeDKdsrCl7IL5MuIX2cfaoxUnk+wLABdJqkBW2v+Ar61iZEQT99nVi8yAGb X-Received: by 2002:a17:906:c148:b0:96f:9cea:a34d with SMTP id dp8-20020a170906c14800b0096f9ceaa34dmr10107349ejc.21.1693668041680; Sat, 02 Sep 2023 08:20:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668041; cv=none; d=google.com; s=arc-20160816; b=gZqpZ69sGF7Q3J2MLknDLLPkN+Yl7W03fb9gG27nYufmACVhZzVYWYfpyROUv26IZ4 4CufMLgAbKyEfthgVIl4Vsp3vT6GfmRGw5NzNyLh/keIGKKd0H5sde2pXWI+yyx1Iwnv go2set9fzIwJ6KjDLkkPNbuGg8BbPHRBrXHwferZm7QbgD7CJYYt36a2ddtnejI4JUHS HWvTgoV5FuCD9+kdiGVQeR99EM3XdHX95fdKj+N9MINe6hDx7up0NnY6TYbu0UmMCyzL tCVKq7lq+yqsuQbEszZflNGIEobpKFgwtdGXNbAY+ovwm6GDo1y8mbKNDsXTTUIHLwcQ jgeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=7ijP0RrbfRVmj+TeEO/pQzFJq5zBG7aYXw2BYa2TG2E=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=kSBYXPbOlIw3Om7ptd6q1OuGthfl6ODbLGkrdd+QUioJUH37YE+/RtGJCtjjo+p4Z7 GNshwDVIHdgvMXus7VNdhrv0tPpoL9B9TBoVUG71GzM1xVGHZfwit0hvZSH3OTQpqqIf Bj7gvm8i+3U1Dde/wo4R5RBIbPIkXg/Htfy6bXHxcVOUYqbpbLksk4qlSAyGaXblq3lA 10Ziacruq/cEiQWH97QAGTN1ZmXPDJdulBgDS3wTApqgMrGnISmoDmtrQ7feLsU9zKRu v1sjUi5PdbQC4DTpBR+E+oPTLXMSaeZja3XRf6ssRLT3TQ+dD6FR33HL1pG/wL+/WLOV yiFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=hBiy+vuR; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gw18-20020a170906f15200b00993860a6d36si4109126ejb.374.2023.09.02.08.20.33; Sat, 02 Sep 2023 08:20:41 -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=@gmail.com header.s=20221208 header.b=hBiy+vuR; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC58168C7D7; Sat, 2 Sep 2023 18:19:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2419368C7C9 for ; Sat, 2 Sep 2023 18:19:41 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-31c6cd238e0so537107f8f.0 for ; Sat, 02 Sep 2023 08:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667980; x=1694272780; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DaslhG+cBTMZrqqyNpunu9iCj4n2SCUEBRtSJtzTYnU=; b=hBiy+vuRVpF2sNnXbaCIq+uuijM0+mqaHgFdKyrORyDClf637FVzSTZLSV/EppVNhK ByqQY5XXK+Nbrj+0bYhXAZ/asx8ZClDIPxkHg30MRWJfhqS7KahfPt+R5HHophQKKa1M /iNBH//Sdg0mVxj7NGm8jaq9vjHDiLQft6OP0Su4cMVCt09Yv/gfbQrblfKtJUJygjYW sPNatry0gzaQcrbNQT1dw/3CsnWW/oVr/paB436MrOS42RXFceAI4aywMySRivaLBtYB narlpR7WlebQZA9Dg9rADsJ8OarzHpkw2F/DIBZLrgKGsVg+EAbEjGX1b+Y2luqhdMRw 1uDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667980; x=1694272780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DaslhG+cBTMZrqqyNpunu9iCj4n2SCUEBRtSJtzTYnU=; b=aZvcC2TpwU734eSBPeT1T/RuK/haoZb6rpptNmx+Yi5/xG/ou3VMA0IYgeUNH/+Aan MY+01oxp9B87ReaFvU3wSdS32kyCMEOK5CzamcRx9JXeHyNCY4KGwjTjSVxSpyX9Vn0/ WJy4HunNR5ytPTrzPEN8dNSbZFoxn234gWe6KTTmn23x5Y8J6RFq7LID4IrHQV6FPpcz GJhPXhUZssOdt8XPl+pb6xNG0+tijf5XweQM7F1ejAJMP9B5GJeCn7OoVsIw6mFCcE6c EKliazjVmP/AX89udZkekYbTkBXJ3rxnFc+YAjqYAnt3hW9pCuksylKzjtnzDtA0gl8+ 869w== X-Gm-Message-State: AOJu0Yz1d546D/zWg7eOoLV4n9Mvgno5pK/ljetzB6dYjv7jF1z/nF3q pH3SwmxgxrTrv5ggcZWzEIr7mXEJCWA= X-Received: by 2002:a5d:5182:0:b0:319:7b59:8d09 with SMTP id k2-20020a5d5182000000b003197b598d09mr6324236wrv.25.1693667979646; Sat, 02 Sep 2023 08:19:39 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c294900b003feff926fc5sm8244167wmd.17.2023.09.02.08.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:37 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 4D0ECBFCE4; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:15 +0200 Message-Id: <20230902151921.1712373-6-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/11] doc/examples/transcode: improve reporting when the encoder is not found 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bZrs01DwAwBS Also return EINVAL in place of INVALIDDATA. --- doc/examples/transcode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index 3c57fb36c9..dd64c38f15 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -161,8 +161,8 @@ static int open_output_file(const char *filename) /* in this example, we choose transcoding to same codec */ encoder = avcodec_find_encoder(dec_ctx->codec_id); if (!encoder) { - av_log(NULL, AV_LOG_FATAL, "Necessary encoder not found\n"); - return AVERROR_INVALIDDATA; + av_log(NULL, AV_LOG_FATAL, "Necessary encoder with ID %d not found\n", dec_ctx->codec_id); + return AVERROR(EINVAL); } enc_ctx = avcodec_alloc_context3(encoder); if (!enc_ctx) { From patchwork Sat Sep 2 15:19:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43472 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp226305pzb; Sat, 2 Sep 2023 08:21:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQdx9BTlxDAGj4RBOOitCBu2c0m22GcRsltvuYgaj8hm+gpMwPNxli9ps4dBm3w1cVBQ48 X-Received: by 2002:a2e:7813:0:b0:2bb:9847:d96e with SMTP id t19-20020a2e7813000000b002bb9847d96emr3881268ljc.9.1693668069237; Sat, 02 Sep 2023 08:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668069; cv=none; d=google.com; s=arc-20160816; b=Csb/YitIWmD6OzqbLaX6dLxB1lh7tTGvCPwsXHoImKRieLiFyDLyHNBrCXETS1bNM5 zt86CsxhdeO86x8K19/KtsVElMWzhtQ6TRJCKZjHiSAHZMmB92KFHI7koH29MlDAbOuw BTgr0ZxLsSp3iFBUlv7aPNFJvRCUJLzXi4PcqhfA9Fa7DIsYCLVvkQsyuQ8YyPRhAJ2o V8PSuiaN+k2A1pRSYVRQeVJG4O3my1Z7nlKxaETvp8uLBQO1NhSA7KZ53iBKyt4BwEdQ OilNe8ZQeJmlFXx4IqBn7RerRS91wNvm3YR/dI63840H+TvK4sXtHKhbvtS2TBjKVDup faXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=P8LJc0UgaBqX7AtCpRo8RuJwV6BLIFjISY1f5epbAk4=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=jC2C03VHW03rvDGVW4268kVaJgaksJ922uBZY0CosEYSP5E35GZXp7fERmCaJQgasH o5e1KZbFC1AHv9+GHvI07Blbgx86xup6YeGlVsp4I8MQlbEzDSxOz0JohUffrccNo2+1 RqMU/RidDjtPygqey36Q0qn/J0Q3o0UKJeEXLwYHwBS6keJO3C9MOEvKwSZvhWnDSx9F /DeOZf46z5fr0SKPWmxxLzIREqPIP2tNC0jYybGqXettlazZQId9h/uF1fohe04EGGOQ 28HuUVb1MIdt902Dd/qsmXv0tI5peqYVnCUzumf4vdff3+kmxQvmWUuM+QhDCW+QUCo3 ShXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=OYeeJc9k; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb13-20020a170906b88d00b00991df86ac0esi4212258ejb.338.2023.09.02.08.21.08; Sat, 02 Sep 2023 08:21:09 -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=@gmail.com header.s=20221208 header.b=OYeeJc9k; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE0C568C807; Sat, 2 Sep 2023 18:19:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 780DF68C7C6 for ; Sat, 2 Sep 2023 18:19:43 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-31c3726cc45so5700f8f.0 for ; Sat, 02 Sep 2023 08:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667982; x=1694272782; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7CWgUSJ3zhMQVSMczh7VuapFXaTnp/jY/B6d9j9Ot48=; b=OYeeJc9kjHMacoM3LGO5cFIJG1MR1YYvdj0e6nRtFL2QQNGRPghwWtq7aNFlSHmMle slTp0g6ZperBCFV5PHIsVi2ZUwHs4duaCMIXO0muGActx8d2fFRPJGsahBHVrMfQupUj BtT94Ql8U7ahP6X0aLC5n/cMP6yGU44HWXc5+oAo9NxJXFxUwjNJcGDjEbNrpo2EKP+T 7iMGrS+ZOTqery8CltA/hYdl12TXsfSG4eTISLS2w4ZQ6W5HlJBuNRGvloO8a6SRa+V+ B1DvtcVp3g0p5eZryt7qINAcf9bzBrc5qibpM+ExQ+/ojaxKidXceapYINt73fqvbaZ0 onjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667982; x=1694272782; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7CWgUSJ3zhMQVSMczh7VuapFXaTnp/jY/B6d9j9Ot48=; b=WcIT6itPM0f8CkR99HWFcnpX6sjHRa7TfxeIAow7tQV+1e899XD25LXGOVCAwB8KRX fv+sWMTcghtfQHEjZhVb4qsxjrsVUWkAjxE+kPlGq7mHGCuPwG0iPA88JoR5NfMMGc2u sTmgZlxp1r+dTRONKK+9V03Ggnvx/aMRVnL4lOVW7+buOLRy1kEBghLHnF/2HNEbflZ2 qlRoagy+0x4RMe3pDVVF8rDsfDKWnfpKRvUycWCQ4ghe0xy4kvRVSM+JVf/JYBxn3vd0 1BMlE0ADqNW/z2BXpfVPbyD7jqATjhStNvAUv84a7A1Zm4B4hPk38uMv5v0//lEn6o11 YYoQ== X-Gm-Message-State: AOJu0YxysO/xHiqJeAnHI3qDBPyyOXYzlbfCjuxKXcXpdll7rVKAGMyL /zp6LlYAZAFdzUHlELiKckYGp6KCML0= X-Received: by 2002:a05:6000:ca:b0:314:3fc0:ba82 with SMTP id q10-20020a05600000ca00b003143fc0ba82mr3613747wrx.37.1693667981940; Sat, 02 Sep 2023 08:19:41 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id x18-20020adfec12000000b0031989784d96sm8859224wrn.76.2023.09.02.08.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:37 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 50FA1BFCE6; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:16 +0200 Message-Id: <20230902151921.1712373-7-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/11] doc/examples/transcode: use av_buffersrc_add_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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /yI/9AheRIBu Favor it over av_buffersrc_add_frame_flags, simplify. --- doc/examples/transcode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index dd64c38f15..21ea14b614 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -483,7 +483,7 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) av_log(NULL, AV_LOG_INFO, "Pushing decoded frame to filters\n"); /* push the decoded frame into the filtergraph */ - ret = av_buffersrc_add_frame_flags(filter->buffersrc_ctx, frame, 0); + ret = av_buffersrc_add_frame(filter->buffersrc_ctx, frame); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Error while feeding the filtergraph\n"); return ret; From patchwork Sat Sep 2 15:19:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43474 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp226442pzb; Sat, 2 Sep 2023 08:21:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGUPgsWHJu68F7955eIRuTDFLzJrEPCtXQtLy7yc4BAPcqpuGWmOtWj0bEHyj2sOpYMiR76 X-Received: by 2002:aa7:c95a:0:b0:52a:841:bc58 with SMTP id h26-20020aa7c95a000000b0052a0841bc58mr4008755edt.30.1693668087455; Sat, 02 Sep 2023 08:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668087; cv=none; d=google.com; s=arc-20160816; b=ZU8Bl968da3h293Vb0b4YEt8s2t/XDfwwNZc3NOcJMDvcMz/A6IFbmJF/aKI1pubGD BfpIfDC1VPqKmB5XY3hZNEvi2/vM2WJkcmIOrE4zSwjTTeZofojIOgMIzyu/BRtv3JYe qI17bhoTQCfxGrKVFH8NonbtNzQYF46nHX5ULonp9kN7IU2Dp3uj7s+vxnl61NDr1WWh r6HuXZd5Bdm+d80uTQvduJSew+kDrHoak4lX1of8RZuuNVsLE6pFOzju7BO2u/01MtRr Mjcwwkm5TCXRj3+u1zVXwoMlg80RHuAKfNpSGJ5v4b+lGtpxe2v2ctbnJqUvy4oxnXDX 9d0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=fPiFYvSUl6Wh93rKhm6MjXtpVt7oK5dsOXRxUWlt1sI=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=i3VzdJVOfKDxA4j/2hl3pX29mPTaN/z2l4slBqQjL+4FAPKj+LUqGal8iXcubxrWtL BkIWMcR9vUdeJNi8VV0Gyg90rYc8BHdP0BNBxQfoksFvgf2ABsuOQycbRd0ekPnTJ1ju dajd+IXLWvYyHD1kPA2VNKI0LmwoUa9R8vNR74rU0GfD0s97k9MYqd7oE3Ir8ICzmW++ n4hSGkXqow8NuEmHPpAzQiV/m33pkwEp/3is9mQM3uzAH6NzwGtTxnaqrMHDL3jS8pDS 1J5eN9rSa8W/PFr9bA4Tdt35n/VY6Mjm2nQL0XnZUtme5Akp0ZrrsYvTVsYtI9IBCNcu eiEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=LqcUZE3P; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j14-20020a50ed0e000000b0052a6759bcc2si3896285eds.21.2023.09.02.08.21.25; Sat, 02 Sep 2023 08:21:27 -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=@gmail.com header.s=20221208 header.b=LqcUZE3P; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 020E168C815; Sat, 2 Sep 2023 18:19:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DF2068C7DF for ; Sat, 2 Sep 2023 18:19:44 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-401bbfc05fcso479455e9.3 for ; Sat, 02 Sep 2023 08:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667982; x=1694272782; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GkVGkAGXOclUiiPjBHAdvzMybOtrmeAkvI/00gtIB4c=; b=LqcUZE3PejeAKOHd7UEkYixPbugyVmF2IKfeRPGMz5PWeVevqA9IFrZIs1QDUxZDBG /GzcZcMUxMkGmnn59L9pcUU/13Kspjq/n+o8GKvC4ZpWRfhFkaGYUOUZVT7q0G+1A7fD 6EUeKf4Hr2C7M+dvCAyc55K8lgckOopgxFOYCXRWsuZvk1CK9MelF2BpYiTsGwv6tZzW 9YQrcmrcHikX5mtc4cJaooL2AJVXU1N6uL/F0Q5iut2RzUPgJklIHiNGFI3OWtkWHEdx nmcwTNbg3ER9ERBrFgiy/8k8avbKUqDD90j5VADh8vrI4wDM1peOOZe//9fe6YMy+tZU 3lww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667982; x=1694272782; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GkVGkAGXOclUiiPjBHAdvzMybOtrmeAkvI/00gtIB4c=; b=bfU+7N7ZkKziuVTiwVNOeFPhOePUebnHQxnOor2c7VtQ1LMukU05qk8WlUmLcQXH9S UW6oSiaJ3oOZOhSApcEZshZ4jGnKckao8lC8xOVXXKF7UYgKDfDsGGewx0UJKJhj+REH 6wJ47DMDFiKj2/P+azxWFKWF0BMAU+syokoUt30zVC7LsXf4Irw0Axq1dYWZdeRyJ68I qJfF78yinXUCyaB4P6OUg3ynaKyjjI3xkWbAMhy25Op3S7u+Y/wfEkRdNT+EFbErKIAF n8cibhxkaNOaWH94Gxr5LoWiAD9qseAWLCLoKmjAul+8nwCl0JnkeFzJdLjaMtRMAwt+ AHDA== X-Gm-Message-State: AOJu0Yy5KKaKTMXwrWjLXExWc9HGSWToHFqljv3iSRGnDIVDtXonaZHO Tvla8vyB3qOP5sHvgJOB7tq3h7ie/6Q= X-Received: by 2002:a05:600c:2158:b0:401:bdd7:499d with SMTP id v24-20020a05600c215800b00401bdd7499dmr3944132wml.25.1693667982474; Sat, 02 Sep 2023 08:19:42 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id k15-20020a05600c0b4f00b003fee6f027c7sm11256765wmr.19.2023.09.02.08.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:37 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 54D42BFCE8; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:17 +0200 Message-Id: <20230902151921.1712373-8-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/11] doc/examples/transcode: introduce timestamp logging 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cXqDqAM7P5a9 Aid timestamp debugging. --- doc/examples/transcode.c | 43 +++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index 21ea14b614..5671c6664b 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -37,6 +37,7 @@ #include #include #include +#include static AVFormatContext *ifmt_ctx; static AVFormatContext *ofmt_ctx; @@ -435,6 +436,26 @@ static int init_filters(void) return 0; } +static void log_packet(AVPacket *pkt, const AVFormatContext *fmt_ctx, const char *tag) +{ + AVRational *time_base = &fmt_ctx->streams[pkt->stream_index]->time_base; + + av_log(NULL, AV_LOG_INFO, + "%s [pkt] stream:%d tb:%d/%d pts_time:%s\n", + tag, pkt->stream_index, time_base->num, time_base->den, + av_ts2timestr(pkt->pts, time_base)); +} + +static void log_frame(AVFrame *frame, int stream_index, const char *tag) +{ + AVRational *time_base = &frame->time_base; + + av_log(NULL, AV_LOG_INFO, + "%s [frame] stream:%d tb:%d/%d pts_time:%s\n", + tag, stream_index, time_base->num, time_base->den, + av_ts2timestr(frame->pts, time_base)); +} + static int encode_write_frame(unsigned int stream_index, int flush) { StreamContext *stream = &stream_ctx[stream_index]; @@ -443,16 +464,16 @@ static int encode_write_frame(unsigned int stream_index, int flush) AVPacket *enc_pkt = filter->enc_pkt; int ret; - av_log(NULL, AV_LOG_INFO, "Encoding frame\n"); /* encode filtered frame */ av_packet_unref(enc_pkt); - if (filt_frame && filt_frame->pts != AV_NOPTS_VALUE) + if (filt_frame && filt_frame->pts != AV_NOPTS_VALUE) { filt_frame->pts = av_rescale_q(filt_frame->pts, filt_frame->time_base, stream->enc_ctx->time_base); + log_frame(filt_frame, stream_index, "encoder <-"); + } ret = avcodec_send_frame(stream->enc_ctx, filt_frame); - if (ret < 0) return ret; @@ -468,8 +489,8 @@ static int encode_write_frame(unsigned int stream_index, int flush) stream->enc_ctx->time_base, ofmt_ctx->streams[stream_index]->time_base); - av_log(NULL, AV_LOG_DEBUG, "Muxing frame\n"); /* mux encoded frame */ + log_packet(enc_pkt, ofmt_ctx, "muxer <-"); ret = av_interleaved_write_frame(ofmt_ctx, enc_pkt); } @@ -481,8 +502,11 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) FilteringContext *filter = &filter_ctx[stream_index]; int ret; - av_log(NULL, AV_LOG_INFO, "Pushing decoded frame to filters\n"); /* push the decoded frame into the filtergraph */ + if (frame) { + log_frame(frame, stream_index, "filters <-"); + } + ret = av_buffersrc_add_frame(filter->buffersrc_ctx, frame); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Error while feeding the filtergraph\n"); @@ -491,7 +515,6 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) /* pull filtered frames from the filtergraph */ while (1) { - av_log(NULL, AV_LOG_INFO, "Pulling filtered frame from filters\n"); ret = av_buffersink_get_frame(filter->buffersink_ctx, filter->filtered_frame); if (ret < 0) { /* if no more frames for output - returns AVERROR(EAGAIN) @@ -505,6 +528,8 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) filter->filtered_frame->time_base = av_buffersink_get_time_base(filter->buffersink_ctx); filter->filtered_frame->pict_type = AV_PICTURE_TYPE_NONE; + + log_frame(filter->filtered_frame, stream_index, "filters ->"); ret = encode_write_frame(stream_index, 0); av_frame_unref(filter->filtered_frame); if (ret < 0) @@ -549,13 +574,11 @@ int main(int argc, char **argv) if ((ret = av_read_frame(ifmt_ctx, packet)) < 0) break; stream_index = packet->stream_index; - av_log(NULL, AV_LOG_DEBUG, "Demuxer gave frame of stream_index %u\n", stream_index); + log_packet(packet, ifmt_ctx, "demuxer ->"); if (filter_ctx[stream_index].filter_graph) { StreamContext *stream = &stream_ctx[stream_index]; - av_log(NULL, AV_LOG_DEBUG, "Going to reencode&filter the frame\n"); - ret = avcodec_send_packet(stream->dec_ctx, packet); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Decoding failed\n"); @@ -569,6 +592,7 @@ int main(int argc, char **argv) else if (ret < 0) goto end; + log_frame(stream->dec_frame, stream_index, "decoder ->"); stream->dec_frame->pts = stream->dec_frame->best_effort_timestamp; ret = filter_encode_write_frame(stream->dec_frame, stream_index); if (ret < 0) @@ -580,6 +604,7 @@ int main(int argc, char **argv) ifmt_ctx->streams[stream_index]->time_base, ofmt_ctx->streams[stream_index]->time_base); + log_packet(packet, ofmt_ctx, "muxer <-"); ret = av_interleaved_write_frame(ofmt_ctx, packet); if (ret < 0) goto end; From patchwork Sat Sep 2 15:19:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43471 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp226254pzb; Sat, 2 Sep 2023 08:21:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEP4WZakIX8dXpPglar55grhns/O+hKWOxTADZap0Li+Oy6Cxlgx9fCHyF3ZsGoSAKsaQ10 X-Received: by 2002:a2e:7d18:0:b0:2bc:b29e:8ff6 with SMTP id y24-20020a2e7d18000000b002bcb29e8ff6mr3601289ljc.7.1693668060866; Sat, 02 Sep 2023 08:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668060; cv=none; d=google.com; s=arc-20160816; b=KB7OsYK1eiQMDql37EeNz5qV2X8EiEfL49aT5bZbbPw4tn1MpjmO/L4XtkfLsYEWxe 4jkdF2Ze0yW9JFQbuWS/c/ThJGbKTI1fL8m2+NDHQADX/186KOcMzJ+h4GM/KUkV2JE1 pdrA9uiReWnTqT4sgJkljRA57fgWgwVFezSZJXWcJ7Zh8g/zRJTIYJfwHwX1v7C9i1Vb pO+oU49BwFP8kwNDpomt/tF97KsVAKRZMqyBwZdwgDFYzPwytM5vwrBNDG8G7CrobmRd 1PZejgyRmjR1oHb8UVPN1wmy2gZZlYCtK/S1EL+qdL44BbAFy66C44aPopAlvTcW1Mhk xEJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=l/23OiLFhh0MKjzMqaNyfzeBiUnq+2UXjIbucc8YUP4=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=T3J9w+DXby8/0Quid3HMwsdlL1M5Jf5yHbwgYyfcgZgyh61V3vawJJJdq8NskvX0YQ Vhi4Qekmsq9GaIFv3fFyuzN+pftvcO5QCk0YpMhU/3ls0yWZvHn5kZxCrt3UONlk3WOG U61bDMXRVXLoQv6IMwwPML08k/wu7BPKKoqmf5tEbjukFmZKusuY3CqLyZJzTWtMbsX1 894NVD4uClqOZ4aibQudyLVhj6uA0t1qxk1edzHqNhYWB0qK3CagOUlyya1QjlwSV1Z8 VJ2ziU9m0ts0EiTv/LBGdiZIJ0y4VaNvUlXkA98nRyrZZjj1arRogbRluUkcxZvoC8IM OxFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=eILAKa2Q; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ck17-20020a170906c45100b00992550ccfa2si3759444ejb.273.2023.09.02.08.20.59; Sat, 02 Sep 2023 08:21:00 -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=@gmail.com header.s=20221208 header.b=eILAKa2Q; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 824AA68C7FD; Sat, 2 Sep 2023 18:19:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F7E868C7BB for ; Sat, 2 Sep 2023 18:19:41 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-401bdff4cb4so519465e9.3 for ; Sat, 02 Sep 2023 08:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667980; x=1694272780; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YQmU4dt5vZPPA8ODVMkZbJY0SvpOxzjQRYx0P+VCb3g=; b=eILAKa2QlksfnzSV1TRG1OM4yNO/XNYGg1EvsyPOXF6CzaB4v9nJx6U5SEdzcsf3Yi hIzFLjWv/BNCQS3CTeecesNWMgkI3kGUaVM69DeWGQ+btBKUEm2YX86f1s47R3J74jfe caWj7bdGmoGA6k6/v9Wdthg7EhQ5Nnw0gPwYzu/5naY1MynWO4mClIFMwzKDOoxzAaBy XbJlxZ1uOGY9V0QuNcr+13zSpUmEqQk0/uPVtmRkg+cMDwldPrbqUmyIFgj4X69J1rMx otxD/SbN/K6XsNiILhZJ5HLT8z6i/vgnnwzwEukRbhCCAQrMZxTEr+HKH9d6CQwPQaTx KJug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667980; x=1694272780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YQmU4dt5vZPPA8ODVMkZbJY0SvpOxzjQRYx0P+VCb3g=; b=KvfzxLMICZYK3J6VhEYKi7wcpdRMH0ipCARNCMmy+/r7nY8utYm9pH1fJBA3CkQ4y7 gd6KBps51Nzvt3h3jgnpoUxGpz4rXlYF+MxK11rC43xeBp7b06IpWwsptpKLQkb7UBfp CWSuMimVRVrKqal44cEjW4sW8+3VI0NaFg+B/1CG5rxra+BO2+Qt1q3DBTdAst/lBGsG 4habe+UALLDWzZMMFkfCP5+NsQ2pmWIqoI9u3GblYKlAvWUoUYrGzUENBrQJSNVZzFXl p/mqf7ktG9chKgAYibIB2CctsZmEcgBNrc/lxhkDJxGY/04q+Sjcd0KLhdk9vvt8k31s X5+w== X-Gm-Message-State: AOJu0Yx6zasS5HEsbH0e5mRayFuFjOJKq37GPkjIcQQdMUx8p1S+jAoQ CUGwhOa/IUhyLMhp9u3mw7nZ/CvWMpw= X-Received: by 2002:a05:600c:2488:b0:401:b7e0:a43c with SMTP id 8-20020a05600c248800b00401b7e0a43cmr3856890wms.24.1693667980254; Sat, 02 Sep 2023 08:19:40 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id 12-20020a05600c020c00b003fc04d13242sm11640265wmi.0.2023.09.02.08.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:37 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 58B2BBFCEA; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:18 +0200 Message-Id: <20230902151921.1712373-9-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] doc/examples/transcode: use more meaningful labels for filtergraph sinks and sources 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sK1FIHkuaZE5 --- doc/examples/transcode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index 5671c6664b..b94fdbede2 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -280,14 +280,14 @@ static int init_filter(FilteringContext *fctx, AVCodecContext *dec_ctx, dec_ctx->sample_aspect_ratio.num, dec_ctx->sample_aspect_ratio.den); - ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in", + ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "video-in", args, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create buffer source\n"); goto end; } - ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out", + ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "video-out", NULL, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create buffer sink\n"); @@ -321,14 +321,14 @@ static int init_filter(FilteringContext *fctx, AVCodecContext *dec_ctx, av_get_sample_fmt_name(dec_ctx->sample_fmt), buf); - ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in", + ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "audio-in", args, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer source\n"); goto end; } - ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out", + ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "audio-out", NULL, NULL, filter_graph); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer sink\n"); From patchwork Sat Sep 2 15:19:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43469 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp226111pzb; Sat, 2 Sep 2023 08:20:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0YFNwzG212icUMnn413442mEWC5XNROh5NiRGTWdJ7WM/MAHPYeoTbGkHYPaUqRGOJT9E X-Received: by 2002:a17:907:58d:b0:9a2:1b6d:eeca with SMTP id vw13-20020a170907058d00b009a21b6deecamr3604141ejb.44.1693668042716; Sat, 02 Sep 2023 08:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668042; cv=none; d=google.com; s=arc-20160816; b=gdDwv7qM8PsvrNfMkENOeYJHSik6oVp2Evzq0p6Vu9bNQM/pmxGDMPQ/QUbbp3zN7g BfIdT7XfNiRuoaHOelVtv9ItPGZCQL1VwCJ71wxfxccFLwmmfqJNeQOv8yJRmGAqpDUw gpe5fUGJ1EpWiNWZgey1hGbZ/x8u8y6/6N1ji1aEorDq8K3nk/gneaWIcfjgKQ1FNClv 2kGE3dweuGELsI52VETaKEaY6T8FR4zsr/Dwos/Qrb8BXWqLqvx5RkkbrAONFD7DVwPO kRiHvCsYbzt2NHXFUYncevciD+P+yDBbyyWddGLrcNTWNk+q152jRyigpRCG+i8QfHJU vxoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=Gl9kow1ibqEMyRQn6aYg9YtEHWR8n2duEc8+yv5Jluw=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=gY9GFXU97Jw8GCs6vMg97iXSTDIkJL30TZyu0hXzAtiTIlD1ANABEPlfo1F5XtSI9d igBMg38AcVgKd1Cb6Jj/yTqUEK9MnBQVCEbOOjoE8KwVSXUQFtFfyPJOmWf5CsbT+34l YrfOgeOIVw02BkfDC2LT/5gE1P2IaaGf1Wx0hxzgw8HFXaJlZb0oS9m+JZq+B2aO1Ei0 7rZ3+C/zkOHm3gPt2ZJ60N/Fcr1CXXzNa8Aep32+Vm+S9rSZWoQCE2BNsG3+Mq7VtfWi l81Nl/oFohw+TBbYsZce7POCbzqhsETdMsBxyPNXJ5K/Gz1kZVfNJIs67WKmjgXJuS6z SbDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=CEJQB0Mj; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gx17-20020a170906f1d100b00992f7e90360si3642506ejb.727.2023.09.02.08.20.41; Sat, 02 Sep 2023 08:20:42 -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=@gmail.com header.s=20221208 header.b=CEJQB0Mj; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5833768C7EA; Sat, 2 Sep 2023 18:19:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2953268C7CA for ; Sat, 2 Sep 2023 18:19:45 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40061928e5aso460955e9.3 for ; Sat, 02 Sep 2023 08:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667984; x=1694272784; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jirGJkjybvLnmYr4MHJHIuAzkuITBM0Dtn6pzuVhALw=; b=CEJQB0MjUno+HFPCKmWSde6TV0eQO5e4S3qGzfkj3PwROgjRiKdEKp2GhPtwmlQo3n gzi8NiWxiakb6J5zYalcGBh5KOLSc5IghMgKksuwrzp9NtmZrcuFmFUmgxFM0CgjbOq/ QXHv8OrEKzeVXoBR3RbolGlh686TE8eCJFtgPy/9OS3RLfiNBm35XB2nvutyzk9g3zHt qgrGuEurls4jcNPIP0eTyzJoXxgCTtorL18nCWeLm8KWOP9DYMZXOFm7DeXhQgH9nBmI S2Jpx+NH4nFgF7pUNZZlYWBJPNU1Y1ARnjPM0XWEvP5NyFk42wLLM/sZNOtJHeQGXiHL OpGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667984; x=1694272784; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jirGJkjybvLnmYr4MHJHIuAzkuITBM0Dtn6pzuVhALw=; b=ZvQwJFAIKuPvVZ96RR/MAhEC3mc4qgvfoW9Vg84PLVr66/fftrjvJIJCzTPdI0WESz uw4amp6asAk99RnQ2jD4VZya9qlV/11OBQJDnXVJmQtPllcjeTbcdeUHPy9jpKI7aXR8 5P+CxYzrW6a+njqtjK3cbQPgSAt5XPfLZdsmKinc/Ym/IiNmhx/z0u/80cMTLqQ+fIkB FJDOBET66nevJeiWN68khylMmLsENYU8pTvAUehTmIAYTteEn38I2XroFf+xamKc3rPZ +goGaH6UsBRuhJkZSLwbMOWkkr+mv/7B/ZtwRk2I2btWw6jBu9wud+m4AAJcg2kj6y6E BQqg== X-Gm-Message-State: AOJu0YzAxiPPPhg6PIPG6optK2JTUkeHN/ArMC3tWGpEFWv5IaizsO1t Y6tCcyxQojhcuRppYP5qRaszVMXseFQ= X-Received: by 2002:a05:600c:ac4:b0:3f6:58ad:ed85 with SMTP id c4-20020a05600c0ac400b003f658aded85mr3874105wmr.10.1693667984325; Sat, 02 Sep 2023 08:19:44 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id n18-20020a5d4012000000b0031c79de4d8bsm8854204wrp.106.2023.09.02.08.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:37 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 5C672BFCEC; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:19 +0200 Message-Id: <20230902151921.1712373-10-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/11] doc/examples/transcode: fix timestamps scaling 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SWKleTAv8YLT Set pkt_timebase in the decoder and in the decoded frame, use it for the filterchain source, and rescale the filtered frame to the target encoder time_base. This fixes filtering in case the time base was not set in the decoder, causing the error: [in @ 0x5647fc26ec80] Invalid time base 0/1 --- doc/examples/transcode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index b94fdbede2..524bb47f50 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -276,7 +276,7 @@ static int init_filter(FilteringContext *fctx, AVCodecContext *dec_ctx, snprintf(args, sizeof(args), "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d", dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, - dec_ctx->time_base.num, dec_ctx->time_base.den, + dec_ctx->pkt_timebase.num, dec_ctx->pkt_timebase.den, dec_ctx->sample_aspect_ratio.num, dec_ctx->sample_aspect_ratio.den); @@ -303,6 +303,7 @@ static int init_filter(FilteringContext *fctx, AVCodecContext *dec_ctx, } } else if (dec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) { char buf[64]; + buffersrc = avfilter_get_by_name("abuffer"); buffersink = avfilter_get_by_name("abuffersink"); if (!buffersrc || !buffersink) { @@ -317,7 +318,7 @@ static int init_filter(FilteringContext *fctx, AVCodecContext *dec_ctx, av_channel_layout_describe(&dec_ctx->ch_layout, buf, sizeof(buf)); snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=%s", - dec_ctx->time_base.num, dec_ctx->time_base.den, dec_ctx->sample_rate, + dec_ctx->pkt_timebase.num, dec_ctx->pkt_timebase.den, dec_ctx->sample_rate, av_get_sample_fmt_name(dec_ctx->sample_fmt), buf); @@ -470,6 +471,7 @@ static int encode_write_frame(unsigned int stream_index, int flush) if (filt_frame && filt_frame->pts != AV_NOPTS_VALUE) { filt_frame->pts = av_rescale_q(filt_frame->pts, filt_frame->time_base, stream->enc_ctx->time_base); + filt_frame->time_base = stream->enc_ctx->time_base; log_frame(filt_frame, stream_index, "encoder <-"); } From patchwork Sat Sep 2 15:19:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp226182pzb; Sat, 2 Sep 2023 08:20:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGa9FHQm54NLsGn/QUoFWbQ6y0wZkeKDrvpB6aQfeyHoNz4nkgB/BwQfoa7jAMPl7XCdKmO X-Received: by 2002:a17:906:76c8:b0:9a1:bcf9:4f99 with SMTP id q8-20020a17090676c800b009a1bcf94f99mr3503518ejn.36.1693668051578; Sat, 02 Sep 2023 08:20:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668051; cv=none; d=google.com; s=arc-20160816; b=hGqIe1Fbyi16cP3mJvvhSyOQ65RI7NKec7CCvL5gcDHdZ+1Jms7non6a8gkKXt1xwK RUQ7pCBKQ3B6k2c91xL1S+lWcGBIZMc4RntgGrYdgkSBfehT5B0WFmQDXHpjgQzKqoZ/ WRThEAP0qKmkwFikSi4yT2X7x3c29qBgzOYA2u73exsK6QHEmnVo6/1Q7KhEEc54obhm JC9efOHjbguG4S5kFqqP8xNxlKeGRNeAbEXXvNBB4Q0MhErsptdjW8+QFftwAt/8SzKr q3tjyZZuWHyMb8mQMJ8CIC51FQGBI3jUR9xasQPunkfp3j22+DZES3jBdv1Hb9Q1cqns Zs9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=2ayyncz0y4C4Jh2N3eJfwzMJZ7uDObeqo45dMGGPbtk=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=okjB+G273+5xmgJg/hyCkFBUfZSvsR+W522n174NT739qXJ/FSMeivfdl7tC7nA3K4 gIG1AIsmaGwSeMIV+tVKUGf/pMkT5sve4PdcZuZCpXealF2m0WIx9FOmmdVptQ+xfRxd 8pz/SsLn3sW05HqZzgzbDLTfLK0cNAOAJSWxeumrgesBZIkGeRMPMdnJjRWCZw7WO1p9 hw7BbfrmfuMbe972jDeZVm7pl1wyEnkYb0dQFb+WvNmxAA1zXOdjM/P5rl+XkujQc+hM W22MjepdWYMmeRTz6ZUt5Nx4E5GoOiTM5i9O09QoQE7du3dO6oGQE7JNJU7IxLIiyuV/ jItg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=MmsmbzZ4; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rs10-20020a170907036a00b009a21af2dd2esi4023366ejb.612.2023.09.02.08.20.50; Sat, 02 Sep 2023 08:20:51 -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=@gmail.com header.s=20221208 header.b=MmsmbzZ4; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AF1568C7F2; Sat, 2 Sep 2023 18:19:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E71A68C7BB for ; Sat, 2 Sep 2023 18:19:46 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-31ae6bf91a9so2511488f8f.2 for ; Sat, 02 Sep 2023 08:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667985; x=1694272785; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DODfSd3CyBS4rxIoUggJVmRhc5p6zBdTqGXyhJmoXo0=; b=MmsmbzZ4pUjpVtCYQxPN0qp3RGcM7CmWgatu1MI22NQFekvpaunZ9qgxIJFtkIQYqv w8p1qKyRPw44XYVZyfgPq4QofLusV9a7AhnnKf3e5V8pBVzh3aiiFgqW1IaJgHUxHdHG UtCUIFdTLSmnUrT1ros+uZ70XP8rWsGov60v0gCW/fjaO+o0ES8GaIEThLxNUdlEldjw 3GaoLUDCdqEL6Ruwp04G2szJO7V93rJi1Gu3vDffzWuD2YBhzKwRfpMH9lZs/iWM+ScM BryB3KXJ2i2nyUKC7vjQK49sap7b35kV1ygAXl3n96k5JCBnNGiBzIFEprv127W6IKyq e3oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667985; x=1694272785; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DODfSd3CyBS4rxIoUggJVmRhc5p6zBdTqGXyhJmoXo0=; b=YatRgSROSM/KZN18MA8Eu0cpL88WLsXlCPYboKSJkso7gerFyWAifxJOpciu6t7HK4 R337DzsUOPC4FLx4gJDquM+SqnYhJWKA/4e2BK9ilavtsNwQqaYgn4/C4CAgyDGHGtGT QWRKCUtWsv3K3xJS4tDZ+OImWocA8JOYFQX0Y4em9ydABncrTT0SELBPHyAn2aMNX1Pz 2JMAqr5AjtN9r4wznJWlwsd05rdnEkgX0I0UaY9VJoDU911GxpwWzFtJb7PmAwjZJa0L UQjggKTGcn9VTA8fV42kGsXOOkbUfbUlpGr7pmvLvOAWsm0/CHwVs/sihuwLXC130tV0 MHhA== X-Gm-Message-State: AOJu0Yw1meukNG6ZiAiiF//u1UEe7MtdZEIHOonAd6Xa2piItbT57EDr jmujyyyGl/gvFocSqZB44fW0uDj4DwM= X-Received: by 2002:adf:f512:0:b0:31a:c6ef:5edc with SMTP id q18-20020adff512000000b0031ac6ef5edcmr3847425wro.12.1693667984925; Sat, 02 Sep 2023 08:19:44 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id x9-20020adfdd89000000b003196b1bb528sm8876044wrl.64.2023.09.02.08.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:37 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 60669BFCEE; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:20 +0200 Message-Id: <20230902151921.1712373-11-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/11] doc/examples/transcode: simplify selection of pix_fmt 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gzyz01bM8aUS Use ternary operator. --- doc/examples/transcode.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index 524bb47f50..1d22a4b09e 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -178,11 +178,10 @@ static int open_output_file(const char *filename) enc_ctx->height = dec_ctx->height; enc_ctx->width = dec_ctx->width; enc_ctx->sample_aspect_ratio = dec_ctx->sample_aspect_ratio; - /* take first format from list of supported formats */ - if (encoder->pix_fmts) - enc_ctx->pix_fmt = encoder->pix_fmts[0]; - else - enc_ctx->pix_fmt = dec_ctx->pix_fmt; + + /* take first format from list of supported formats or use decoder one */ + enc_ctx->pix_fmt = encoder->pix_fmts ? encoder->pix_fmts[0] : dec_ctx->pix_fmt; + /* video time_base can be set to whatever is handy and supported by encoder */ enc_ctx->time_base = av_inv_q(dec_ctx->framerate); } else { From patchwork Sat Sep 2 15:19:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43473 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp226372pzb; Sat, 2 Sep 2023 08:21:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPVGc6y55t6SVH4U8vxoMpzyCUfkYgWtECWOsgJajAsI1NScY5+eIHOjI7wxfl9hnI7LWX X-Received: by 2002:a50:fe8e:0:b0:523:4b92:9cf8 with SMTP id d14-20020a50fe8e000000b005234b929cf8mr3862371edt.29.1693668078077; Sat, 02 Sep 2023 08:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693668078; cv=none; d=google.com; s=arc-20160816; b=Ze000LwzwD5kUnRsVQwHje1dQspOOWv/T1KgF8kbQlYYjA1n3uVRveLwAXyxzKUYNT fXUVeZmwxZsPf9SlCl+5/x5yf7ycx/JIxcWgaOB5Y7CyLU674VqVwybd7QE+NHAjHyEo eAjo/xu7vrDwZC0Q9/OW7vRfZdOeal/1KNB0fzu+lmccvcHElFRbCXtIM0q1t6S9UKep cJ8fg0ivSrfBIjmcz7HXEATGdv2MTnqXwv6NPwpKqqKSzDsNAH1dPS8CB5141eBf1M6S vRH9wYK4RJNlvTjf8WHV3noV0T4NA/vGizJVnfa4ZP6n8OQPuXwNKk2ZoAMjNxdAtABz qgRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=L9mAfdJYBmFg2xZq4Nfg8oWDHyKZqS8/UrbKoSK68Pk=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=1A3AEJoiuUIcnAKVkzuOJpiltXDiyqD2Oxrxb+HJpMgyA3cBYLtN2PiHZf1cjuNRjF pDIfNXA+wZnHykiU40QYNiS1z+4rICX+KuCtWMayR6xAZgnwy8wSmIKa1q+XRfKecdJw tb4kQ1Dmj2u1TlbjKcv5MRMh7IXiZIz8jer/M9Z/u90FbRnb5CM8V8gT+rb/5A9ZiU8I ypCoVxRiuFlnBI5JHYf29IDa9sVG4ZnmfEnKRA4tfxhPi09QIJkY0ICiw41YO0Nw/rny c+Cmq9r6vmDlw/P1w1QXn9JBYpD5pnpkDHBZjkzLrsNWHhs948bzl3KlagbgptWwvJVZ HbdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=CFP4TxHa; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c21-20020aa7d615000000b0052683da3e48si4072358edr.454.2023.09.02.08.21.17; Sat, 02 Sep 2023 08:21:18 -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=@gmail.com header.s=20221208 header.b=CFP4TxHa; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABAA868C80D; Sat, 2 Sep 2023 18:19:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A21FE68C7DF for ; Sat, 2 Sep 2023 18:19:48 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-401b0d97850so485535e9.2 for ; Sat, 02 Sep 2023 08:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693667987; x=1694272787; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TiuioRK69WMnvph+BIXBPdqlB7K7prjD/Hcq0NcIt1U=; b=CFP4TxHaRV1ZGsJlB6xSTZMUTp/PDJGSUuY4gY/1LFb2qTnezTtwSP9rhsrX179cpl I9ZDBSZA2cnNQEPgHbNJGT/vk2zU70AvpOLZDd74G2rK70azTBBu6nsbu7a/NOAhMWl4 ITnp0RBL9DLLLSuCZOMSIXRqF8sqC88RebWJgQlGWfAE6bmkW5/FiVrV6XqwsmgH0/8X sU/71KFA/Loy8NftHOlpX1RZCfm1otduN3N0Scu0oKitXKA/LlvhFazN1M1vxMeUK4c/ poiXcRag4qTqawITNr4etmBy7BG2mDOLWc/QV8m35n6kSCHkGEdmLL4OK2ZfpBHaOuoP aRYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693667987; x=1694272787; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TiuioRK69WMnvph+BIXBPdqlB7K7prjD/Hcq0NcIt1U=; b=KJHSBhFTphpUkOiQd9dQk6wdKrCpUzXyiKkVcxAKyyiUYvVryToGp30HD7fHGvR3RC cFAhlMwvTpjHLFkNoip9aLJhLxxqYPYf5webUE7Ddkg0u2PlWnhzLD3ZsP2PbA8F37Zf pz0grriJ42cZrifrL/v7B+GJVlXAKgO5f75jLXJvLLc1NsufHIEWBVTa840WmEOwzT4k 8VeQJvHIC+aQKBhdYHoq11jYruGKncC40roc0bd7145QHViB+b+HDad7p8gWlU56QE0m WpN9B8C3Q1Knet9gn21CtxWtvZLWqw8tyc78s9f99Eda/lIZYA9HpX/W76/c8HjavHh7 WfSw== X-Gm-Message-State: AOJu0YxUQBWfI6PER8p21gouTbW6Tl5J1X0tfDvTJ9WwYQTn+h6lL0DL i/yYe1qxSiBYweWnq5m9NCTYjikUvuU= X-Received: by 2002:a05:600c:446:b0:3fd:2e1d:eca1 with SMTP id s6-20020a05600c044600b003fd2e1deca1mr4191841wmb.4.1693667986705; Sat, 02 Sep 2023 08:19:46 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id y11-20020a1c4b0b000000b003fe2b081661sm11295277wma.30.2023.09.02.08.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 08:19:41 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 640B4BFCF0; Sat, 2 Sep 2023 17:19:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 2 Sep 2023 17:19:21 +0200 Message-Id: <20230902151921.1712373-12-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902151921.1712373-1-stefasab@gmail.com> References: <20230902151921.1712373-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/11] doc/examples/transcode: fix selection of sample format if not set in encoder 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZWY8qWMpAHwV Fix crash occurring when the list of sample formats is not defined in the encoder, use the decoder one in that case. Possibly fix issue: http://trac.ffmpeg.org/ticket/5849 --- doc/examples/transcode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index 1d22a4b09e..3c72b9377e 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -189,8 +189,10 @@ static int open_output_file(const char *filename) ret = av_channel_layout_copy(&enc_ctx->ch_layout, &dec_ctx->ch_layout); if (ret < 0) return ret; - /* take first format from list of supported formats */ - enc_ctx->sample_fmt = encoder->sample_fmts[0]; + + /* take first format from list of supported formats or use decoder one */ + enc_ctx->sample_fmt = encoder->sample_fmts ? encoder->sample_fmts[0] : dec_ctx->sample_fmt; + enc_ctx->time_base = (AVRational){1, enc_ctx->sample_rate}; }