From patchwork Sun Jul 23 20:15:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp1532299pzb; Sun, 23 Jul 2023 13:15:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlHakiE2gGLpHldfXAjB0i7WeQsAduCjcVhpcSnuOJc6hL8OePV+xw/UpISpSCnBKrv4Wien X-Received: by 2002:a17:907:7791:b0:993:eb50:5250 with SMTP id ky17-20020a170907779100b00993eb505250mr7852252ejc.10.1690143354900; Sun, 23 Jul 2023 13:15:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690143354; cv=none; d=google.com; s=arc-20160816; b=NcXtA5V4UnMYHgmibKHMKJIhtFPOahpKlRIgXE5A7HfcyOGmgLXeflLhJ8KEV4ulfk UwVys6DPCmAnw4qrZ8TpH2k/kbjR7AuOmExX5/WFt8eraJDCDqukbQKNvdIww15c6ppc LLe25r3Dfix+uQzUPN7NqlsYm819RJukJPqvI1rppwvy64EVJtnWQhohwd1tDI3lKCpu 7L9q9PpPUJxrjcOCSj2pW1uyrFdg/BCqxIaEt4hOoVnJ4qsOjbeIeIknKsKc43NgohZt duDD4kv6897TNQaPXQDP2ZSi7hjGmcSKKmMyt0Ts4hZMaAFVIgVea0pnhQJFKIATt2qr +dDQ== 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=n3px6LSkJmKJOkvWtL8ikyXj4x863F1YnAqo3szr+eI=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=aW2M9Si7I4lBtTQVEACHazaDAqaXNGrbSyAjyGD+HSZg4h/dS90KoK77A5uggSRnVS m+aj8HgPexIkOXzi9qpGY0A4mZxnGAQ3ahZQaQtY4tb/voz2hVmXJTMOl7ObofUdfqxY 4xPa4uq79KztgPzjjXVVqj6dMdt15k9jjeZj+06lZbhj7cJNiKvw2Nd9LPj7bHtCKv/0 cfAOxv6XlS1328RZIqGl8V6QmvY52DKU4dT3G094AbMo/8qaUUYOCKgRXi5Qko/P466a w9TlkVtVXg4RMo6/mL0qllIENq9QsDNsNwao5CGHNfnuH2Xvs0oPwVGvDpFUyzH1bASl h5IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=b6Gvn1hT; 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 q17-20020a170906a09100b0098e1263aadbsi5287986ejy.100.2023.07.23.13.15.53; Sun, 23 Jul 2023 13:15:54 -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=20221208 header.b=b6Gvn1hT; 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 AE96768C735; Sun, 23 Jul 2023 23:15:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA3EE68C6FD for ; Sun, 23 Jul 2023 23:15:43 +0300 (EEST) Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-1b05d63080cso2931067fac.2 for ; Sun, 23 Jul 2023 13:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690143342; x=1690748142; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=R8IFwt1ohQg6hHtYXzjS0R1ghk1WXk3y0LZC3d4hBCM=; b=b6Gvn1hTSwuNdDlBth2DBaMjwsFM5x+ZSUc377hK8o/z57agd2Grp1WaHg2sE14Jla koCLNirLTJpew/k2+Jej7jytohBGDcoqAEB2XGnZ++d/fFS7kZ4nAWsPQKfWaMb7kKfa MRCXZXUx7wlfMir96Fzzi9ScnT2FlVAg312zX5nZyrvPSHJ5WX/UovNMQdBsfsJ4IOjB KNSKz24CBj5IHInQ1b16CHumvWRls9338ZAUvcmg3WpaBKKNkq6OzE2NRXe158w7CdC1 mGemt0lC9FefNsVKTGdHEFzUSIbaU6NyEZRYAJ5a9Q1nuY8Si4q8GFAvT5BxiKDQnI+f SV/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690143342; x=1690748142; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R8IFwt1ohQg6hHtYXzjS0R1ghk1WXk3y0LZC3d4hBCM=; b=WQBc1/4t9vhBxKi+C9p16DKqlBYBU8osvRpadnnmvXoX05xoEYZ5xnv5ijXVGA3l7T 1X9vlGr0/uv0JhhKqiX5qCV4lzCTIBXr4pAtIKC3yCOEVZLe+Kxz32CMWANd9o4Kq+OH y1R2vIbOE+CsEw/xHiYOBLrE7quZOErXyM8F3iTLEJQpL4qFDD1SKEd0ijLEcYeS0H0N /UXtTiWjErGrvmKMikeUzO8N62rFsxxIHFOGuqx6/FpApuZ7IJncRVTLO+TBIUILowZm +kfxrGcp6Ym5a1ToNAfPdu+5mwuSR0wXgUjrFxBEhIQ7JfytqDuLzWDC8RcxZL5V7jGj zTqA== X-Gm-Message-State: ABy/qLZpeS313EjrvlyJnbLT9AC9VcBEBhPaD+DLldfesJdlRQmhHw9Q mpLnxh6pmxkfJV6U94s+74BQtVwMta0= X-Received: by 2002:a05:6808:bc1:b0:3a1:eb47:a943 with SMTP id o1-20020a0568080bc100b003a1eb47a943mr9497686oik.10.1690143342006; Sun, 23 Jul 2023 13:15:42 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id be35-20020a05680821a300b003a42c45c109sm3453862oib.2.2023.07.23.13.15.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jul 2023 13:15:41 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Jul 2023 17:15:38 -0300 Message-ID: <20230723201538.877-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: consistently set channel info when parsing param change side data 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: 83sIdMxzFP+X avctx->ch_layout was being left unchanged. Signed-off-by: James Almer --- libavcodec/decode.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index f0e6acc03e..53c90cddb7 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -104,15 +104,26 @@ FF_DISABLE_DEPRECATION_WARNINGS ret = AVERROR_INVALIDDATA; goto fail2; } - avctx->channels = val; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout.nb_channels = val; + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; size -= 4; } if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) { if (size < 8) goto fail; - avctx->channel_layout = bytestream_get_le64(&data); + av_channel_layout_uninit(&avctx->ch_layout); + ret = av_channel_layout_from_mask(&avctx->ch_layout, bytestream_get_le64(&data)); + if (ret < 0) + goto fail2; size -= 8; } + if (flags & (AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT | + AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)) { + avctx->channels = avctx->ch_layout.nb_channels; + avctx->channel_layout = (avctx->ch_layout.order == AV_CHANNEL_ORDER_NATIVE) ? + avctx->ch_layout.u.mask : 0; + } FF_ENABLE_DEPRECATION_WARNINGS #endif if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {