From patchwork Sun Aug 29 21:23:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29858 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3400372iov; Sun, 29 Aug 2021 14:24:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVo4vQkWC/vGw+eibO3MoLGNejFFDYF+BaLGM+4U2LuEIEDCW9eIjJqexDdIxEau6Mofkx X-Received: by 2002:a17:906:6009:: with SMTP id o9mr21758394ejj.266.1630272244280; Sun, 29 Aug 2021 14:24:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bv8si13126084ejb.87.2021.08.29.14.24.03; Sun, 29 Aug 2021 14:24:04 -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=@outlook.com header.s=selector1 header.b=g9Fbn6R8; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C101A68A1EF; Mon, 30 Aug 2021 00:24:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67BA268980E for ; Mon, 30 Aug 2021 00:23:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FfvFD758b3p9h33PXdw12EFnSaEDCXc5QA1DsFlislJQsIvODFqQLsKAB8/dZsLoNTvrWOJsBNird8lbzLrLRluL/FDtiJgmCl9TG6z65wVnkI+AhTQtxl48NyyZmLEJNqq28M+zCXaSrd4pdPl0qsMt9p6iUQyMm4cpI8oGJOtG7FI0TrNZPtDO6QWc+ZZEoIW1Y/xlHkgSLIKIvYCAXgiD2d+1yEXWP9t5p5VX+HBbwojqwcr0Nh2etiEfwRQI4pa+dY9W9Zs1xYWDUwC1MMmSGH7NcTsPfuLdNCslaUetNDi/V3SOXQ8vaTukr/fUjPyDFBnI01wMXidhSa08uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C0eH3u7O0SHxHsXGeUDge76ABSXuWBV+r89cxTsOvnc=; b=Uyw+j8PFOO8qTFzAk2nprzj8kpIreqtsESiJ/0MMquIt+xr9Q555b6rA9IJBmvfBoMRkfFAex6fzk+GaKYct5aXrRjnI8Re/6g7WLdRQfFrx1TMOyeTA1Ld0GyMRVC9EyNDZ8epK9LvnoUrQoEos/Ub/9LKY0JhiCo5s9i+flrRW/KiyTzUpgeweyJ58E/n0k/zX7MLpWWxCTVPEHX2TD8Z9AVYhGbpmApKzo76iRBDi5Y7S1i3U3l7u8zMafxMaD+26xDajkR5jtnfZnz4VZ4bgxiyVR/2yVX6ugeZ0PB/EoyebVeehVXzDRX36Wcxs/kAJTJBcKVYH1ePp7XjRbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C0eH3u7O0SHxHsXGeUDge76ABSXuWBV+r89cxTsOvnc=; b=g9Fbn6R8wrZE4Zhc/DkLc/tStv5PfYyjQwjU1NPYJht+wMpXVlyyXmhxukIGTYv3mukpe/r+MZMBjsiZ/6KAHF8PhH9uxtjxC3BKN+8CN0rQOsnX8gunhUQqnat9DX+U+EK6XEkisKxszGKhnoeHZzD8h4Ltg3MQWp5ILZO6JeDTfTCxK7H/NyA3VLnoPn9Llh0gSWaUuKROfMA9DHNigxORSYnSKlH0itsMPY3kEBS0+7Ox4+XMu41bxbBjfSeGLaWpwRKV59ON/KxLVWn8G4zsF4eQ5/hqcKuFUOGkWRQP3Uc6GOCXan3HpIKBzIS0Ds9C2uTsJvEqbV/h7Uz0Eg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5927.eurprd03.prod.outlook.com (2603:10a6:20b:e3::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Sun, 29 Aug 2021 21:23:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Sun, 29 Aug 2021 21:23:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Aug 2021 23:23:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Ars6g4V7bYQy6iLKsjCudQng+HOAwTVH] X-ClientProxiedBy: FR3P281CA0042.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210829212332.1505676-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0042.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.6 via Frontend Transport; Sun, 29 Aug 2021 21:23:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 775066c9-7b31-475a-eb65-08d96b334cf9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQnUOrjuXD0ZUxXZpiaS0/7h4qpQ6owituG0lcXzi5lqrP2XPutbKkLpJpWEAKHfQKu9qFi5qj3JS2oWo6xcsIVWUckQdwO2It56PvcjiJ8tagBcCl4NNnVbu0XufT3hQHAxXzc+P9N1da47GFpqDbFwzjWaDQ4BV9f93cmk4B6q7VaI3dEHZEy5wIvIR1hMuWBFBXNFLYIYDJs00VHU0Hby2g1Mg+Y7ysPbtxmzYi+F289diZvD86lhCcP1IJyyyrSgB0yMcEgR775Yha7+8jbGuB6lst2wtLCktvJ9QOhboraYBUuBs/GOoJMYLgifrlzt5azk5Phep/zoPqNZ+MiwxmryqDvrR0Mm7ehPAl1Iw42j2FkwkAQR+g5y7mSr9vAbMcUSmBA+9sfGZxHtF1hDOOAQ7+AswybjCX2h8/yi0oC4cy6FM6snsN0mDpb3/WrPkDECSdfVNW8kWGOQInZvizVC+1SCLkgyOBtpXHuFGvcQwWetpAr0/u82Sp+8mOFjrUluzMqrSv9UBfQpcJJxektcem8bNPuoK7ApYddMBjQorWaOr8U+BqNiV+R5lPofuDbi2LWTiIrC5Z6p1+jzFLdJOPDi0ZnSiky2gKgnORkFE4RoqF5Zg9tOLtp8C3Yi7jW9olu/WkD29RQWjje3FpWGp65vzoOUTIFXwjD7QZYJJP74au9kQhfVvZk8fn96ryHDADSsDl85wxRd35uDPopM4OowQ04Y0+W78WfpNsKajqEdSExWYpXaRA9Dqk= X-MS-TrafficTypeDiagnostic: AM6PR03MB5927: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wN32jb2I2Uum3rYZOYvYS5CY8eFKZKXuc9N6NSzZA3s8iOresf7UdllkAQkmOIa5IvrBYgL+Zuu6HTxeT0Fub843FBSpzM4cdZ5u5Be/TKhAP9ABHFTrZlRsOGKg194qv8FgsGN+x39mLM1kD9MaGZ8BgXkr98gxNjGr4gj/TjsmYiDm+83YUnUDY6qBRO0mmXDa2DUu31qAM8op7mepfT1H30DuuJclb9T6L+9OC1fDk4wPWkgU3Nb3DwW+ON9KsMExHzWPRrafD7uStcenBKnU5Id3yGdrJs9oVaqk+ycJILXoCcOlhoGGaKitx4WcHSBaiEg3w4OcDJbWRl+yv9jXJ70MCZFpsP3F4imryxV9E2VH2fnkw6j0eXzMqjlvIEZmV9HPtRxB9y8WlB8s6H/tgmqu9PAuigfH43diGnS33FqWX73/Fj2ge7QFprn5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rhXOEOVG7k+X5Ky5VKHBclBXmKkKmSaeWaceyZRhNlVNauEffNzEG4PNEBnhg70HfOe9KARZruDStxzX7VfaO+NmBCDC+LTx0rqe/vUn6k7GxqaLdIfISf66QlZ3n+7un9qCjfaPGcUSpNsK+OjQSQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 775066c9-7b31-475a-eb65-08d96b334cf9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2021 21:23:53.0916 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5927 Subject: [FFmpeg-devel] [PATCH 02/11] avformat/flacdec: Also set channels when setting channel_layout 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pd2CNc+yTaOP This brings the FLAC demuxer in line with all the other demuxers. Furthermore, if it is not done and the FLAC decoder is disabled, the FLAC parser will overwrite the channel layout with the standard channel layout for that number of channels. Signed-off-by: Andreas Rheinhardt --- One could actually set channels generically from channel_layout for all demuxers. libavformat/flacdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 2060b48c69..d52434d2f9 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavcodec/flac.h" #include "avformat.h" #include "flac_picture.h" @@ -192,6 +193,7 @@ static int flac_read_header(AVFormatContext *s) "Invalid value of WAVEFORMATEXTENSIBLE_CHANNEL_MASK\n"); } else { st->codecpar->channel_layout = mask; + st->codecpar->channels = av_get_channel_layout_nb_channels(mask); av_dict_set(&s->metadata, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", NULL, 0); } }