From patchwork Sun Jan 26 15:12:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Federico Simoncelli X-Patchwork-Id: 17561 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BC06C44BEF9 for ; Sun, 26 Jan 2020 17:23:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7D3C68AD52; Sun, 26 Jan 2020 17:23:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DCE468982D for ; Sun, 26 Jan 2020 17:23:36 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id p17so4272155wma.1 for ; Sun, 26 Jan 2020 07:23:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=krW4hj8W5E2u57T1Em8J5xOzJDUIYlRDLSqw7Udz/8I=; b=AOqY+A0M8ARSrZwzJT+wWmOFZlXXAJI1PFWlNcXC1egqDia5GN7u3lxXYOUjfHPBsp 24LGKdGjJNAIKFlXZI3bV8SB5JjoI9kQFdiX+iNsUUUMCF56Z9wibfSAzWke0wlEt2ZW OliLchoO87HdX3cjfsvqUiS5AfpzQg4t4RyAtCP18vZWlU7hb+5pyRT/Rk2OXul0qrhD wlXxvch5rjMo+Ns+wBe8ybxzdqLTJ3zVfzn7jlRynBOqiH3fzGa3EG7daFEfHxED3t7U jKdkpBmNKj8weNYyhOSfUO4XQUvFo6YQm/VjrbEKBUP6JD3Lrtjtk/+tYXSrC4xqrDqk +wLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=krW4hj8W5E2u57T1Em8J5xOzJDUIYlRDLSqw7Udz/8I=; b=dTnd7uf+y7UpGX9O9chU0xKMFXGaT0UrLNmwRNlYRnkQECacZFs7/tlf+qmi5drcnL OA/8qz8iSn8Ttt9ncJfQMmdrdTALm7JWutH4ZPkCRiLZx3P/qVhjbGCfgTuSNjgWB3Jg c7Vf8TB2dweSUy/IPW2P5ASEITSkYOGgkewmhfm3A7Gpy/bYnACnUVcuBShqJceyALAQ plFwnSjmD97zwQsyx/vpjcSKk/svogkPYOa+dSlrEihgH6c1Q3Hrb3ADCZPBiRtZrd9x jpydRMQhZ6PAyYkDiPxowkgTWW4o08sSE5Bjm11EYvsQIy5Yf4VYbercKN3cskd+AcUy 4hjQ== X-Gm-Message-State: APjAAAVFRPXH3P+l480eSGEqlUXTe3o/BgRmgvDPzM5gpotuNdeMRMoO /49KNF3/ROVbPczgIi+Hu6Roz8TYAxc= X-Google-Smtp-Source: APXvYqxMSmBfTOpp2Fgnm6fHkjXR3BKA0GwFY0WlGkbsnW7D/iMUXAiEra6oOVsHEp+0wZiyVLgL9g== X-Received: by 2002:a1c:b7c4:: with SMTP id h187mr9401481wmf.105.1580051717542; Sun, 26 Jan 2020 07:15:17 -0800 (PST) Received: from nipah.in1.bytenix.com (host248-61-dynamic.26-79-r.retail.telecomitalia.it. [79.26.61.248]) by smtp.gmail.com with ESMTPSA id b17sm16597868wrp.49.2020.01.26.07.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2020 07:15:16 -0800 (PST) From: Federico Simoncelli To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jan 2020 16:12:50 +0100 Message-Id: <20200126151250.38764-1-federico.simoncelli@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avdevice/pulse_audio_dec: identify channel layout X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Federico Simoncelli Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This patch adds the attempt to identify the pulseaudio channel map and when possible set the relevant channel_layout parameter of the codec. The result is an improvement over the current behavior of guessing the layout based on the number of channels (for more information see guess_layout_max). --- libavdevice/pulse_audio_dec.c | 37 +++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c index 50a3c971ae..2f76cfd474 100644 --- a/libavdevice/pulse_audio_dec.c +++ b/libavdevice/pulse_audio_dec.c @@ -135,6 +135,34 @@ static av_cold int pulse_close(AVFormatContext *s) return 0; } +static int pulse_map_to_layout(pa_channel_map *cmap) +{ + const char *map_name = pa_channel_map_to_name(cmap); + + if (strcmp(map_name, "mono") == 0) + return AV_CH_LAYOUT_MONO; + + if (strcmp(map_name, "stereo") == 0) + return AV_CH_LAYOUT_STEREO; + + if (strcmp(map_name, "surround-40") == 0) + return AV_CH_LAYOUT_4POINT0; + + if (strcmp(map_name, "surround-41") == 0) + return AV_CH_LAYOUT_4POINT1; + + if (strcmp(map_name, "surround-50") == 0) + return AV_CH_LAYOUT_5POINT0; + + if (strcmp(map_name, "surround-51") == 0) + return AV_CH_LAYOUT_5POINT1; + + if (strcmp(map_name, "surround-71") == 0) + return AV_CH_LAYOUT_7POINT1; + + return 0; +} + static av_cold int pulse_read_header(AVFormatContext *s) { PulseData *pd = s->priv_data; @@ -245,10 +273,11 @@ static av_cold int pulse_read_header(AVFormatContext *s) pa_threaded_mainloop_unlock(pd->mainloop); /* take real parameters */ - st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->codec_id = codec_id; - st->codecpar->sample_rate = pd->sample_rate; - st->codecpar->channels = pd->channels; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = codec_id; + st->codecpar->sample_rate = pd->sample_rate; + st->codecpar->channels = pd->channels; + st->codecpar->channel_layout = pulse_map_to_layout(&cmap); avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ pd->timefilter = ff_timefilter_new(1000000.0 / pd->sample_rate,