From patchwork Thu Jan 13 01:50:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp21732iog; Wed, 12 Jan 2022 18:07:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLPqjtBs7/v/hR8cT0BE00dLsxDmzKxUk+CEdUfwNl3Xwl4SOy5BFqLIPlybI9DxA3e3ND X-Received: by 2002:a17:907:7f1d:: with SMTP id qf29mr1875024ejc.388.1642039635105; Wed, 12 Jan 2022 18:07:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039635; cv=none; d=google.com; s=arc-20160816; b=POovFnIlscSnCJQekEwc5BEuyRSa5DYd1RxqgBwzokt/W5Yt9yvLIJdohvSnr1ulL4 uT7Fc8uq/ykndh4BvuXMnUoj0UU0XpNZwYTG/sn+xvKx1E4Ik3QL3jzrRF3NlzTUKYa9 kMq4oDkajyzeSbJR2nu6XhGfcuxmodLt07LN2Eayo6eM9JGNwgDyKcDJhyv8IGOHKpHP 9znh+DlETN3yrLTT7A8OiQiF7Q0ZEVgi7og+ivytp/NUAnD6bHXt/01COHGzTAUF2Bo/ bM1JwKk3b/CP1Lna9a0L1+l3ELaB1yjeuq84vsNH69rniGuQNABIp2Ik68pk8dshLdDO GTCw== 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=i7uIR4G4/eZ09JUhThiCbjC3q/rCBK++AqMeP+MrjPk=; b=cb96ySxQsdLnHs+zW2iXYUUM2CAOjoqR7N9JrZR4lDhnwrkE/cIb7ZuTNsFY7YB0J4 35pA8NYAyirvpKIFZ8oUVz4mQrDPJCptEXE9DlkEHpYdJluMXUwDEnDUcPvT15pmgS7I WjTFaFpvdeKFLPwOyJ/0vJ64Gzs4W3DNjQc8QeL8pMJhaZRGBXnsA62qwJAaY+Nfx2AE ttnSV+nSuNJVMOq3sYBn8RdFgii4SPStXK23Nej57HHVSuoSSNYMEncwGqX+r6BgPt+h c/LLr67koLVTbZjXD3eEFs+hVICou7jHo8/J+sA4rcSrixdGxhuPA39oT77dE/AVyPIl 27mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IqY3JpeC; 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 qb11si756949ejc.283.2022.01.12.18.07.14; Wed, 12 Jan 2022 18:07:15 -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=IqY3JpeC; 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 2F30568B1BC; Thu, 13 Jan 2022 03:53:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A209F68B1A8 for ; Thu, 13 Jan 2022 03:53:27 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id hu2so5077999qvb.8 for ; Wed, 12 Jan 2022 17:53:27 -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=hiE7ul8/OB4fbka2y4pwskbuOOJ/NYFygBJvDji1p2Q=; b=IqY3JpeCfF5486N9vaNfXqO2+1P5Y8nrfR1DdLDUVnN9Whh0XwZFu8eze3q9/6lwVy e/R2R9olHPJCb3sfq8ylDIu/gkTadlGGtGkS7t9aEvMms8tC83uWDTXpFqRmzzBA5kwu Cf/k+wyP4ZMKj9Uwrb+nlt1wjsBXcgBpXAj0AT0ZLNEGZK3TzDUPj9AC66+KfV3myr/E Ehl1SpGwJnpBZ7SI2XvNx5CMpXHcOMPMarVigTjlFJHzF65MqNmNpx/2LgcIAeMtwlUo SecL3TNaasGNi3Xx5FlWKprIkFGicZQQuM0JSbYgbGPNffpHSj97anI5YFww6FXkXQtw dftg== 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=hiE7ul8/OB4fbka2y4pwskbuOOJ/NYFygBJvDji1p2Q=; b=Ag5F8YyhyKrtJOCQBAGCY9tsSM5QflrazKJhOCa2WTgJkhOioaYal7lKF7TGwsj30i Fy+fEAVyte2K3v5VvmYN0JWERkYsEoYMBPdPjM5DoweEJzHgAsQ2NoTrNpAKH7hHQgYx 3uaWe5nlJQ4ewFRNBl8x1BywfkTGp09tg1LtdU6bPL2CKiRC+yCvbuGIKbEqFYZkbD1I BuW0vu0T14NtbX1TjO6OIIBkV6eCfB2bc0xOlXiDGit03AfjCy6iaTKjbP+J9x/2aZ18 R+a+t8rfHbuPcud3tjCxoUjyOWvqDgNCDEb0RveUQwCoe0GUUl5DrIsYCQ4Zyk5wtCt9 zvkA== X-Gm-Message-State: AOAM530f6z9EyolYl08vyTuvEOJlcEemG2As1lkh3R6JYR6EOO76TcPs aPylDtzU0LiYt7OZHKOTi0ES0rUmtY0= X-Received: by 2002:a05:6214:1c45:: with SMTP id if5mr2363060qvb.100.1642038805956; Wed, 12 Jan 2022 17:53:25 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:25 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:33 -0300 Message-Id: <20220113015101.4-72-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 071/281] gxf: 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: 7E9K33WTbmt+ From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/gxf.c | 9 +++------ libavformat/gxfenc.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 6f370c1b57..d96e0796f4 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -143,8 +143,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { case 9: st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_PCM_S24LE; - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = 48000; st->codecpar->bit_rate = 3 * 1 * 48000 * 8; st->codecpar->block_align = 3 * 1; @@ -153,8 +152,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { case 10: st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = 48000; st->codecpar->bit_rate = 2 * 1 * 48000 * 8; st->codecpar->block_align = 2 * 1; @@ -163,8 +161,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { case 17: st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_AC3; - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; st->codecpar->sample_rate = 48000; break; case 26: /* AVCi50 / AVCi100 (AVC Intra) */ diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 133d1e9fb3..e25d8764ba 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -714,7 +714,7 @@ static int gxf_write_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "only 48000hz sampling rate is allowed\n"); return -1; } - if (st->codecpar->channels != 1) { + if (st->codecpar->ch_layout.nb_channels != 1) { av_log(s, AV_LOG_ERROR, "only mono tracks are allowed\n"); return -1; }