From patchwork Thu Jan 13 01:50:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp21564iog; Wed, 12 Jan 2022 18:07:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2FKQ7hXpE4rRBYwoLw8E6C9lj2qP75eBKa9usWY+CYQ2kdyXT4/2U5Ow8/goVx0R+Od6L X-Received: by 2002:a17:906:1ccb:: with SMTP id i11mr1789058ejh.135.1642039622221; Wed, 12 Jan 2022 18:07:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039622; cv=none; d=google.com; s=arc-20160816; b=frTvb1XkIDSQCTa6ARBHpfKLgUhZgJF9NWYAIWGd8Ik4R6axpZCEGhpYl4EFC9W3kN Q2LnnkDmoWoXZDGn3Sgl6kauGNEhv1KyjejGBLyFzor8c1urDp4w3eClimwEz3EUlDpy WobWHDtOwRkLw4V4Ci1Hk9qJq4Pz40NPgVgiwalYiYwGXDnxAgkhbQAJkFXKpFo6WwkU r+TTjLpOS24dC1Ldp9K06jlbZX4YfJ9DveEbOicH0y26rCahS4aCbWVCh7BtpBCdPPvO U+SGjRwbKx1AW0+a6k8dZevoKWk7gdoPxq3z0EnxzcyEJmX5t2KZ6pE6CIYMu64YcevB bAug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=FdA7gmbdGsxGpp71lHWVDoQwlmGmQ2h5l36jz9adrG0=; b=cKeDmfgA0qdAj97+noVKPFrhgGrPLqloqD7PwgixRy5DhUvOQviSitsRZVUh62J8Ab q9X+XiCJYRFP+MISvMOUg4TktIzNuS3xH0sWXBYRk+Pqj3PSU+rvFcgMSZ2slwTQBOS2 apzsRggvuEJvaddiNQ223Qa9Rfz8xZiBAQjH8N7CMMny3Axs+3dsXX9c5sBu9Wdkw+9k HcwL9eCpcIg09IKT/23pm1uS6Dh4grENgErTNsCZ8UHxyr6szmnn2GFVeyYe9jP+/T+Q GqtfqrRduB0rVOZ+zl17orhR5/WSsHqGM9hQIOyHWVSgKYtta2NVcyOnWXoRJiXddsqm umWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nycaFYtX; 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 k15si753013eji.214.2022.01.12.18.07.01; Wed, 12 Jan 2022 18:07:02 -0800 (PST) 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=20210112 header.b=nycaFYtX; 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 5719268B1B5; Thu, 13 Jan 2022 03:53:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C8EB68B19A for ; Thu, 13 Jan 2022 03:53:26 +0200 (EET) Received: by mail-qv1-f51.google.com with SMTP id q4so5082913qvh.9 for ; Wed, 12 Jan 2022 17:53:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Y8ar6jsCmRVRMkOjUHvjuGKFNXdgBgYwn1iLyp5iLcQ=; b=nycaFYtX9/alXuHyD2PN5DMh9Zom+/CxiP9T9hivAEo2AASeXxfIPT9YoH9f0U5Krh U+uCwRKBsg5Sj0KQIbXvCwnUCmEynrtAGPxB6ujuHlie7GW5RMbExElui8R0blXj1fsy JLmqKN5brvGxVNpeGi0xSeqLh14xl3+/ptnnKJjI7MLocxTN1vAH2drTtl/7Wqt+cD/7 nqw0PAJ8Ann6LEGMkkuxgBEI4HO0xInTF9eSvU4GyrE+Gbss9bFPy23Bghwj0NW1hQ1Q Rc7bHFii1a+IOjmB20erO4k9q7dih8KehRjigbv7JrQzge+xPBhcW0YnL+mkcuPB7Lf2 rtRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y8ar6jsCmRVRMkOjUHvjuGKFNXdgBgYwn1iLyp5iLcQ=; b=h14HETk7QLt9Gvg8triqn/7Umo5c66kua83pKWJetHlSCJ+mWYmFwdAHbs1r8WMVMP DD6J2utDVMOPc1JNtUn9c2hQeDlzBPA4hIfA583xbQZSlGEfEgPwpxBwVRGY2o4+skdh ah3UDI4KVdQB9tMCMMDiSZ+rlA1jgf/LILjwbeSie7siMkgaBNamEZTCi8A8/DCs/JPM Aad91yyoANqJb/SN0t72Y0bxhs8104lGfBcWTELKTX5/xdEQN2bsfPG8fYa8w8d+lrOG CoHb2IVu33mldCKp5E0pJQWMzaqadhkaecXqBXkfcBEUPgLJ+A2LOjA56fROHO7Cf5Bz V6xw== X-Gm-Message-State: AOAM531YbHo1m5BiELu3UY2zMaA/l8hFIeD+Fwcbqqr58bqa8FSDUhZJ 3jZOjUyIF+5aotthPNk3WaUd6Z/28pM= X-Received: by 2002:a05:6214:2341:: with SMTP id hu1mr2332753qvb.78.1642038804719; Wed, 12 Jan 2022 17:53:24 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:32 -0300 Message-Id: <20220113015101.4-71-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 070/281] gsm: convert to new channel layout API 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: 4YUSXHOg5cNl From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/gsmdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c index e14e9aa217..09dc0e0fb3 100644 --- a/libavformat/gsmdec.c +++ b/libavformat/gsmdec.c @@ -79,8 +79,7 @@ static int gsm_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = s->iformat->raw_codec_id; - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = c->sample_rate; st->codecpar->bit_rate = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES;