From patchwork Thu Jan 13 01:58:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp32118iog; Wed, 12 Jan 2022 18:23:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzo1c+ZccC+l3EGlKOPnytd03my59l+kTeKCw/ZHyAvGQq+Fr30jlhom55+7orP8TNUsOy8 X-Received: by 2002:a17:906:4f90:: with SMTP id o16mr1950596eju.626.1642040621118; Wed, 12 Jan 2022 18:23:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040621; cv=none; d=google.com; s=arc-20160816; b=U5b57Tr4tAZvrWz9z3mRfzg4PRhyPIRyQPT+vO5XtZRH+VxRGthWw259wrhbTwtGOR VDs2tQnNzIvvTENxBAbXXzNRkijQPw4nQWu1X4zRzKBAy4HbmvZTjZKBK72xcDjIIZeN wp1fg4dT+C8Q+9/9eObxS8KYXZUenWKBlJJyTHdrAIPyFKaTfCdDw2jJhUJsUhzBB4vK fXSTQZ0VMH2ninoFvs9syUWmw8Lm5aDs+KQ5+C9tzQqRfbXPJO4khyIFRYSj9nG8oIlC q51jxr6SspM2RXaKZW08/ySYK1eYPoNyv3nOAE9r5zoqrby3/pl2Wls60T86J5z+zwaN 2UMQ== 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=CZ/Osu3wR9PHDBsr8PSkM+cYhmu5cDGvt24mVhwWdOc=; b=SSWwklHdc28s4Vt7hGoMR6B+bh0hXnOjqkOa7O+EKXL2QygqVp8cYEBRUgxJssLlnQ wdULyGs3Z2oZuiA2bxK16D6pjZn5edLqyDSBi+nimDAhYMhYd0vw0pPGNlVxI73qxXmz czUI/nbIgNH690hRccHBuFmU+oIrXtwMhLSUO4sZsQP026WLKWdKDgt/KSElW+5z4o3X sWzSjI6ogxYc8q5EYmaioAQbAxx5HEGj7Ykya9COPM3xZHY5rlvLsBMGANmThdOTScGF AgDBmKX6qLNtY8eRB3NTE22gnuqYU/WmGGiF2glWShMpfTDqzU7CK2sTxvNOQJFy1dqj COvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Ja4drMgp; 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 mp24si804338ejc.720.2022.01.12.18.23.40; Wed, 12 Jan 2022 18:23:41 -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=Ja4drMgp; 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 51CF468B050; Thu, 13 Jan 2022 03:59:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48CA168B3DC for ; Thu, 13 Jan 2022 03:58:58 +0200 (EET) Received: by mail-qt1-f172.google.com with SMTP id v7so5319498qtw.13 for ; Wed, 12 Jan 2022 17:58:57 -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=cSek5OhkUMKOavMTITV0Fsm/88MIVGhFDw+/1Ypgj78=; b=Ja4drMgpX/P50mnif+v6JBmzPQq3haMFzYnrZ3zC45i/vPcr7xSZadSFnkKKB/br2b zxFUUXzvl7/fi00cbeLaqv3CbNQ9QSOzfw8aPvqT686rmyvGkx+LmS1Lx6ommTTl794D QKTRfakIPFUinWgwRcjpWYZRJy+OGnlZOjdlN8gUGBVtkF5UZjmlmH/pibFLa5Z8xam6 RKuMde8hww/X2EMw9DucoRPpQ2BQfJXBwS/OBWhgpk/hycyvF/kVlwgL31wQKnmIHuh6 FoFEHZt5li1Gz3N/KHdclu5FQCEtPauaBNrVfGWqQEaAErVQ8CF/dmCbM289stVSnHUB Z3ZQ== 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=cSek5OhkUMKOavMTITV0Fsm/88MIVGhFDw+/1Ypgj78=; b=wCB5vep1o389BUkmvi1vbVEVuwHvovn4Y7flSI6oSIHjUHCnoID3VeCLqdF7c23385 OZ/bPoExmPUdLISEDpwj6OwXWAQQoG48z/DFySpdeaGtWrDLxW/EQni6HHEy58WkzH/K Fs09s2ZbNbP0qMe5dW9Wn78/1+3c/cOhinmDTUPxRCzyk+jpOAjBXDv4X4QtSqbgs58u hTECMhD6aMpB3YACv42gL8YPXcffrX9OYAloWBusmH6ebV0bkOyePcRPBT0vsWKscg4X cBc1OeDaAMp2zxvn5uBraaoZVZM8r0krAo3WvbSf7ukweKDfB1h9pCnTiXv8f/N+5RM2 wf3A== X-Gm-Message-State: AOAM530cS5f2vNI3dU6yIhDWPaXmVhuScjAIlg14crb5tGkLegr2AFLX LzZpaawBJa6qEoPMfFGTR3A6Zfavlg4= X-Received: by 2002:ac8:4e8f:: with SMTP id 15mr2057235qtp.418.1642039136470; Wed, 12 Jan 2022 17:58:56 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:58:01 -0300 Message-Id: <20220113015806.519-26-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 144/281] sierravmd: 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: 8xIuvNg4qBnS From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/sierravmd.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index e35faae50d..d110457ec9 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -134,6 +134,7 @@ static int vmd_read_header(AVFormatContext *s) /* if sample rate is 0, assume no audio */ vmd->sample_rate = AV_RL16(&vmd->vmd_header[804]); if (vmd->sample_rate) { + int channels; st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -150,24 +151,22 @@ static int vmd_read_header(AVFormatContext *s) st->codecpar->bits_per_coded_sample = 8; } if (vmd->vmd_header[811] & 0x80) { - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + channels = 2; } else if (vmd->vmd_header[811] & 0x2) { /* Shivers 2 stereo audio */ /* Frame length is for 1 channel */ - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + channels = 2; st->codecpar->block_align = st->codecpar->block_align << 1; } else { - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + channels = 1; } + av_channel_layout_default(&st->codecpar->ch_layout, channels); st->codecpar->bit_rate = st->codecpar->sample_rate * - st->codecpar->bits_per_coded_sample * st->codecpar->channels; + st->codecpar->bits_per_coded_sample * channels; /* calculate pts */ num = st->codecpar->block_align; - den = st->codecpar->sample_rate * st->codecpar->channels; + den = st->codecpar->sample_rate * channels; av_reduce(&num, &den, num, den, (1UL<<31)-1); if (vst) avpriv_set_pts_info(vst, 33, num, den);