From patchwork Thu Jan 13 02:05:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33492 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp41469iog; Wed, 12 Jan 2022 18:41:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPFjyDvhTChq4xOyGbEXZahYPlq2ziXxDhwieSvIwCriK1cNKdLw4lOGLcZs5dL2qwqIKm X-Received: by 2002:a05:6402:5216:: with SMTP id s22mr2342200edd.132.1642041685341; Wed, 12 Jan 2022 18:41:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041685; cv=none; d=google.com; s=arc-20160816; b=mBrU7NYL7xsTdIMvbM/pefs6GFtm+pNgNnr9C9g6qF9OMNvKB+nlxlET+4tfl7pYxz n9S4Kxjd5WGf+WT/NJAQdjcs+lsG1xy4vGHUluKAOm+SexrVAmtiBnM0aS9KWVn+NqXF sZ7O02r8GuMFecpnz1guO1qU/vDl3EJGQd9SwDw9D0yjwLPmKY5D0r6+qiqGN2ojCeAr U9IZyhFggkcZWznmR94BIGtB9vy75OXCYj3X1Z9AMZQQtal6JnqlPiIYQdFKPTxL5Nk4 mXUQuEtx0TmDWIkrJJTtl5WVswLSOwvyA8qzhz9+BDWE50ebcCt8UjCZHBGoLOMJj1Da UKhA== 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=xJXsUiXiSEJrChWDtoP4Y5easUS8WHmPC4MjyWLmVzQ=; b=g5OhI6eKgT6f22VAOyDF2FvtIEionhFcdLolQI+x9DimGcNX3xe95uSeVoYc1p8qkY TcuF+NSyGT2gth8wjt5mxbZaeqO3DqRDlwhrtfR6iTDv2CX1uqZAx8AZj1LvYfD5RzeZ eWBVElTWSXEX6NToE2P1sn55xQ0G+kaY5gnnidBGCS3AGI1LU+SUz3WlzmCzrlL1rtqP M3ptK2QNsYIhEFdVFw88hiTmAMI6bLGi5ExrxoezV9KL8LrakuGaCAKLZcR22tpO0nuC AOs+D5YIN1NZDMBTyZkWq2HQ5P/TObVflL3/fcAxN4zjsK0NsJxpVOQrVnEMP8Ra4uP8 D0uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BVkRe8b2; 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 v7si853074eds.443.2022.01.12.18.41.25; Wed, 12 Jan 2022 18:41:25 -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=BVkRe8b2; 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 F1A3268B8A4; Thu, 13 Jan 2022 04:05:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF5DF68B832 for ; Thu, 13 Jan 2022 04:05:48 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id hu2so5105541qvb.8 for ; Wed, 12 Jan 2022 18:05:48 -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=vNcyrUwrFvhl2wo3nDAovQlrsM9k9y2jFilvjOxyp/4=; b=BVkRe8b2ZjNCrPlJWWrXDS2Y9h9zs8kaeQvSxMvzTM6446AI5smhoaXBJ35O0+o3lf 1SC5O7xNHfaZxIBfpq74M5+kql+IkeEm5XZ8jxdYmhWdxMHf7NyZP1K0eo+0TeBN/tQ7 uXsNgjWGi7UKi7R2JeMQPdWRAL1ai9V7Z626h+ePnARd6HQ/7Fj0M6HHL+3l+SJOrp1o cNDGXBbjXThcPY6tvopMBmI4ZfM62juCQBezjHuS5AF4LOVqWTpUfV8DPqt6k7jDu619 b2+CFPR4KYtYMq/Xz0W8CpJ5GOk3qJd8ycTK5bFXDiW70wCDzl2Un4Ogi055cdnWMNKi Cn+A== 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=vNcyrUwrFvhl2wo3nDAovQlrsM9k9y2jFilvjOxyp/4=; b=q8Kdv8PD6F2JBfSi8PuIuUdgBj3w5WFVXPwPeIhJuVdvGRhILQbS3Tcv0UJHTQmyif VbacnMe83kLNJ2yj6+CvO+PkieKwO0tWTUiD2oR0WWYcZNzeYxsAUD4HTXLwEfLETmlY o60Vgw+PksTDxbZBBwRnKj6KVMgs6jIx0sfviX4SH/oMcce2gkIbZm6CwTbXBEJcwDqb RP8dDMBsazOK/aXXS84TIcETgzfZjTPnDBxya6Y7fDw99KiOyHNbgmprGnQYsoKMMqSx KOidAHEn/BSwCGjuk6Np7+NTZ3yRxPVqk2PE2B+jAIUpUu4FzoUc1RDoXI1utyDBSG3e Lugw== X-Gm-Message-State: AOAM531qaVJtsz+9ZkqcnQGYpRE0hMmy+90z7JCqWVmzldQNkKhJg1pM 4WUlppjFm3+a+VZDPSI8GI4p+Fg/rJ8= X-Received: by 2002:a05:6214:daf:: with SMTP id h15mr2142192qvh.9.1642039547388; Wed, 12 Jan 2022 18:05:47 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:02 -0300 Message-Id: <20220113020518.730-14-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 223/281] libcodec2: 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: Rkm5f6LoNsrX From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/libcodec2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libcodec2.c b/libavcodec/libcodec2.c index eb66867f82..da9e170d21 100644 --- a/libavcodec/libcodec2.c +++ b/libavcodec/libcodec2.c @@ -85,9 +85,9 @@ libcodec2_init_common_error: static av_cold int libcodec2_init_decoder(AVCodecContext *avctx) { avctx->sample_rate = 8000; - avctx->channels = 1; avctx->sample_fmt = AV_SAMPLE_FMT_S16; - avctx->channel_layout = AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; if (avctx->extradata_size != CODEC2_EXTRADATA_SIZE) { av_log(avctx, AV_LOG_ERROR, "must have exactly %i bytes of extradata (got %i)\n",