From patchwork Thu Jan 13 01:49:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14369iog; Wed, 12 Jan 2022 17:56:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQr0R9+IhNyVsy/+3r3ezzuZnztj9b4mLsFPjoxWZbZlFwZpCIfb4OifG0mVgz1Z+Q6t6W X-Received: by 2002:a05:6402:888:: with SMTP id e8mr918221edy.9.1642038967449; Wed, 12 Jan 2022 17:56:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038967; cv=none; d=google.com; s=arc-20160816; b=uJl+E1/r6vb3q+hswF1NtNr4eC8VUqIAY/eO1Jcp25yXzv5deoOGAsYXVQqVIDaO6V 0pqRy6IxUeGtc/DI2GA02E4DWVd9YoM6wBuA0jR7n0wNJcaBT1wz9iZXHL/thqPGgOyU juXY1Lb6NreUmHZucAVU0go9gODj5lL2Jdnuj6kIOVHJkYBdLup2pHSexzqOWjCYusMS glWqcphJDsEtgU9FxJjqMIZgqO2ex9ekzATKvPwcxLxnNrHke1Q/OGvSVCXrB5amXfNA zWGE7QoRWfQVvYX9OFlka3v2bZyFqSxYCugpPPtrqOtFtm1JMr3pqeApEOhD9OdGBc/G R0wg== 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=TYR+PU3L1ikic40+d/hBxVLyUUodW9IwKqX73VD25U4=; b=m7af94vTKsnX1/NYIt7JE10jDUGrUj6mGHZ1RM09Gxo2UX1jwS46RIY4ODEw5H5tcv C9Jc1c6is6KqguClqU4jwC0ehyws582+LUncaSRFtaXgXeV7seJo/c75juRqPY/59hiL iKzVsNpjegSmKfExmGzv9AVGCTOJckrfdIH4VkuesnwLvSaltLCOzO/N+NEzVpGbStlQ r4kCccyGQkVtEDer5KAGJdxQ8jnaPdrEmMaSGjU4fKBfd/xWIGGVHPHjN3p2m97yjvp6 zweJvDfDDjkW1xzdQIRgxNne0lvDN7bRmMQCz0EUTwYm3Y47QkE7ssZYAUPDJkIc2pvl XjTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=UberPBbc; 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 hy13si677744ejc.54.2022.01.12.17.56.07; Wed, 12 Jan 2022 17:56:07 -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=UberPBbc; 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 CBAE568AFEE; Thu, 13 Jan 2022 03:52:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD3BD68A3B8 for ; Thu, 13 Jan 2022 03:52:26 +0200 (EET) Received: by mail-qt1-f181.google.com with SMTP id v7so5304597qtw.13 for ; Wed, 12 Jan 2022 17:52:26 -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=kVJhYZndRusZczw/THbHIdNZI/sw3CosacidPV5X+fM=; b=UberPBbcdnW/7/nXC978kuCt35pkB0FcT+5/lcN429JDBugVfhHv1e9D5wbrR6XK9i YDaGEt1figyYyUY99F25mFmtvFCoZ5SnHpvv7bJxIwW/VvSCy1E2HWxXr55eMCmpm9Q5 P+QcDg5bwPTxOZPeZzOkPHglmdSR5LPLi+z0q/yg1xKcenN1h3GVbWM+gIeItx2uL4YT 5LzTCgBEEazPlCyXDr7/zvgg0g5sceQ8SlFKKEhymkFEK0w46sGRd33wqo5hoUZ8jO6B EkKzx5viKolZUk+McWCenArFMirB2KoSSkA9YH+FKz9ocVUzfRTrO10+yx9dox8NgSlW oT9Q== 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=kVJhYZndRusZczw/THbHIdNZI/sw3CosacidPV5X+fM=; b=5u3sY5bcz8Pvse69gFyWMtcaoIyZD8ZbkADoHtwKY9W5ovL1zQ51bTu84N9UzwHOm0 5/bC4lbyb0rEk7u+E7qMQQEdGoLw3fk5XwbYo9A8FQwH8CsvlHfvcAsH/vyjksID2XOG /y+P5mAOMd70JUucmUzGHjElvHhaFcYBqW0EAAykxnd2lg7fRueOxf8HlPT+TG3ULeP2 cKRSNhCtyK4xA9a8BZpAGRZo0HlY6/i8A0BNHQTo9Lu/9Esb9yECJvwaic3Wbk+zImKC z6nqmGTYr/r2rAo65GCl3xGRRRKULrjrrDRjjNnGOm1LttZE9r7pv3r4MDaPoAHmjoq/ Tjow== X-Gm-Message-State: AOAM533tn82D14gGbWPPvReUbEsF6/96WexRRUZTkQBQtZ2QUGneLdY4 86kMfUD3NafOO8GdIkck/Agqs2L0eb0= X-Received: by 2002:a05:622a:653:: with SMTP id a19mr69584qtb.166.1642038745170; Wed, 12 Jan 2022 17:52:25 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:43 -0300 Message-Id: <20220113015101.4-22-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 021/281] aiff: 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: 8/EWSuUDIvoa From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/aiffdec.c | 13 ++++++++----- libavformat/aiffenc.c | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 7afadeb085..c56949bef9 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -99,6 +99,7 @@ static int get_aiff_header(AVFormatContext *s, int size, uint64_t val; int sample_rate; unsigned int num_frames; + int channels; if (size == INT_MAX) return AVERROR_INVALIDDATA; @@ -106,7 +107,9 @@ static int get_aiff_header(AVFormatContext *s, int size, if (size & 1) size++; par->codec_type = AVMEDIA_TYPE_AUDIO; - par->channels = avio_rb16(pb); + channels = avio_rb16(pb); + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = channels; num_frames = avio_rb32(pb); par->bits_per_coded_sample = avio_rb16(pb); @@ -154,10 +157,10 @@ static int get_aiff_header(AVFormatContext *s, int size, aiff->block_duration = 1; break; case AV_CODEC_ID_ADPCM_IMA_QT: - par->block_align = 34 * par->channels; + par->block_align = 34 * channels; break; case AV_CODEC_ID_MACE3: - par->block_align = 2 * par->channels; + par->block_align = 2 * channels; break; case AV_CODEC_ID_ADPCM_G726LE: par->bits_per_coded_sample = 5; @@ -165,7 +168,7 @@ static int get_aiff_header(AVFormatContext *s, int size, case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_MACE6: case AV_CODEC_ID_SDX2_DPCM: - par->block_align = 1 * par->channels; + par->block_align = 1 * channels; break; case AV_CODEC_ID_GSM: par->block_align = 33; @@ -182,7 +185,7 @@ static int get_aiff_header(AVFormatContext *s, int size, /* Block align needs to be computed in all cases, as the definition * is specific to applications -> here we use the WAVE format definition */ if (!par->block_align) - par->block_align = (av_get_bits_per_sample(par->codec_id) * par->channels) >> 3; + par->block_align = (av_get_bits_per_sample(par->codec_id) * channels) >> 3; if (aiff->block_duration) { par->bit_rate = av_rescale(par->sample_rate, par->block_align * 8LL, diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 1fd6b8a70b..bdaf5c2c3e 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -144,10 +144,10 @@ static int aiff_write_header(AVFormatContext *s) avio_wb32(pb, 0xA2805140); } - if (par->channels > 2 && par->channel_layout) { + if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE && par->ch_layout.nb_channels > 2) { ffio_wfourcc(pb, "CHAN"); avio_wb32(pb, 12); - ff_mov_write_chan(pb, par->channel_layout); + ff_mov_write_chan(pb, par->ch_layout.u.mask); } put_meta(s, "title", MKTAG('N', 'A', 'M', 'E')); @@ -158,7 +158,7 @@ static int aiff_write_header(AVFormatContext *s) /* Common chunk */ ffio_wfourcc(pb, "COMM"); avio_wb32(pb, aifc ? 24 : 18); /* size */ - avio_wb16(pb, par->channels); /* Number of channels */ + avio_wb16(pb, par->ch_layout.nb_channels); /* Number of channels */ aiff->frames = avio_tell(pb); avio_wb32(pb, 0); /* Number of frames */ @@ -170,7 +170,7 @@ static int aiff_write_header(AVFormatContext *s) return AVERROR(EINVAL); } if (!par->block_align) - par->block_align = (par->bits_per_coded_sample * par->channels) >> 3; + par->block_align = (par->bits_per_coded_sample * par->ch_layout.nb_channels) >> 3; avio_wb16(pb, par->bits_per_coded_sample); /* Sample size */