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 AB57E42E4F for ; Thu, 13 Jan 2022 02:29:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FC0568B4EB; Thu, 13 Jan 2022 04:01:28 +0200 (EET) Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6B8468B4DF for ; Thu, 13 Jan 2022 04:01:25 +0200 (EET) Received: by mail-qt1-f170.google.com with SMTP id c7so1760740qtc.11 for ; Wed, 12 Jan 2022 18:01:25 -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=Og5vccHqJYi8/SE3kv2R1u5tFdPM8qW9c+yL1WSYA3o=; b=HQ/WsrgPxQVH+8pXk4Z2gTryfzzM7W8cEcSwAVphjCVrCZL6u6jNlMNqgTDjPBOoRw Zkf8uBkpfeTYq5v7DAmX1ycPhZt3qtwnRAJGwCuiyn/4X1syVhSQbTBudmXGhOSMrj21 u3nJMpBR2INJU4ds/aQ1vIx9jMTYU3LQzCzmXQcNB6AxBkyYOSIExt74bz6ZXnXr7/YY ZAK1YxgfLrn2iLfZk6HELNYjhu8PoEFPrROaEln7aYKjIdnt2ACoX+8NaBfWEuFSuLOf 8+Yl5pse4c3ZQZ1z7sTKBcwwNjWHA06gLyPEH0RfA3AxKsJJ41nOF1YqCR3CSmcoSWwC WA+Q== 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=Og5vccHqJYi8/SE3kv2R1u5tFdPM8qW9c+yL1WSYA3o=; b=dWK7JHdMR5b0RydzPK3BF9TXwArhXXLCYw8q+27aSwbFKi6W/vyUcQ/wBlTOiKNID5 vbE5KQJkLIZWmahwy3OCh/LkKCT7kizizTJkGNtUaRh93hqhXxVN8VBZS+1r4+N9wT7V 3O+GTFohFTHsvRLS70+l6ivhfzUfgD1WC4qcy1AcRi0O2Y5LmAaM7rsjAwEiH21hpuWz b5l2deCSS+ZYQ3dXEaZyEXrnPrThJcQJYX2XOZ2l+D5S/1th1WvWYP2FI3WK2wONMvpf hFLyAKS2hqpmpB/ZHIotE4BuLC3d42LOuQH0sKuHDkNwLHGRELdz40/8zP/Ub9/gnHSC gAlA== X-Gm-Message-State: AOAM533E5kQoKgrbUDQ9nOCXaIdkTsjusMT8l1RhG9Fc636tvy7LEaqX n83/7YUpCJMffJIvILxIkL3DBbMFTkY= X-Google-Smtp-Source: ABdhPJxUds1AvTEn6nG+NtwKpX8ibOnw+3nWmGMswghy71OYAYOTd2yhbTuWHqk7wiOTg9QAGS+ZCQ== X-Received: by 2002:a05:622a:614:: with SMTP id z20mr1980216qta.423.1642039284358; Wed, 12 Jan 2022 18:01:24 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:13 -0300 Message-Id: <20220113020026.590-18-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 166/281] vqf: 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: Anton Khirnov Signed-off-by: James Almer --- libavformat/vqf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/vqf.c b/libavformat/vqf.c index 76131cdc55..d6e4016bc8 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -136,12 +136,13 @@ static int vqf_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; avio_read(s->pb, comm_chunk, 12); - st->codecpar->channels = AV_RB32(comm_chunk ) + 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = AV_RB32(comm_chunk) + 1; read_bitrate = AV_RB32(comm_chunk + 4); rate_flag = AV_RB32(comm_chunk + 8); avio_skip(s->pb, len-12); - if (st->codecpar->channels <= 0) { + if (st->codecpar->ch_layout.nb_channels <= 0) { av_log(s, AV_LOG_ERROR, "Invalid number of channels\n"); return AVERROR_INVALIDDATA; } @@ -192,15 +193,15 @@ static int vqf_read_header(AVFormatContext *s) break; } - if (read_bitrate / st->codecpar->channels < 8 || - read_bitrate / st->codecpar->channels > 48) { + if (read_bitrate / st->codecpar->ch_layout.nb_channels < 8 || + read_bitrate / st->codecpar->ch_layout.nb_channels > 48) { av_log(s, AV_LOG_ERROR, "Invalid bitrate per channel %d\n", - read_bitrate / st->codecpar->channels); + read_bitrate / st->codecpar->ch_layout.nb_channels); return AVERROR_INVALIDDATA; } switch (((st->codecpar->sample_rate/1000) << 8) + - read_bitrate/st->codecpar->channels) { + read_bitrate/st->codecpar->ch_layout.nb_channels) { case (11<<8) + 8 : case (8 <<8) + 8 : case (11<<8) + 10: -- 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".