From patchwork Mon Sep 23 15:01:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2523222vqb; Mon, 23 Sep 2024 08:09:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4uId7oe/CrrZMkmoXfRl/Mltwg2Q6BHedQRxwHv8Zq2coTPQnz0LfmZux/p598Xj19laHyAThSkiYJYYWqzoC@gmail.com X-Google-Smtp-Source: AGHT+IGqwJPK+feyBI5jwXZLHqvweQFJcZByLzYH3s9VISlhCurEvU1hhtmdYPMubnHd7+yGe+fO X-Received: by 2002:a17:907:e246:b0:a90:d1e1:eeb3 with SMTP id a640c23a62f3a-a90d50d0521mr1109611566b.44.1727104176062; Mon, 23 Sep 2024 08:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727104176; cv=none; d=google.com; s=arc-20240605; b=A3KMd9kZOkM5Wa4VZVWSI1h5lEWZoUEr1clsqPeFne1t8Z6o0bZLOmFHhfbOBUQ1Ka 6zh8WE3fJqqt2bKLwQzUBLMMBxyPxWYaf8+7AoQwBLGcdUs9jCgqj94CCSH+XxzfNK9S 5bdsV2qCWSRj7qWLghQ6AMLsgPfdQMFB1MYXZQJaXSkbDTJvP2jSgxVwq2lFoSgASVIO RIR4PbY8kCn2N/1qdPyudvtwGG5mkDh3FgcQTRicAH6kOtl6jcgj/wm+FByV/zGlSduB bicVTb9GIwhAvN/anBs9tRJgzqgtwFxJivYaJ9uQPEtEv5wT7vItSkuHYXBom5ixZRsG 1+lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xFRbxv+3HV9RowTSaAqMJRafP74f1RXGn6i3lnjKLvE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=B7dhKx4YxlFKcQIWeYmC66fbBJQzribJbxQltN4105REgJsR356PADeSXupAY8m8sG jJkZGtVqzB8m5ZYCtiFP8MGt2SdMdeNioKnSEYhuj21TfV36nugHMk62dXxrps3wTqei PA3JfkkrgUWlGmE0VRiROMCElyyhfYqAFWX4yXldzQPBDC19cEnstq8V2sPi/a/EcJRe NQ5IUSMtQ1dXSqOS+02kZgTltmhtdZgqgFC6lbU2jrgsc2P2mTWBrQYiWJGHiWzqQZkL kVL13YVeUMRPAQQwm6/+l2JPee2dVGx7Myi6EEoA/PPEFhoXMVLHR+oNoRKKBijpNHgj 7rpQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=dGuCh+ql; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a906109a74bsi1434576566b.38.2024.09.23.08.09.35; Mon, 23 Sep 2024 08:09:36 -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=@khirnov.net header.s=mail header.b=dGuCh+ql; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 047DF68DBCF; Mon, 23 Sep 2024 18:02:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDFBA68DC55 for ; Mon, 23 Sep 2024 18:02:11 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=dGuCh+ql; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id C779D1F8 for ; Mon, 23 Sep 2024 17:02:06 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Q2Ks3vyCtLzU for ; Mon, 23 Sep 2024 17:02:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727103724; bh=t3QYQIhgETLYVbJt7SjsppQAt5GN6lhxnGMjugVhjxc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=dGuCh+qloF+OkcORE90+TRaEN/2KpAzuRcVorNyxy7es86X4JHEqYxdW9/nNTJGta QGHtjvu66prhuAhTCI+ituDlaqBVD5m71AuKGEvygNdjrkhR8kFim1HR+anPBRjYUX LAWz7FSpwszHZYx7+sW34vqfxxMF7ba/dwMklcZgaMhN88lKqFeYv0pALtBSEbC+aU IDS8xRVEj+8heiVF7E6h2IAcOmqxcl/OfZsPrzJjduZchSIhqZhID6sMyRtlSwhDnj Ka0ZP7X/oc3izdz+RQP/IX0yAkmm0z7MKWkJ5BoM5JyOtMRdjODYX14Wo4ecrlAx7n rJmVWKhKyM85g== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 74D454DF5 for ; Mon, 23 Sep 2024 17:02:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5EF793A0F41 for ; Mon, 23 Sep 2024 17:02:04 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 17:01:43 +0200 Message-ID: <20240923150146.31693-5-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240923150146.31693-1-anton@khirnov.net> References: <20240923150146.31693-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] fftools/ffplay: use AV_BUFFERSINK_FLAG_PARAMS X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eKKWgA0/KETT --- fftools/ffplay.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 4ea48e11bb..ef45f12906 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2702,6 +2702,7 @@ static int stream_component_open(VideoState *is, int stream_index) case AVMEDIA_TYPE_AUDIO: { AVFilterContext *sink; + AVFrame *params = NULL; is->audio_filter_src.freq = avctx->sample_rate; ret = av_channel_layout_copy(&is->audio_filter_src.ch_layout, &avctx->ch_layout); @@ -2711,10 +2712,23 @@ static int stream_component_open(VideoState *is, int stream_index) if ((ret = configure_audio_filters(is, afilters, 0)) < 0) goto fail; sink = is->out_audio_filter; - sample_rate = av_buffersink_get_sample_rate(sink); - ret = av_buffersink_get_ch_layout(sink, &ch_layout); - if (ret < 0) + + params = av_frame_alloc(); + if (!params) { + ret = AVERROR(ENOMEM); goto fail; + } + + ret = av_buffersink_get_frame_flags(sink, params, AV_BUFFERSINK_FLAG_PARAMS); + if (ret < 0) { + av_frame_free(¶ms); + goto fail; + } + + sample_rate = params->sample_rate; + FFSWAP(AVChannelLayout, ch_layout, params->ch_layout); + + av_frame_free(¶ms); } /* prepare audio output */