From patchwork Mon Mar 28 23:24:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 35036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp626013pzb; Mon, 28 Mar 2022 16:26:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/efdUiNQcpfZBe79AyZ07Vuurwp582GlC2qonoFBuJb8oQmLrQTD5wJVAzy+QehfQ5ysB X-Received: by 2002:a17:906:e16:b0:6df:c796:25b5 with SMTP id l22-20020a1709060e1600b006dfc79625b5mr31454564eji.302.1648509999070; Mon, 28 Mar 2022 16:26:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648509999; cv=none; d=google.com; s=arc-20160816; b=T6V294RT2m3nS6TwAHS/mBx1yUV4AkDUehfGTwBC1geegWynNC5++h80Kh6FCpGb/V xQl6RJ6K7ALhzqgDay9zGEXUyeUM8sTzcY5ls+XaRJY2FA8sFuNqEyMnJfmoi178W/dH vHI3wH3cOxsSFCFWm0PGMlemikV+bzmeTJR2Nyyl0kl6Ymxfy8CHHBB6AuVIDdgNXkJu o7aVb9glPvODAiSo6rfEkOzSUfiJpDoOIOaIiCC5AtE+8KLE4igo0r/CkV3S/TekXjNi 7TtnyoyLVMPpwir4uAu2zl1WiHkcLUeCcqn5aD9ySqxyq6Io+mjDWglR1QktVkofO9OG oybA== 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=0nuLFO9bwgD+tjoufV0TwwUSNfFIZMIfRuDnCt6uwSM=; b=xSCCZtnY4A3+V9SdyZ1WhndY0V7CO9II/2GOZcXeQEveIfhyhVCa0cao72CmL9RBG7 dBigEoTiPUZODLZSTPLlXGce3DP5YIPg7YkeKQbUJ4bU5I5vPTnmpWQlxLgh+vyWO5/+ cE7z7ULvpd+ghRjV31GHnYtGqTdsa+f63+sbQecyUall4k5qWMXO2rKATYNfkIJHkMNL syAcb1anINMNpb2sCAmSILcOoSUkxmOWdHrJnUpgNPt71A7uyZkNO3J5sFWTmvNZJHQB 5Pxt3nsmQGh/6wO3xkdkrpZEV/F5utJ5M+PM5BE6xKKi48EkYbT1NKuX2aSrmu7dAZNK NkzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=D6fwbLM9; 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 kl16-20020a170907995000b006df76385dd4si15521937ejc.628.2022.03.28.16.26.15; Mon, 28 Mar 2022 16:26:39 -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=D6fwbLM9; 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 49D1768B2DA; Tue, 29 Mar 2022 02:25:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5275868B2C4 for ; Tue, 29 Mar 2022 02:25:47 +0300 (EEST) Received: by mail-oi1-f182.google.com with SMTP id j83so17358705oih.6 for ; Mon, 28 Mar 2022 16:25:47 -0700 (PDT) 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=cirjMwNbPHPBwO7+b89ehEqEXfSFJvkmi/bXphsCPgQ=; b=D6fwbLM9yXCiO1npKnWjWb9X9p98zUUeNLgpBNUqK1D+TcSxxMxguVh9Gf1xX+Obhi 7VZ+BA9k9wifmGbRQbplJGPrU/5S/CzYbgcsuWS3I2YX+tV+TAvJu+/6kQTCqw7NS8Mw 97gwvuYcB5D/9SV4uy4hjS1cXBF+ZuUU8ptPIqWhfY2EZ4x7w9gytw/6Ud6RXp2vYL/G p0ieQoIOBG0ClX7nKToJ8UiY5VsrUi7Nv5Ef3uzlA2kiTtG/ejg3j/csqqxYGbV4abMH 7kTYzfWYq/ZRdHGoZgUhNxelg6o0VKT2fe9DxPtF6ux144Y0BeJ0kJSnlPbLT8l7DVKC 7Vhg== 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=cirjMwNbPHPBwO7+b89ehEqEXfSFJvkmi/bXphsCPgQ=; b=u+GveWeXuKvh3xU5FKNNLbpv20leBHP5hmTzXnfOoDRPPXuYMTHcKGBZpnL+A5fCng cNsF79pPdk2BRZBO0pwnjFtRbr7dCMMVfTvY/FdXvdmoBaUHzqEFP+Foot8nm6OaPg8S TA44Cb9z0V4uUyt0MKZY4zaEFu1Ovrv1AEUKYUJex2ESfTYZOBdgnXZe3e17/0znoBWl vUeRxGcZTDhGt3UEu1dcGIuK4UnYCNjofOTIl63qrYoLwXFwY0kZCfjLTW0kTcxjjN1o 4vcqU79IjtI0vZFo3aw03YisiiQaHxF02wVnNuG3j0uWg0yJ9lv1ByDjTDteaq/DDz8t Rs0g== X-Gm-Message-State: AOAM5306RUD05LMuRZjDiDjogplibdPLa2AxCkPOb32dhmUxbMw9RXXm uOciMpnx90Y7Qy3DlQiyh/k70+PbrtyJ+w== X-Received: by 2002:aca:2311:0:b0:2ec:cb84:c5bb with SMTP id e17-20020aca2311000000b002eccb84c5bbmr826294oie.246.1648509945763; Mon, 28 Mar 2022 16:25:45 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id gk6-20020a0568703c0600b000de4880b357sm7198456oab.50.2022.03.28.16.25.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 16:25:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 20:24:48 -0300 Message-Id: <20220328232453.54773-2-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220328232453.54773-1-jamrial@gmail.com> References: <20220328232453.54773-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/7] avformat/mov_chan: add a few missing channel label mappings 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: bGK0vhPVSjsk Signed-off-by: James Almer --- libavformat/mov_chan.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 4607540297..98773bb460 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -485,12 +485,18 @@ static uint64_t mov_get_channel_layout(uint32_t tag, uint32_t bitmap) return layout_map[i].layout; } -static uint32_t mov_get_channel_mask(uint32_t label) +static uint64_t mov_get_channel_mask(uint32_t label) { if (label == 0) return 0; if (label <= 18) return 1U << (label - 1); + if (label == 35) + return AV_CH_WIDE_LEFT; + if (label == 36) + return AV_CH_WIDE_RIGHT; + if (label == 37) + return AV_CH_LOW_FREQUENCY_2; if (label == 38) return AV_CH_STEREO_LEFT; if (label == 39) @@ -557,8 +563,8 @@ uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, int64_t size) { - uint32_t layout_tag, bitmap, num_descr, label_mask; - uint64_t mask = 0; + uint32_t layout_tag, bitmap, num_descr; + uint64_t label_mask, mask = 0; int i; if (size < 12) @@ -590,7 +596,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, avio_rl32(pb); // mCoordinates[2] size -= 20; if (layout_tag == 0) { - uint32_t mask_incr = mov_get_channel_mask(label); + uint64_t mask_incr = mov_get_channel_mask(label); if (mask_incr == 0) { label_mask = 0; break;