From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id E10454C79B for ; Sat, 8 Feb 2025 02:53:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE58668B981; Sat, 8 Feb 2025 04:53:51 +0200 (EET) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92B1968B5F8 for ; Sat, 8 Feb 2025 04:53:44 +0200 (EET) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21f6f18b474so894095ad.1 for ; Fri, 07 Feb 2025 18:53:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738983222; x=1739588022; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=i6rGSXvCzcI7SwFIyM8ZMgBCGBGST3LbOL0w0+MwHz8=; b=SJAcbHqNbEUUu6wHugn/6/FuXtoieEyA7mW1y4e0saed/Tiyw6nr4ExDllM7Y+DE8K 46P0ESUrUhzWtrNmXG38tYg4JfvANVU79EQrVcpwNPoClST8WQoJmQiCM/iW5GRA6bws oi+utmVW5KqRu7UbHH1G7KKx9uSgG687L9+hzHDCX3yPryLXexVFD8KPgfGQiOEAK3Sv w2AY9ufopLklkjIKZyVocqC+FDNO6Q6vW5dwZnqJFhkOhjaCOS1dV3C9yZ0lzdgh30k3 UWCs9bLJXZ5lNYuMR2cuO1O9INoRdMkSQrJfyweuiM0bRX+KnUPBE+yqDGv0M8+NWz5Z U4Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738983222; x=1739588022; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i6rGSXvCzcI7SwFIyM8ZMgBCGBGST3LbOL0w0+MwHz8=; b=giMQoZBm7kIKHL35Tu17AWCBhAyXOZMVzZNpRWc+WXrSL2VHqqqOllixtT70muyteV zN2yC4j8S4TBmtL9TodPGL0Blmw0KGQSUtcZ2nFV4H4RMdSMxW4qr+OA8f7T7cTSn22v UIjqiN5ujJwBtIwoMxLne97HI+rte/7CSz1EdB1U7cK++qlGpwSTqDwylGRJGiR4oqdB H3lt+jKMaxb2+hmud4my0INws/PdF9y15H3iTAigMw4FbPPL0Fe2jOOvsACyjoK+KqID yU+77QNrS+CJjjRJi9dh9AoU2+p6bEcmJJChCHHWfAS0DN4WI240IfSw9yWrZejPYtXd O+GQ== X-Gm-Message-State: AOJu0YyaWYwnIM7oPxnGVtWVxdwls6IaaiVH7GnJFi++xydpVs+VwyTt w9arX69BdNffmfSQkM4MkoJQ/oDMOL08Ba8BgEocpkyVvbuo51ILKKuPQNZP X-Gm-Gg: ASbGncu+LuSU2fMKRZKiRdyuH6GSk2BpFQ23MVmKwK0iF6BvzC7zzFDR1WkUCFLxir1 UQZTDYiDaBjVEgoQ3GAMTXGUxfY0GNQfvbkfe798gcD7SEVn5PLJx13tsnksQjpxwaN3UKuGf5L d/uolq27yVBfEcTYt2x8Ros1WFC6CpHAoSZa1sjTx3Q75ZJdpB0D+I513bivpSjkWHOYlJXfJNw 6wnLpcQIBc91cA07Z9IX69aWt4JC/bHWesUq4bKGowutDEAZhoSm6t+0qwvAcx1jnG/9dN+W8fD BXOsLxaBztlTILKl1zz2GNM555uHL1M0 X-Google-Smtp-Source: AGHT+IFanFMATdJdX9SHvFlriKSs8Z0cSj/QYmS2rIB89Nqgg86qCIiKaQkWAN+JMkSxKapZr+rfTA== X-Received: by 2002:a17:902:cf08:b0:21f:683d:de0f with SMTP id d9443c01a7336-21f683de0bcmr30805765ad.22.1738983221510; Fri, 07 Feb 2025 18:53:41 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:d1b4:52e7:1b9b:e89c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f36882dd7sm37725865ad.199.2025.02.07.18.53.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 18:53:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Feb 2025 23:53:27 -0300 Message-ID: <20250208025327.7733-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avdevice/alsa: simplify passing ff_alsa_open a channel layout 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This also ensures the layout set during the indev init is used instead of the blank one in st->codecpar. Signed-off-by: James Almer --- libavdevice/alsa.c | 14 +++++++------- libavdevice/alsa.h | 4 ++-- libavdevice/alsa_dec.c | 2 +- libavdevice/alsa_enc.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavdevice/alsa.c b/libavdevice/alsa.c index d62ccc09c6..cfdb28ff49 100644 --- a/libavdevice/alsa.c +++ b/libavdevice/alsa.c @@ -127,7 +127,8 @@ switch(format) {\ case FORMAT_F32: s->reorder_func = alsa_reorder_f32_out_ ##layout; break;\ } -static av_cold int find_reorder_func(AlsaData *s, int codec_id, AVChannelLayout *layout, int out) +static av_cold int find_reorder_func(AlsaData *s, int codec_id, + const AVChannelLayout *layout, int out) { int format; @@ -172,10 +173,9 @@ static av_cold int find_reorder_func(AlsaData *s, int codec_id, AVChannelLayout av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, unsigned int *sample_rate, - int channels, enum AVCodecID *codec_id) + const AVChannelLayout *layout, enum AVCodecID *codec_id) { AlsaData *s = ctx->priv_data; - AVChannelLayout *layout = &ctx->streams[0]->codecpar->ch_layout; const char *audio_device; int res, flags = 0; snd_pcm_format_t format; @@ -193,7 +193,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, av_log(ctx, AV_LOG_ERROR, "sample format 0x%04x is not supported\n", *codec_id); return AVERROR(ENOSYS); } - s->frame_size = av_get_bits_per_sample(*codec_id) / 8 * channels; + s->frame_size = av_get_bits_per_sample(*codec_id) / 8 * layout->nb_channels; if (ctx->flags & AVFMT_FLAG_NONBLOCK) { flags = SND_PCM_NONBLOCK; @@ -240,10 +240,10 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, goto fail; } - res = snd_pcm_hw_params_set_channels(h, hw_params, channels); + res = snd_pcm_hw_params_set_channels(h, hw_params, layout->nb_channels); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "cannot set channel count to %d (%s)\n", - channels, snd_strerror(res)); + layout->nb_channels, snd_strerror(res)); goto fail; } @@ -277,7 +277,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode, snd_pcm_hw_params_free(hw_params); - if (channels > 2 && layout->order != AV_CHANNEL_ORDER_UNSPEC) { + if (layout->nb_channels > 2 && layout->order != AV_CHANNEL_ORDER_UNSPEC) { if (find_reorder_func(s, *codec_id, layout, mode == SND_PCM_STREAM_PLAYBACK) < 0) { char name[128]; av_channel_layout_describe(layout, name, sizeof(name)); diff --git a/libavdevice/alsa.h b/libavdevice/alsa.h index 3e1ba31384..d3dfa478c5 100644 --- a/libavdevice/alsa.h +++ b/libavdevice/alsa.h @@ -72,7 +72,7 @@ typedef struct AlsaData { * @param mode either SND_PCM_STREAM_CAPTURE or SND_PCM_STREAM_PLAYBACK * @param sample_rate in: requested sample rate; * out: actually selected sample rate - * @param channels number of channels + * @param layout channel layout * @param codec_id in: requested AVCodecID or AV_CODEC_ID_NONE; * out: actually selected AVCodecID, changed only if * AV_CODEC_ID_NONE was requested @@ -82,7 +82,7 @@ typedef struct AlsaData { av_warn_unused_result int ff_alsa_open(AVFormatContext *s, snd_pcm_stream_t mode, unsigned int *sample_rate, - int channels, enum AVCodecID *codec_id); + const AVChannelLayout *layout, enum AVCodecID *codec_id); /** * Close the ALSA PCM. diff --git a/libavdevice/alsa_dec.c b/libavdevice/alsa_dec.c index f0738e3dea..63409a7785 100644 --- a/libavdevice/alsa_dec.c +++ b/libavdevice/alsa_dec.c @@ -80,7 +80,7 @@ static av_cold int audio_read_header(AVFormatContext *s1) } #endif - ret = ff_alsa_open(s1, SND_PCM_STREAM_CAPTURE, &s->sample_rate, s->ch_layout.nb_channels, + ret = ff_alsa_open(s1, SND_PCM_STREAM_CAPTURE, &s->sample_rate, &s->ch_layout, &codec_id); if (ret < 0) { return AVERROR(EIO); diff --git a/libavdevice/alsa_enc.c b/libavdevice/alsa_enc.c index 0b4c7834f7..971cff688c 100644 --- a/libavdevice/alsa_enc.c +++ b/libavdevice/alsa_enc.c @@ -66,7 +66,7 @@ static av_cold int audio_write_header(AVFormatContext *s1) sample_rate = st->codecpar->sample_rate; codec_id = st->codecpar->codec_id; res = ff_alsa_open(s1, SND_PCM_STREAM_PLAYBACK, &sample_rate, - st->codecpar->ch_layout.nb_channels, &codec_id); + &st->codecpar->ch_layout, &codec_id); if (sample_rate != st->codecpar->sample_rate) { av_log(s1, AV_LOG_ERROR, "sample rate %d not available, nearest is %d\n", -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".