From patchwork Thu Nov 11 08:50:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 31369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp84348iob; Thu, 11 Nov 2021 00:50:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/KgLu6HhTowqypjku3AhZSQr1FRgT+LfjE9aVNuMXM4patP5idiCIGkm6v17QZVAOXgbY X-Received: by 2002:a05:6402:11ce:: with SMTP id j14mr7880184edw.160.1636620602008; Thu, 11 Nov 2021 00:50:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636620602; cv=none; d=google.com; s=arc-20160816; b=yagjWR5/jX4oZwpGpKg2zlhGxSX5aDpeJBoTM6+WR9odkqyf5XpLX6Z5GXeR4Myt6B 9MbAD5YYo995egp4w4MR+mmkXc8RyLSOQF4IDWZpsYhcHuwq4QU9BjO9S4b2oRYVwL5m mP06rGPtQL+x6KGupoLEkbZuy2RPXXDuVtObkcqB61WGmdG+Vaf12f+xWGbjwMzzP9rQ 52LwyI/wbiIvRa5jY60M8a155KLVqu+2dLg8s2lKIQIuO2lzESDFmuxxpqkk5MVbocwP IyfH8LxVGXRoL94Z1MeYmSNSPTPINZ8ui+qY6ScbuVWLg2Q/Mc+JDa8dnLAzM2rqtypX I7eQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=uDCC81AwoN0E6mCaI+gLtUXsJizPZv1xJf4u6r+sFoU=; b=i2X5X9dKFD9rr/ULchJ0hKj7s8JBYaUpXUz3cczGOc9wtbrXWjGehC5vY2hfJDFfob 8RKi82blaKGapMKm6hYHyvU32US+Q6xzbRQoyo0ihl54q6ulsxAO71ZN+eGBQZbLlQHO Ut1fkkXB0x166ft1HB1St4/vi/sH+bjGg5Elzz/A2yNrEUpt6WwKVNa22Mho+g7oS8qQ xqTS0tHfXMJYKyfiEoKhSpQewEYK/e8Y5H8X3g3dKYQGnxB3l96SbLqChKJUL6fimk6q ACZoDYXFKWRagsZouTbJQUBx4vk+96j4zd06BnphOlwKZctVWAuYAuCYkWy3SCv8cOJv 8AHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="T/Wfn7nV"; 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 do22si6253904ejc.724.2021.11.11.00.50.01; Thu, 11 Nov 2021 00:50:01 -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="T/Wfn7nV"; 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 3282B68ACE5; Thu, 11 Nov 2021 10:49:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A228681865 for ; Thu, 11 Nov 2021 10:49:51 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id o8so21235349edc.3 for ; Thu, 11 Nov 2021 00:49:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4VCh3kMigqWvyfD9A7ueXNiMEhHk/T7yKhFoiBC2Qrc=; b=T/Wfn7nV4u3G6oPqEMdpiJzADJ7jBvl0Yj8znJACp82xVyNiIWnJJSzUcWCQHI2m3e aCIjtWABNxkg1nPZSKgc6g9eCdLBXJ04UaJYgi06PaeF73ZGHEKlsIIvj0jmjgicgNhi cI0qu3zXpAj/Ppmwq/vOEWr51worUtn7Ha/i2G+hINiLH4FN+djgkL+DiPyiVKTus8ly zGKuOlnT/kdwmUNGfWyl/I/EVXJ3P4UlpJEwCe6yEvjCPh0b4SIUkthqgQQdR0T4Y+vK 5gUZfMvmqoEOL9vzGwemEkUQMokOfgedQMXOI6uN5IqCMv+fY7bI4qC0N8MiQuYaihSh 8Vgw== 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:mime-version :content-transfer-encoding; bh=4VCh3kMigqWvyfD9A7ueXNiMEhHk/T7yKhFoiBC2Qrc=; b=cGU5e87IJaJgGPbOnGEe6mHQMEmQsHYMb8kwJQevgLUDxKmOdnkLAAZ3c03Necja9y Vr75U1hepgiaHOhWwMLz11v2gdyp7fHkTNQA1kqQsHJnXI00+Epuw6/KEOflv2UcIcb+ azhZ1iwo0gEuR7RaxswEiQRUh5aqTkvr9Wx+lAMQRgO7BoN+gNXD9haB5duE/x85ljbh 62CqZg4h40S5mMvG/HRdTB3hK9KIkKVfD92Gc5nwu2fIKuIns6klccGL4toKwEzCXyAU VqiAXa+FyEwspOrpmHz9frUYp45D2jEi6jafF1PUTEkVPqwZ59hZhXKWf7O+oqr5mjcu Qneg== X-Gm-Message-State: AOAM533WgCkPK3+M1wlcFyi5Z2Lb4OP1LHsIzc8B+0WFO4oHq2X1xweT z1BJHFAUPNaPD24G4RN9t3kaKdbRuFA= X-Received: by 2002:a05:6402:41a:: with SMTP id q26mr7972959edv.387.1636620590693; Thu, 11 Nov 2021 00:49:50 -0800 (PST) Received: from localhost.localdomain ([212.15.177.0]) by smtp.gmail.com with ESMTPSA id hd15sm1013319ejc.69.2021.11.11.00.49.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 00:49:50 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Nov 2021 09:50:07 +0100 Message-Id: <20211111085007.263745-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mlpdec: cover case when >2 channels are in single substream 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: PtQw8JQGYvJ+ Previously it was assumed that all >2 channels streams have >1 substreams. Signed-off-by: Paul B Mahol --- libavcodec/mlpdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 68c270ef52..780ed5b7b6 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -417,7 +417,8 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) m->substream[2].mask = mh.channel_layout_thd_stream2; else m->substream[2].mask = mh.channel_layout_thd_stream1; - m->substream[1].mask = mh.channel_layout_thd_stream1; + if (m->avctx->channels > 2) + m->substream[mh.num_substreams > 1].mask = mh.channel_layout_thd_stream1; if (m->avctx->channels<=2 && m->substream[substr].mask == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) { av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n");