From patchwork Sat Jul 1 20:23:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4181 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp7356597vsb; Sat, 1 Jul 2017 13:23:35 -0700 (PDT) X-Received: by 10.223.157.4 with SMTP id k4mr31503806wre.43.1498940615517; Sat, 01 Jul 2017 13:23:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498940615; cv=none; d=google.com; s=arc-20160816; b=zSrURlYaKnMN1PDn/nyZpluaeuOfnI/ypBZjR6T2HB3LrbEG1mvFIk6XENh7gprrHi LxXbVjLSBZoNwF+uwijZoSMOMQSqCXPj2uLiMpDqQ5iGT95MNdLkw16qn2DACzfmek3g XKebyrpoIMvMZXUhXJ3BxMANWsj6zwO4fpqyVuxtT2HHP7JETfrGjkivga7XJCmGP6lF XCy6CBhVM25Dw3Dmu15/337G8C+xqdj7K5VNR3FuMKS6GVydZolU7Wmi+ceZBZcUDs5N 9LdxTkW1d4oyb965lGXuIXqPWMCYYE9/WFOf9OIAaEQG9GsyNg64mq5RcsweqkScROz6 /Jtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=ZFvV6D5ZktYBtCE51kVk3nmPmN6OsRwWDdxSBvxcRHg=; b=Ty8pHWoh3hfTiCSp3nMb9eCp+HVF5Y82ClL/YpxT209PZzJkoLYaqWYqvaW8bejRg5 nnahg8IrY9n5+WyxojX/IywmVUxSAUekswme8lmDe5cl5a+pD/eIVf5TGxg2Bp8oBIW1 aMZD8DA8S+af6B5+fCh83zadLhDbASQ/cPsZZ+jPwsDTTugf6cqDN3swq6tBiNwkAaEL v0mHeA26zmxZzkCTVQ+ZBvO45nLY62m0iD73SS3bE/svTwb22ocCvuS0prSb6BC/RGmb FfXjKQKUccNb7jvLPXliMlHBcFw5W4/fp+dEut+39vnUiR67oXJwKc5AzC4TF3z0gfCo pwVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=HrqKvWJ2; 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=NONE 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 l184si14338532wma.88.2017.07.01.13.23.35; Sat, 01 Jul 2017 13:23:35 -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=@gmail.com header.b=HrqKvWJ2; 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=NONE 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 72058680B0E; Sat, 1 Jul 2017 23:23:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B83A6808CD for ; Sat, 1 Jul 2017 23:23:19 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id p204so13654173wmg.1 for ; Sat, 01 Jul 2017 13:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=hPt+m6s/2IpFeIO/1QuiJ4EPe01ZewUfrPPdMNKVXZc=; b=HrqKvWJ25IohccQZQPMtqDtWSbbvilDvrjYlkMpDSvawaHCY56GKLQlFwMXNy08N7t 20suN5JseFTUlVus9z2sdgpZj2/htRNlIkXLlp8HBayzBAvLWPXLW0miiUREJvVPCq3e rJ/96gMQix8vn9eSsZG2+gjZJVEmF62qz174Y+b92i5EiwySzN5WNy+KJaypa7aBVSB7 XwCFfJcPR3WD54uSf+HupfB4iTm3rwwNb/dSaA7GYO0oO7S/nl0XoMnVgZee3Xd4SGb5 2qSiDkvrJQDcADc8uApRqjIKy860fE4U/efJM2pn7kzyrDD2Fm+EGibjA02UsxmS9oRj TAyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=hPt+m6s/2IpFeIO/1QuiJ4EPe01ZewUfrPPdMNKVXZc=; b=qpZcclirCK+3qFYgUS7A1xEQZyHEZ4W1bWbPtoYwOI/OaMWhk+Y5Q+iYiiYZOlXabn mqk1HEX++bhNvc3sFDez69IsHDxW8415c5ssEKQ/MoyBA7kkk+AxABZoQ0JMKiR3wH1n yjn5RwuYA3dYxJhpTIYXxqln4ocJYQ6cwIsgx2+kysm/oJaDGKVefEEbHJcfSQkONskb M8xn49ALxGuiXbIJj5kYptcAQtL7rPqndPfJviej3kg+7QG58MiT2lGSSKAlUqb8hrui LswvL168IgDdq41vpZ1iDD2LrTjS4azUWM41KoiHMH4mLbo5j5Igh3nVoiwu/sGRXv1L xUEw== X-Gm-Message-State: AKS2vOzNjPLf5fCW0dGt4RqRmyHbwR6qWiGVRTyBTVrvqfsijdaBXtpq qLpQEqXCLuNOEj1E X-Received: by 10.28.62.149 with SMTP id l143mr9781857wma.83.1498940599485; Sat, 01 Jul 2017 13:23:19 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 55sm16062813wrt.36.2017.07.01.13.23.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jul 2017 13:23:18 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jul 2017 22:23:07 +0200 Message-Id: <20170701202307.2243-2-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170701202307.2243-1-onemda@gmail.com> References: <20170701202307.2243-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/alsdec: call correct function for multi-channel coding 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #5942. Signed-off-by: Paul B Mahol --- libavcodec/alsdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index ac59885..000a61d 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1616,9 +1616,9 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) } if (!sconf->mc_coding || ctx->js_switch) { - int independent_bs = !sconf->joint_stereo; - for (c = 0; c < avctx->channels; c++) { + int independent_bs = !(sconf->joint_stereo && (c < avctx->channels - 1) && (c % 2 == 0)); + js_blocks[0] = 0; js_blocks[1] = 0;