From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7BFA64C99D for ; Mon, 27 Oct 2025 14:17:40 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'RoxjURfrBaVsEX/wrlWhpuHtoELbmgNs4wlN00mJ75g=', expected b'2KSxndVEM1/mHcbFpJl9CWNuDDqr7Z3xCrC8CMj0OlA=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1761574652; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=RoxjURfrBaVsEX/wrlWhpuHtoELbmgNs4wlN00mJ75g=; b=pO3vxdcPxY4DiM4ox8d2MelR8/peb4N1eCokVVdotFl1UmhVYgMF0W58W2jpjKYv9mL0k if/gB6xoqbThNplWPRmvOlQAVN7yM9QQ8Hu26FpL/zScWdnNt60ZXWS90bkR49rYHbHwTfN SNFqsUs9Q6b2/5l4nMyxi5tFPRZ2vY2etUcD6Y7Gp/2pab5zdUq4oF40J5JSiSGtFlg3Jdm qY+3xCMu+bUrUeys2hCy3NUgn7yIGgwLz3HxgWF8pEwhJAqUcZg8/dhutaW/fMaUUWT3TeV pB+Yki0Mg+N/WldEmErao5RQ3eCs6b4NJkJIil7zadw0MJtue8q3mmaINALg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7133068F722; Mon, 27 Oct 2025 16:17:32 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1761574640; b=KQJ2pFq01now/UnAFqBeg9eLMQ4RYD3vXEosJwiDPORSb11By3w/PTLLPC2GEDe8E3U9Z LeOBQfSVwjNMPTBMGKIxfFQ3SkeBiiHXrhhsEWzTCmGD2u5jdEZEYpHhiPbw6fD6t8+2mQ4 +C8pSbq+AtDwCsrKXRel31ikIm75wnCC7jL46x7JeKtxwcEZDGRUUAQKrupJ+5ranzCifle 8iotJk8ewleGIKgntt+EFEiIc2V58h4jmz2F3e9Zs0UbUlWmANL1zGGvKtOSQGmVonH78Wc iImUA09rJ6wpsy9UaJlZZnRHfO0TCtQii7x2EyKyXTrEhe5ex0W+t9RXftxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1761574640; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=se1ZMmodFiIV9mq/2Y/NJjxcXbGuixOuTnu91snXAj4=; b=R0M8OWq15zkzBd4LEiaK8fdn514DLGqwSJdcPmuwAxP5AAcCdz7chNSkRq8oQt327S7KW umrVIEoxV8G8GftMl7z8Q6dMBl6bIKmPeiuQ1LgUumQ+yOOcg6wp2hp6ZZLHeh4IhE2CSSz yEjmY/OvxzXulnMVfU46okuO6J3Jx+sR0XjvGTCrmkwnw5WHwHNisHuh8e03yeNGglVXOyU SQ1i6nb+LQu0Lv4ZmO6Eke/J1E+aMULZmRuO6yPAH2Uh3s0/hrqb9FqcaUVGxrKZeCLLLun SE2/bSWz6aEn2sWlRsDLHxHAbgnWfquI1AKUOB/K9zY26n2a7nJMFRMnBxJQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1761574634; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=2KSxndVEM1/mHcbFpJl9CWNuDDqr7Z3xCrC8CMj0OlA=; b=UPq5VFvVZ7/XMRqQYkNC9drzO4dCKxZhssXRtGdg1F3llFDt7s6wAvTsKCxO0iohnAWH9 pOscEWaCYtn55cz5MVi4kQA5fTxV6o2UxIhF5P1EDAXmJ6MZfKvzWsOerqXc1p5jybJA/a6 XCSZb1yJTPvMOUkZh0sFA7zmQrl01mjcnSbf90KlEafiXA+R81I6A4r/tiEvRkoEnwDkt7t W43ojqyOBcALZYYlZfkfwzJkWCVJyWnjhmVtJcaL/RTcP8wbQmrRer1fy0bUEfnJltx0QpM BQowp31kmAYCTbPCbo89uSumTbusm8waTb8h9qUjAry+l1JEqE3lqocjUSWw== Received: from 02c22a36bd31 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 311EC68F6F7 for ; Mon, 27 Oct 2025 16:17:14 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Oct 2025 14:17:13 -0000 Message-ID: <176157463431.81.1599501410336266902@7d278768979e> Message-ID-Hash: NF2NXNBZSAVK43O7QV3R5U2Z2GHU3KG5 X-Message-ID-Hash: NF2NXNBZSAVK43O7QV3R5U2Z2GHU3KG5 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/mlpdec: don't depend on context channel layout when setting substream masks (PR #20766) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20766 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20766 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20766.patch If avctx->ch_layout is unset (as it's allowed and even expeced by the AV_CODEC_CAP_CHANNEL_CONF flag), the code setting substream masks will fail for stereo and mono layouts unless a downmix channel was requested. Fix this by deriving the mask with coded values only. Fixes issue #20764. >>From 44d78ee4961b2f4f751ea902c976fd11335dc378 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 27 Oct 2025 11:13:20 -0300 Subject: [PATCH] avcodec/mlpdec: don't depend on context channel layout when setting substream masks If avctx->ch_layout is unset (as it's allowed and even expeced by the AV_CODEC_CAP_CHANNEL_CONF flag), the code setting substream masks will fail for stereo and mono layouts unless a downmix channel was requested. Fix this by deriving the mask with coded values only. Fixes issue #20764. Signed-off-by: James Almer --- libavcodec/mlpdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 688cf51d6c..9bc6cae443 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -453,15 +453,13 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) } m->substream[1].mask = mh.channel_layout_thd_stream1; if (mh.channels_thd_stream1 == 2 && - mh.channels_thd_stream2 == 2 && - m->avctx->ch_layout.nb_channels == 2) + mh.channels_thd_stream2 == 2) m->substream[0].mask = AV_CH_LAYOUT_STEREO; if ((substr = (mh.num_substreams > 1))) m->substream[0].mask = AV_CH_LAYOUT_STEREO; if (mh.num_substreams == 1 && mh.channels_thd_stream1 == 1 && - mh.channels_thd_stream2 == 1 && - m->avctx->ch_layout.nb_channels == 1) + mh.channels_thd_stream2 == 1) m->substream[0].mask = AV_CH_LAYOUT_MONO; if (mh.num_substreams > 2) if (mh.channel_layout_thd_stream2) -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org