From patchwork Thu Jan 13 01:57:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp31142iog; Wed, 12 Jan 2022 18:22:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZRr8s8oNPgIwWYVAxp+/fAnekuvbYe1xN4tWGO6isvI1pLfclk7R1KnVKFS0mvSZIL0nx X-Received: by 2002:a17:906:4317:: with SMTP id j23mr1912529ejm.748.1642040520639; Wed, 12 Jan 2022 18:22:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040520; cv=none; d=google.com; s=arc-20160816; b=iohWbiVD5IehQ0USZpI6YF/piTry4sQRLZ3ez0chYKQ4ojgJhNuF3ezU9Sz3D4kCCK F+sJEDdM0LZuQ0O/WiO+oG+FpKqbckII+PUGlq7tHE0R0goiyOKNkAEBPobFUYCuFTew 5GTlJ08i9XCxMfKOOd7HSq99/2nPc+NCf9ZuiiiT8RCA+vfbUzql2b8DhQI5I75QAKsN fBCVLovBOpy2091TJIP5YwiLWadxCpOJaweGJwX+fR+oBcNFikTTU1V1o/1/VdzbBxtJ mpn6l8uK9eqo+beSljM8fyhHzt/30nzHxwYq3moURD+MeeXECGAw5zZFCZbSWysOAh3F 5FYQ== 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=CIyZaEFvsgoMTlgtcvc8I/HVOHUBju2Nsh40RlnQImk=; b=gqj0ujof0fPYox2oCBJoh0pnvp7M8/Mq73sPYzAWH9uxHCgzGOM84rG/m7ujdyHd93 fXoW4feKAPb62aDpc+ftT0BnTGv99b4Zi+K77bcI/T1lmkCsDrna30So813B0h/quSJU 3lk9bJr8teyMNemCmxs3Fysvzgntio7u4jH7bhYyo+h8Zxs/h0a6hBy+JYOtcSK7V/kc CuUQaKVH/Lrij8o5gYedz/9s73GMxwnvzRP9JcRHd9dNUoi+9aKtMNS2URegOaGm4P3I efhLAOPCCOkKQDhV1mTgkdMs16J9amfrBT9JPhb2bp+MsnIyPuBivuPjhO1JzeQigCIe yd6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W8f2euMb; 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 d8si862279ede.34.2022.01.12.18.22.00; Wed, 12 Jan 2022 18:22:00 -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=W8f2euMb; 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 C6EFD68B3AE; Thu, 13 Jan 2022 03:58:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BE3C68B38C for ; Thu, 13 Jan 2022 03:58:49 +0200 (EET) Received: by mail-qk1-f169.google.com with SMTP id g2so5612487qkp.1 for ; Wed, 12 Jan 2022 17:58:49 -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=1TieRme37DYb8EbyKuwNyXPDK67pQBQ/QEPz4nvQT0M=; b=W8f2euMb4zxsnjsDu9FxvaEne26RmlrAgKhHGhQ6v0mM7c2t7EyoJbQROsI+STH/Fd fXZk+WcHypzz22Gee6PvsBeDWjP7wfqlRChNPw5Dwb6IIpND3T4SgC9qQSnEVTINH0Ry pbsRE/lz4TFObAL1Q1G1MypJ4Wy4S41lCbwiokVHsLkm/lr+k6ceyl/a6LVMXuWxVkUW DieNT//8iGDAaDKOsZkwkMuw429a4ZqjgVnninIvoxiRPOgacBklKRTFUWSWqzv6dhNl qePBTTa3l89bbj/rYFwVus+q7Owqcw0R6/g903D5R3kS/0FktQQZPu6Gs17MjEoYM+69 PHRA== 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=1TieRme37DYb8EbyKuwNyXPDK67pQBQ/QEPz4nvQT0M=; b=jJZBSihE61H9b6PQGZIqvlKxGu6UMHpyn98mzOQdHeZwh6ScgnpxcSFcu9lA/cEPlv +AqjEan9PAicQZrG8n+usjTFtETb+vIZZLC8gfcJkcNRfguYPiO/liUoTwEF85sVU8i5 DwSKmaN73FHRsHpWT6V5OB2twAhTOUkgij3YN2GYYSIDPyhz7asD3WsrfSWIv4Vdvd5X CbRdRB9ru39AyhKOo3HJFVmNEzNnltnR8ZSQDBEa3f+2o4AitPsQktcggXFPs1Pd+re2 +spgbTSppGuTZ1tMusiPIYbSmuQyL8XapUJhTm4o+ROYz5l/JAaJKbt7iUWEh1mcihEl P7jA== X-Gm-Message-State: AOAM531DaIH6knb+APDFsA9clrpxyyAdd/0OZuxRRVxMLkYhprOloIOH p0wsqr+RPtDRGcxPVGA6tQlxJogOcf0= X-Received: by 2002:a05:620a:1253:: with SMTP id a19mr1838730qkl.665.1642039128024; Wed, 12 Jan 2022 17:58:48 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:54 -0300 Message-Id: <20220113015806.519-19-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 137/281] scd: 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: DXfbdKbAicqc Signed-off-by: James Almer --- libavformat/scd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/scd.c b/libavformat/scd.c index 0ed5322a14..d59d72e1d9 100644 --- a/libavformat/scd.c +++ b/libavformat/scd.c @@ -194,7 +194,8 @@ static int scd_read_track(AVFormatContext *s, SCDTrackHeader *track, int index) par = st->codecpar; par->codec_type = AVMEDIA_TYPE_AUDIO; - par->channels = (int)track->num_channels; + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = (int)track->num_channels; par->sample_rate = (int)track->sample_rate; st->index = index; st->start_time = 0; @@ -218,7 +219,7 @@ static int scd_read_track(AVFormatContext *s, SCDTrackHeader *track, int index) case SCD_TRACK_ID_PCM: par->codec_id = AV_CODEC_ID_PCM_S16BE; par->bits_per_coded_sample = 16; - par->block_align = par->bits_per_coded_sample * par->channels / 8; + par->block_align = par->bits_per_coded_sample * par->ch_layout.nb_channels / 8; break; case SCD_TRACK_ID_MP3: par->codec_id = AV_CODEC_ID_MP3; @@ -325,8 +326,8 @@ static int scd_read_packet(AVFormatContext *s, AVPacket *pkt) } if (trk->data_type == SCD_TRACK_ID_PCM) { - pkt->pts = trk->bytes_read / (par->channels * sizeof(uint16_t)); - pkt->duration = size / (par->channels * sizeof(int16_t)); + pkt->pts = trk->bytes_read / (par->ch_layout.nb_channels * sizeof(uint16_t)); + pkt->duration = size / (par->ch_layout.nb_channels * sizeof(int16_t)); } trk->bytes_read += ret;