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 5187842E67 for ; Thu, 13 Jan 2022 02:29:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5C7468B511; Thu, 13 Jan 2022 04:01:33 +0200 (EET) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8740D68B50B for ; Thu, 13 Jan 2022 04:01:32 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id kc16so5148831qvb.3 for ; Wed, 12 Jan 2022 18:01:32 -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=ZETwb2gm4Oue4duVFTVEm4IDADx7DPmsILwisrK0riU=; b=WIneWcaq0cE1cKqcw+qTXzvSkABHmOZqZabM6LNkhl5Ykwxp4JPoP60TNomdSPvf2W G+O5SdA4sE5Eq+149eZPN0iPHipTuznq5hKoI5ydNTYMZvCNNPd7ybVYuJ9ziFd9VI5L DBDqD9fpkBRDbBkGdqki9DM1Yig/tSbcw9Gd0ufHBs+IxlcWTe21auLFD/FkgHtHng4l ChNoVAcXIS7Ezo8mgI6bfJPtMkNLzP/W/CIDM/kQvp8vYwPxsmpYda5nm/eEFq+/7Ugg hEVbAjRlsl/7jtgQl2sUAxRplcaABEJ8hhkm3/RucExjYa8kzbpPlHux3H8Jx9DiICzw UAUg== 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=ZETwb2gm4Oue4duVFTVEm4IDADx7DPmsILwisrK0riU=; b=D2MYRpK6RptNc5auYAIhF6nMqNAzHUc3KmPtCUuVr30PEJZW/qKJbf1lMcDfFowDGS UoElVYQ+ujQGKswjDYmnodQKQgMhuAHjmqxBjWs6pwkj69ekwFiC6NT7KXkp5/ey+Zph qkmd1gQgGjrzxGsFLljOkse8SqQbdMpL7425iZ1EPbxnhQd1AsGLttNBfTZEpNxwLmOg M8qavy2OV7+tUCwCphkbUb04ui1SjUqXGuW4Rmx9KC0YDJPOkrBcjTGcbpoNvVnXFAy3 XOfjai2I6eBP78Pik8y0SJA+T0JOYO/iACGXR9jwd4NOX5lVMCAJDft/HMyHnlqHZvbD CJVA== X-Gm-Message-State: AOAM53365oCpG7BVC0cvr1grK+V5VsZxWNbALjlJYImquXPwkX/vPf7Y j1ExveWlsU8ZiYabODJfiCPGaZ9XVyg= X-Google-Smtp-Source: ABdhPJyvjAeXqGtaf28H/f4zy59bcudt7LMDO1E+YZ1q/xAmFlgIdXq9+tyCSqzQ3Ri2IXWSyNHvvg== X-Received: by 2002:a05:6214:d84:: with SMTP id e4mr2443176qve.92.1642039290923; Wed, 12 Jan 2022 18:01:30 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:30 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:16 -0300 Message-Id: <20220113020026.590-21-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 169/281] westwood: 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: From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/westwood_aud.c | 10 ++++------ libavformat/westwood_audenc.c | 2 +- libavformat/westwood_vqa.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index ff51e8bd36..9896bd46df 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -118,9 +118,7 @@ static int wsaud_read_header(AVFormatContext *s) } avpriv_set_pts_info(st, 64, 1, sample_rate); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->channels = channels; - st->codecpar->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO : - AV_CH_LAYOUT_STEREO; + av_channel_layout_default(&st->codecpar->ch_layout, channels); st->codecpar->sample_rate = sample_rate; return 0; @@ -164,14 +162,14 @@ static int wsaud_read_packet(AVFormatContext *s, if (ret != chunk_size) return AVERROR(EIO); - if (st->codecpar->channels <= 0) { + if (st->codecpar->ch_layout.nb_channels <= 0) { av_log(s, AV_LOG_ERROR, "invalid number of channels %d\n", - st->codecpar->channels); + st->codecpar->ch_layout.nb_channels); return AVERROR_INVALIDDATA; } /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ - pkt->duration = (chunk_size * 2) / st->codecpar->channels; + pkt->duration = (chunk_size * 2) / st->codecpar->ch_layout.nb_channels; } pkt->stream_index = st->index; diff --git a/libavformat/westwood_audenc.c b/libavformat/westwood_audenc.c index 597d68350f..a2401eff5a 100644 --- a/libavformat/westwood_audenc.c +++ b/libavformat/westwood_audenc.c @@ -77,7 +77,7 @@ static int wsaud_write_header(AVFormatContext *ctx) a->size = 0; /* Flag if we have stereo data. */ - if (st->codecpar->channels == 2) + if (st->codecpar->ch_layout.nb_channels == 2) flags |= 1; /* This flags that the file contains 16 bit samples rather than 8 bit diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c index 9d116060a3..ed5c1a3416 100644 --- a/libavformat/westwood_vqa.c +++ b/libavformat/westwood_vqa.c @@ -226,7 +226,7 @@ static int wsvqa_read_packet(AVFormatContext *s, wsvqa->bps = 8; st->codecpar->sample_rate = wsvqa->sample_rate; st->codecpar->bits_per_coded_sample = wsvqa->bps; - st->codecpar->channels = wsvqa->channels; + av_channel_layout_default(&st->codecpar->ch_layout, wsvqa->channels); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); -- 2.34.1 _______________________________________________ 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".