From patchwork Sat Sep 17 12:10:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 37977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp176591pzh; Sat, 17 Sep 2022 05:10:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4uOcFf5IHRCS0q17GSsh6km7+c9pCob/QVPOdn4/uNQr6SpjDjPids0fLuRQRqZD7CjRHD X-Received: by 2002:a17:907:2da1:b0:773:dc01:877a with SMTP id gt33-20020a1709072da100b00773dc01877amr6456208ejc.567.1663416632392; Sat, 17 Sep 2022 05:10:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663416632; cv=none; d=google.com; s=arc-20160816; b=fNCAs1fqgPGe6B3lrKQ8269fQ7y8kioeQXyMbCG4RCMfX94SABVgzmC2mpSgrgoMlk jgt7gYeQB/6JWVHUBp4qnsFuQOuRNYuzJJk4/7iCvLahsVWzwFuqGylzFUQ7Vt3KltGI 7KMibW0NIlnKRiYFe9hGvHZWCl3GJjtj8VdPQe1eSsZBZXUmkTfDnorNbxWTZPOxkVwl /XilEQeQJC0kJt0S8ObOfEp/1a6EeUqKTRf90Qb3wt1n8m6lXWTxEvAlgv2LuHH7uj6i 0RLYVlKIYsABx/oKpq7rtFbzyAYV5qHjZlT2haMOnjwyJuuKESir2vpeexwlM7sjqGmx 01Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=twZMPnWFts2sNx+Xhe3drFbtbhUp6StQ9YBjUmzrizg=; b=VTuxzQxB4SU4rwACcnnZDlBAp3HCWNePYAfenvtUdul7eTozBJQRmVdv+Wg04vT/Nx 0eTji5X6trTP455eTvFFSVjSfoZ+dDKQ6kuK7VKzVBfN2kYRaSZUg+Da5UeDacezHCnB WRHDrJjzmrxozNfoIsCd4lt15aiS4EvXnrL64l9Rd8CQmR0gBVIsNzZ9trrRQe3eJc8W +Mwd1rftBSeLquSz3X7SVX9TpjZ1d03hwNyzVoul+QhEewZXNsF0Ew18cbGGqvDK7wWd FgzuMwl9WA8SNO8Zq553ZQUqDQ/NUlTjK6OlnwCSrND782uRLoLwbascDl+gpavleiy8 maTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=D9Olz6ce; 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 d9-20020aa7d689000000b00451547732e2si3689663edr.409.2022.09.17.05.10.31; Sat, 17 Sep 2022 05:10:32 -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.s=20210112 header.b=D9Olz6ce; 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 8160D68BB36; Sat, 17 Sep 2022 15:10:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 511D068BB36 for ; Sat, 17 Sep 2022 15:10:21 +0300 (EEST) Received: by mail-yb1-f177.google.com with SMTP id 198so31206331ybc.1 for ; Sat, 17 Sep 2022 05:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date; bh=ALI0pzl+1aXunc6wbjS/7ViPy7ljKVSfJWfn5z03xV4=; b=D9Olz6ceLeQQl37MoioWCezrGg4ghUNI9Pr2EREPExs+O0hIpby9u3pCMg7LjZXPda VA98Z6HyVcrw5Z1knTrazvbUGwcmPF44aoTm4ECYBQxN/4TmHcy6VUq306GOQwIw8d5G Kxo8WTDch+xPF7Khv3XHVr2zQ2FQ9se0oAWL82NuMYNEp60OEBQss1xA1RB27jSTbhV9 nfV9aXE8OaWA4iM1W8/e7vvJaNIlYhx7W2hDim9NyfVvz6Y9v+jqro6dahiNOunxZsgh Il+8dePFohEe8K150XA8ahs5Z2nf+ugxS/Lj8QpkuOR76NostFMgIb+dhByuddUzcwBr or/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=ALI0pzl+1aXunc6wbjS/7ViPy7ljKVSfJWfn5z03xV4=; b=q/qtGy0/qkZ1gPJjkS6ctd3brIle+Aa2q4de8NcH+ZBbiqbm9shDobyCpN5q2u5fQQ pJh025gLRM/dcgZwpzJ5PmKyezPteBI9KNHbWS3d5RV5r4MEaKyBFOvc6xauaPi4HU5t ALPdWM46HkEOy9WMEbsQ0Ib13arFtVdp7izZMFIGW0kvhVtI0bfNwicYRbE2lknEfj2C yYF7L66rpzC2lrIWrjPbPPGcm8O/TG6r7AAbWJjVcwLMXLbpHckXpi7VNaMSU3IEPvJi J0mvRRhg9cYrS4wMeSnx6+C3Ks1eCBpXHHVwdVFsfZz1+Yy/EMu/TWtdWVfLGV5HZ5Co eOAg== X-Gm-Message-State: ACrzQf1KhSbLzVqivDwI+TeYQGkYqfIWpoDeNSVJel3lFDcO5SI0H47m nv44FCHtjNfPUmxhtAjE7H0MZqdxD6qDlaWPY9UKem7P X-Received: by 2002:a25:d78b:0:b0:6af:662c:f087 with SMTP id o133-20020a25d78b000000b006af662cf087mr8005426ybg.396.1663416619610; Sat, 17 Sep 2022 05:10:19 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:7402:0:0:0:0:0 with HTTP; Sat, 17 Sep 2022 05:10:18 -0700 (PDT) From: Paul B Mahol Date: Sat, 17 Sep 2022 14:10:18 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/mlpdec: relax channel checking 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: vBDsS0h8fGpd Patch attached. From 5be1fbb848b50e02d302873653e94ed77dea861c Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 17 Sep 2022 14:08:58 +0200 Subject: [PATCH] avcodec/mlpdec: relax channels checking Internal TrueHD decoder channel rematrix can mix 2 stereo substreams into single mono stream. Fixes #1726 Signed-off-by: Paul B Mahol --- libavcodec/mlpdec.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index bb72134b09..092344b69a 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -425,6 +425,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) mh.stream_type); return AVERROR_PATCHWELCOME; } + 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) @@ -438,16 +439,6 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) m->substream[2].mask = mh.channel_layout_thd_stream1; if (m->avctx->ch_layout.nb_channels > 2) m->substream[mh.num_substreams > 1].mask = mh.channel_layout_thd_stream1; - - if (m->avctx->ch_layout.nb_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"); - m->max_decoded_substream = 0; - if (m->avctx->ch_layout.nb_channels == 2) { - av_channel_layout_uninit(&m->avctx->ch_layout); - m->avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; - } - } } m->needs_reordering = mh.channel_arrangement >= 18 && mh.channel_arrangement <= 20; @@ -541,12 +532,6 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, return AVERROR_INVALIDDATA; } - if (max_channel != max_matrix_channel) { - av_log(m->avctx, AV_LOG_ERROR, - "Max channel must be equal max matrix channel.\n"); - return AVERROR_INVALIDDATA; - } - /* This should happen for TrueHD streams with >6 channels and MLP's noise * type. It is not yet known if this is allowed. */ if (max_channel > MAX_MATRIX_CHANNEL_MLP && !noise_type) { @@ -557,12 +542,6 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, return AVERROR_PATCHWELCOME; } - if (min_channel > max_channel) { - av_log(m->avctx, AV_LOG_ERROR, - "Substream min channel cannot be greater than max channel.\n"); - return AVERROR_INVALIDDATA; - } - s->min_channel = min_channel; s->max_channel = max_channel; s->coded_channels = ((1LL << (max_channel - min_channel + 1)) - 1) << min_channel; -- 2.37.2