From patchwork Mon Mar 28 23:24:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 35034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp625848pzb; Mon, 28 Mar 2022 16:26:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDky26gzg6AFCGpzT8NNq2KZcKbT5eiw+RHzNZLwKTsPbxdJMExzv/SOo4x70JImWW+oGi X-Received: by 2002:a17:907:8d17:b0:6df:c072:2f66 with SMTP id tc23-20020a1709078d1700b006dfc0722f66mr30062147ejc.444.1648509980812; Mon, 28 Mar 2022 16:26:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648509980; cv=none; d=google.com; s=arc-20160816; b=YsC1sXl1G7i9pBj7JcNmd7Dh/D5yUM+55Aoj8wA03uO4ut3Xts2N8qHEZOLUdylPUE iwHyOICkaavud1LlrDN+UteFWkAzTQCbxGq0ZsDH2pJgGjgeKPjOf6vRa09M19HFTmxo X7w3e0ovJXqkUs8X1KATN/z4IP8xZiOT9pPICc2jmJ8mTT8qdH7oR5xZWgigaX1Fv2zQ Z+P5pDaePHvpm31ulTS5FqhRQFAZs8U62peYDwAA7BZxTkdBYuuLle+yEYSXpZFRyeBi X2ogWImeKX4LLznvH1aEJOYd4QGDFcafdn213uttgL52W69+CmRKIrx/2ShV26gNb05U Kmew== 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=1RGmb7ILK1WDYAysxbSL1fEGDMXVU4fNKDfkJMe+moA=; b=vPvzx+waBy/ICeQxZI4dkwLKhumdAVXpH4kai5yw6WO/QEYfqeqzzcc4teArQyK4Uo P/K4vDuiNlCl+2hHErQMOKkDChkYxFAV4XUerkZ/asqRMSihiD5RRVCjgcD9mK/ginmm jFRLgXfDd9UNIjulRjVG+7wglZrwS0Fe1kUHBIGYIk2YGuVDm5peHR1OmXSQYhpRggO8 Ep6pdeBnsrDqoly57PXX/a52XRusXik26lclBPz5QImnOqFttlyHo4CnoYSuI8Iut1kt KaXZkQeyJfIlSnFGLvw88qiN8WYHIdMKdrvXPXM4NMQFhRMqXaEHxn1i09hlW5b2iGPO buRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jGG7W0zJ; 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 rv3-20020a17090710c300b006df76385ec1si14495658ejb.865.2022.03.28.16.26.20; Mon, 28 Mar 2022 16:26:20 -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=jGG7W0zJ; 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 62B8168B2C8; Tue, 29 Mar 2022 02:25:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C85668B2BB for ; Tue, 29 Mar 2022 02:25:46 +0300 (EEST) Received: by mail-oi1-f181.google.com with SMTP id q129so17377875oif.4 for ; Mon, 28 Mar 2022 16:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UzILGD5CBCFZsMjnd3TYtFeM+idjVVzp3NqGyawluwc=; b=jGG7W0zJ9sS2a+7o8N082+CZswVy2acpuf4ZwYntToJxxqNn1V5aHmqe00SvhLlpjt G0Q2WxMwEgrHBGZom+q2ec/PchCnNKxCkct17rkFsxQSt5VcM1KDfOngxXQoJmSujE6r VU9EydQklq24KdTbEmS5Vq1sEsJYkArPUHKYaFwekqlEP3vwlMcLfqnCtQB4HnseAUmv eeaQJGhyjhuwpt2xMndRGLxgY5WbOyOVqJP9DOmSEn+RpO4d/Ero6+U5uymU6ZgRNTrq o0Z9BMMgbv+ph85xP1ruJ8L5vDVy7pseU/x0UX8y0g/tg+ldv+toTrP7eFbuBcJ/A9cV sC/w== 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:mime-version :content-transfer-encoding; bh=UzILGD5CBCFZsMjnd3TYtFeM+idjVVzp3NqGyawluwc=; b=4pXovh6pfZTLDWDLeti/VVr7NZc8sFeDncjKHon9j2IP0BQ2wJ6bhNM2kwNPb1a4l2 xOty3Po9P0a7yzUCoTIZ/mDCO9yTBcoxeQ3utNAA3wCqeBJZUTN0tEv3MjNr7lHuwPUF 8do8jBLq6xic5d/RCn+E+lPGK6ZMtr+rApP4ADgn432dVGCwKb61hyNA6d6qVfyOw1l9 /TH86mKQw/FqaGBkemqdRfsnf1eQG6drzSFRbtL9I1cH0G+nXynBR0DDE9waypT3Djkh T+92svfAAIQmDCw00i3obJkrTd9UeqAQ79yK093J+mS3wqhQzLOptBBkIpO8L4e9uD1p ychw== X-Gm-Message-State: AOAM5311a1VMJmfIRC3BHU+I8YrZqMBvIehwf6qRdq1LplUxy2T6iPy6 rs9N2339QtK2FHs46utNkavU4VarWZWEkA== X-Received: by 2002:aca:3e41:0:b0:2ec:f51d:946 with SMTP id l62-20020aca3e41000000b002ecf51d0946mr848159oia.138.1648509944536; Mon, 28 Mar 2022 16:25:44 -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.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 16:25:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 20:24:47 -0300 Message-Id: <20220328232453.54773-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] avformat/mov_chan: rename mov_get_channel_label() to better reflect its purpose 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: Q6ftl0o0GUTI This function turns a mov channel label into a lavf native bitmask. Signed-off-by: James Almer --- libavformat/mov_chan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index f52239d347..4607540297 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -485,7 +485,7 @@ static uint64_t mov_get_channel_layout(uint32_t tag, uint32_t bitmap) return layout_map[i].layout; } -static uint32_t mov_get_channel_label(uint32_t label) +static uint32_t mov_get_channel_mask(uint32_t label) { if (label == 0) return 0; @@ -590,7 +590,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_label(label); + uint32_t mask_incr = mov_get_channel_mask(label); if (mask_incr == 0) { label_mask = 0; break;