From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 60DDF406C4 for ; Fri, 28 Jan 2022 10:08:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E2A568B232; Fri, 28 Jan 2022 12:08:29 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2028A68B122 for ; Fri, 28 Jan 2022 12:08:23 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1252124017C for ; Fri, 28 Jan 2022 11:08:22 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id BCH0F1PSMH2B for ; Fri, 28 Jan 2022 11:08:21 +0100 (CET) Received: from lain.red.khirnov.net (lain.red.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.red.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 716B0240179 for ; Fri, 28 Jan 2022 11:08:21 +0100 (CET) Received: by lain.red.khirnov.net (Postfix, from userid 1000) id 6318316008E; Fri, 28 Jan 2022 11:08:21 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220113015612.448-8-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> <20220113015612.448-8-jamrial@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Fri, 28 Jan 2022 11:08:21 +0100 Message-ID: <164336450125.23111.16112811717832768951@lain.red.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 096/281] mov: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting James Almer (2022-01-13 02:55:49) > diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c > index 349634094c..5894bb8ce2 100644 > --- a/libavformat/mov_chan.c > +++ b/libavformat/mov_chan.c > @@ -499,7 +499,7 @@ static uint32_t mov_get_channel_label(uint32_t label) > } > > uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, > - uint64_t channel_layout, > + AVChannelLayout *ch_layout, const? > uint32_t *bitmap) > { > int i, j; > @@ -519,7 +519,7 @@ uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, > const struct MovChannelLayoutMap *layout_map; > > /* get the layout map based on the channel count */ > - channels = av_get_channel_layout_nb_channels(channel_layout); > + channels = ch_layout->nb_channels; > if (channels > 9) > channels = 0; > layout_map = mov_ch_layout_map[channels]; > @@ -530,7 +530,8 @@ uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, > continue; > for (j = 0; layout_map[j].tag != 0; j++) { > if (layout_map[j].tag == layouts[i] && > - layout_map[j].layout == channel_layout) > + (ch_layout->order == AV_CHANNEL_ORDER_NATIVE && > + layout_map[j].layout == ch_layout->u.mask)) > break; > } > if (layout_map[j].tag) > @@ -540,9 +541,9 @@ uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, > } > > /* if no tag was found, use channel bitmap as a backup if possible */ > - if (tag == 0 && channel_layout > 0 && channel_layout < 0x40000) { > + if (tag == 0 && av_channel_layout_check(ch_layout) && ch_layout->u.mask < 0x40000) { This should check the order is native. -- Anton Khirnov _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".