From patchwork Thu Jan 13 01:55:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp24666iog; Wed, 12 Jan 2022 18:11:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqbNIHWFHh3dr1ejxS7ro3z74vc66DN5zucqqWOSb6bD3Zl4T6rUoyXf1OREMZqwLFHzUv X-Received: by 2002:a17:906:69cc:: with SMTP id g12mr1913715ejs.372.1642039896505; Wed, 12 Jan 2022 18:11:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039896; cv=none; d=google.com; s=arc-20160816; b=xprSr+/8Xx0dUlZll3P9d2e48G3Rn43OVfOAyhyas3EEl797dJB7EbYj5lwHbeJKAH qA4FQxpOFg4RtlQGP8nyAAE9DQEZUcgWhXXb45NODLAmipMDuxRAoyr9QLM7svveJHBq 5qkV0L+zm7a7PQGrRTU4m3rZpB2eTFPrQWzmIYGACVUb8DyJnG2hXON+y8AVQwFrhPE9 FSwqE40hDumk6zaEIB3Kw1qov/pfqizyGl5cxPc4AYBs+HgIG1hGLbhHILuo2yGReomi LPp9nMrTbzp6vuHkhk2nAmZSY/gyJRHZ5kRbYLvOONHhiYnwthnGcr9/GxVR+PJHoGax zInA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=uhsI+3kzG8ZyBF9ax3PzhEO1cfuMb6Lp0oFKWH3zIkI=; b=EYdibrrqZxgIxHeruPpeLC3Pbx47Tr/dWyjCgNfZYJOhOKmnJa7TpuAkgcKHs4qB2p iwbql8yc7/PTA5KDuUZW71JIcLtpuG+Ke2aze3e/Lf+BDqFfoXcX3SLmggozAedQYymo /2N9MWv4yCrDC0XralnHrx4ixt/W2qgypQC4xVbbGcBT4cd89z7evdHK9z7b84eemNyd VsDjNKRHldzBU4Lr/oSpFj6dVZ4FJXa2crQ2OLpxTzbYaeLJBvTAQVoyFmCrJyrOTc1u oXNJLsRL1fZ9QNEuDhd2F/D3SYNg1R/NTCeCTSkWnnUT6hru8DJW/Vh5KExR87neooOn vj7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oC9V3hoN; 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 ds1si144313edb.322.2022.01.12.18.11.35; Wed, 12 Jan 2022 18:11:36 -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=oC9V3hoN; 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 0D9C168B179; Thu, 13 Jan 2022 03:56:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 228A968AFBD for ; Thu, 13 Jan 2022 03:56:29 +0200 (EET) Received: by mail-qv1-f50.google.com with SMTP id 15so5054244qvp.12 for ; Wed, 12 Jan 2022 17:56:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5kvJsAMevTKlFVRZeCxymzidyRqzGQnWsTKjlt6Ivu0=; b=oC9V3hoNBeeJ4vm7H1Xnw/0R5e4aebV2YQoeU3x8RVAjF7R/m8NKS8CGLReeL/5ihs 5EDEtDtQj2qNPWFSWmRYC1cnPyawSET9ryXfloVLVcEe8wsVYrz2kkSb9l+mtulX93cM 2dwTc9nNyeqtiA7CUyBVul7u2hIGw0Wn/YB8WExrWMRw9iQVBBs0r63ndSHJuxZtK/Nk RSEKL5WQufLXgHVnkgZG7O4gCoxsWgpj1Hn0NWEHipOx48c/Et6N2yHYkvG5LXPOW18h BQ+BSfuC8SMrDdm2vNidM/aV975Nn1tMitFdnDEzjoft95GsVoUOGvtyCIQeFS5p+sCo A9xA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=5kvJsAMevTKlFVRZeCxymzidyRqzGQnWsTKjlt6Ivu0=; b=l7XZkGlujkeQi8HgHXDaHho9jK8CZoyLbwVZEKWOslZ3RY+xeJSYFmuedqQntadZFO enoOSsPWMxoHzQ0Rmk16JuU7qwADY9xigeFbIQIko0+0vHWWB4cDSzP0DErIB0Yef+99 Aw+1wHouFzaWJRwp6JXX0sQHJssbCGABgnWhZA/DT/m9jEm38mDcUfir4tMraSMP163R 7cBc7yWMSxW7CYTl2yaZJKj5vshn8+gOOoa3/37tLC/vmY8R3PY9AnwLahjv+ZwtUuxi 7D+i5AotPmZoki7A+w+t+nWl58gaB3D7xtgwQ3z6xe4TDwVd0pVk8DQfTDVLLj9vmrVg aBRA== X-Gm-Message-State: AOAM533MjTjm1I0KrO3ZQUlcCDT4XXcXGDedgoKhV0NCoJzTvHtJoH3u VMkYG9p4BcZZZn2nmWSEqMYtwN1cdlo= X-Received: by 2002:ad4:5de7:: with SMTP id jn7mr2126006qvb.31.1642038987700; Wed, 12 Jan 2022 17:56:27 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:27 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:44 -0300 Message-Id: <20220113015612.448-3-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 091/281] matroska: convert to new channel layout API 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: x13lBFG77b86 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/matroskadec.c | 8 ++++++-- libavformat/matroskaenc.c | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 78e5a4a203..62a36cbb8c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2083,7 +2083,7 @@ static int matroska_parse_flac(AVFormatContext *s, av_log(s, AV_LOG_WARNING, "Invalid value of WAVEFORMATEXTENSIBLE_CHANNEL_MASK\n"); } else - st->codecpar->channel_layout = mask; + av_channel_layout_from_mask(&st->codecpar->ch_layout, mask); } av_dict_free(&dict); } @@ -2911,7 +2911,11 @@ static int matroska_parse_tracks(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = fourcc; st->codecpar->sample_rate = track->audio.out_samplerate; - st->codecpar->channels = track->audio.channels; + // channel layout may be already set by codec private checks above + if (st->codecpar->ch_layout.order == AV_CHANNEL_ORDER_NATIVE && + !st->codecpar->ch_layout.u.mask) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = track->audio.channels; if (!st->codecpar->bits_per_coded_sample) st->codecpar->bits_per_coded_sample = track->audio.bitdepth; if (st->codecpar->codec_id == AV_CODEC_ID_MP3 || diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 152312102a..5278166e8c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -657,9 +657,9 @@ static int put_wv_codecpriv(AVIOContext *pb, const AVCodecParameters *par) static int put_flac_codecpriv(AVFormatContext *s, AVIOContext *pb, const AVCodecParameters *par) { - int write_comment = (par->channel_layout && - !(par->channel_layout & ~0x3ffffULL) && - !ff_flac_is_native_layout(par->channel_layout)); + int write_comment = (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE && par->ch_layout.u.mask && + !av_channel_layout_subset(&par->ch_layout, ~0x3ffffULL) && + !ff_flac_is_native_layout(par->ch_layout.u.mask)); int ret = ff_flac_write_header(pb, par->extradata, par->extradata_size, !write_comment); @@ -673,7 +673,7 @@ static int put_flac_codecpriv(AVFormatContext *s, AVIOContext *pb, uint8_t buf[32]; int64_t len; - snprintf(buf, sizeof(buf), "0x%"PRIx64, par->channel_layout); + snprintf(buf, sizeof(buf), "0x%"PRIx64, par->ch_layout.u.mask); av_dict_set(&dict, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", buf, 0); len = ff_vorbiscomment_length(dict, vendor, NULL, 0); @@ -1396,7 +1396,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM"); subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 6 + 4 * 9); - put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , par->channels); + put_ebml_uint(pb, MATROSKA_ID_AUDIOCHANNELS, par->ch_layout.nb_channels); track->sample_rate_offset = avio_tell(pb); put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate);