From patchwork Thu Jan 13 01:50:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp19299iog; Wed, 12 Jan 2022 18:03:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnK013nrbjqU+8T9ezBszzs0qlG74vuMiZkLypqum0Pk6R+mVzqPvXTx3CzWeBYCFeiA+2 X-Received: by 2002:a17:907:7283:: with SMTP id dt3mr843657ejc.303.1642039430432; Wed, 12 Jan 2022 18:03:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039430; cv=none; d=google.com; s=arc-20160816; b=mSPAwhBEAXSSNwkMUVeuBUM/Uhzucvnhf5jfQLKpdxVAzpF3AgD4djj5AGJUC/nLvJ dKO/PF+YyW9LY23UkM3OujJwqhILpQ/5R8dgWz2Xt4YztIGgVfcJ+9MU970KIVelO6EV Vy94AkdwxXjNK/i0UHZ10ithpWgtHre0uDsPXbtRNjV7CqL5G0EI25AkmdNQFYz6IN3G 64xPZ4u+Vhsvjlv8x2qABasEUYQWpMsimKm+b5+M/9h76/DrN9NN0fABIlA/JFd3Ibty wEo1PPunNPzeDXDsXm5HCisfnpqnIPIzkrD5sbOieti6DURAlQkYhV63Y/ubn1NKk1s0 NwWA== 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=Hk+TO1J0pfxHXTYg8/5BRL8Da7X1iP/uAULM/v7ij/Q=; b=dd15Sq5RcZ+VeBrsjHNR4NbjI5ixv7iqZl0QhFbTuo3YdKbeJVcfzgipKC+U53mnF2 //eDzlX75ELo+AtTdoa7krZBxClbgIeEvw8qe/ORF5EncqE2EkZXXTXEqVavyL7kbufK 93hDmr4+KwK9ff7gHcHu4DZpVdDGBZOez9lRa7IHMOL71Sy5y7aqgVxaEN1l4RuD6lYD eCcuXc7mRY2ykxjn+fsP3dZ20sgo71G1+1WWB+JmXVXfohUVmkfpASTl8JApGJIL4UPA PACxRMH/+oc6Y0/o+v8UnIFi/vhGImjZnFh1o78c+ghzlO+s9a8Y8QgWfQgC8r/DLC3T h+xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=M3HdIp+J; 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 hd32si844028ejc.596.2022.01.12.18.03.50; Wed, 12 Jan 2022 18:03:50 -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=M3HdIp+J; 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 8174468B157; Thu, 13 Jan 2022 03:53:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFCF868B12C for ; Thu, 13 Jan 2022 03:53:07 +0200 (EET) Received: by mail-qv1-f50.google.com with SMTP id hu2so5077266qvb.8 for ; Wed, 12 Jan 2022 17:53:07 -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=9JnoyWaeDAfUwrmsmMM+YKVVFSGXkGS3A58vs48kvX4=; b=M3HdIp+JSJjWXi3pIiSkbPgX7fHHhzEHhpD9lehVtLJ9E0K1+OEzuEba3tGYAK7OsD 58QBYfcGptLCCJfbr6j/g3cYVGcRdwKdMi+0Tm9334gjdGZ5+C6pNBfpPveQN+XXDcKL D5oFYZxrJ7Tp9flF0WxCX3fvDmZ3PSTz4RddS2Vy1lGFtWlP3EGTL2QRZa9xWzt/GTjL OIIZ0XzQ17MOcPdsmhrp3XLW8rbz2HzBmTej/7Xt/2QcT5mOUSdJX3Du8KgD9hU+qgEM b0O3oLC+dW//ny9EdAxEx+oUMqtt2hU+VvAgZxENpg3IjUu2V606Ag8JUXmmsmIMQ8Oh CCjQ== 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=9JnoyWaeDAfUwrmsmMM+YKVVFSGXkGS3A58vs48kvX4=; b=cgJPR2CriVjiY2KODsmj8JolXwcy8BGgQpQri27i/37wPG0lGeez9k3uoIZCdlqqER EjBwpKq+bNSet/3+ENenBHpzaq1zM6O6wTT3GWV4PfYot/cV6t+nGrWJ6sFJJHPfHY5W WQm2WQPqLrPU62leVZpfQY/iSi67nklfk52Dvn0Q1IDRPQvL4WM2seA1v8+xwqaVU0O1 IYykayVjG0fAh8Hxqk3M0XWL+Q4fbfwkhhQYo5iMs1ExUE1WvxZV/Z3VGOJnKVRpMO/K Hy7ugAJRlt85w83rnJINrHynBUBtq5uzHWg68HpLEtIGUpEx+Jjekc135XoAfBcegAhh SumQ== X-Gm-Message-State: AOAM5330o5hAiMBNgRXwFiSYl3+TgWZbMmjaKfLZ5t886DYfj6wQukuE MydBwLbCFs/INTgceE5iGPhvhewvH3I= X-Received: by 2002:a05:6214:c85:: with SMTP id r5mr1755002qvr.90.1642038786322; Wed, 12 Jan 2022 17:53:06 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:17 -0300 Message-Id: <20220113015101.4-56-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 055/281] eac: 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: WxUhEAboUPyz From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/eacdata.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c index 0ad1c937a9..ebc98d274f 100644 --- a/libavformat/eacdata.c +++ b/libavformat/eacdata.c @@ -32,6 +32,8 @@ #include "avformat.h" #include "internal.h" +#include "libavutil/channel_layout.h" + typedef struct CdataDemuxContext { unsigned int channels; unsigned int audio_pts; @@ -52,18 +54,25 @@ static int cdata_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; unsigned int sample_rate, header; AVStream *st; - int64_t channel_layout = 0; + AVChannelLayout channel_layout; header = avio_rb16(pb); switch (header) { - case 0x0400: cdata->channels = 1; break; - case 0x0404: cdata->channels = 2; break; - case 0x040C: cdata->channels = 4; channel_layout = AV_CH_LAYOUT_QUAD; break; - case 0x0414: cdata->channels = 6; channel_layout = AV_CH_LAYOUT_5POINT1_BACK; break; + case 0x0400: + channel_layout = (AVChannelLayout){ .nb_channels = 1, .order = AV_CHANNEL_ORDER_UNSPEC }; + break; + case 0x0404: + channel_layout = (AVChannelLayout){ .nb_channels = 2, .order = AV_CHANNEL_ORDER_UNSPEC }; + break; + case 0x040C: + channel_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_QUAD; break; + case 0x0414: + channel_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1_BACK; break; default: av_log(s, AV_LOG_INFO, "unknown header 0x%04x\n", header); return -1; }; + cdata->channels = channel_layout.nb_channels; sample_rate = avio_rb16(pb); avio_skip(pb, (avio_r8(pb) & 0x20) ? 15 : 11); @@ -74,8 +83,7 @@ static int cdata_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = 0; /* no fourcc */ st->codecpar->codec_id = AV_CODEC_ID_ADPCM_EA_XAS; - st->codecpar->channels = cdata->channels; - st->codecpar->channel_layout = channel_layout; + st->codecpar->ch_layout = channel_layout; st->codecpar->sample_rate = sample_rate; avpriv_set_pts_info(st, 64, 1, sample_rate);