From patchwork Thu Jan 13 01:56:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp28080iog; Wed, 12 Jan 2022 18:16:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyhIhvtkvK+QCMl4xODkHidstoBr/o5iItWm7q7/GSyDLflJIiayfdGI0GvEYF2WWFNVPFI X-Received: by 2002:a05:6402:405:: with SMTP id q5mr2249336edv.62.1642040217872; Wed, 12 Jan 2022 18:16:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040217; cv=none; d=google.com; s=arc-20160816; b=Qqz1QBorYOKSWD1r5xgGW5i0uRcd2ro+GTJDV2nrJ8MGq0TKHfnqX0ck3phu4jkZzS izD7iLIIKGTVnNOCDNpB9TBa5z4neXrf8vThAsVKZB+FjeB3FaB9mbMPyibz1nkX9+wj Yejxb+AoKe7hD/4dO9pTPaNTTc9kBZXBeULgCS2uLxHV/PBJGh+8lPHnzhnKwnRKVUt+ 7rBB1oVfZrBhg0C63h4EW6bhZQRpsK2VMsBaAJoUX1zWycPIW6x80VMN2m4FtXG9VUjZ I+pv3arKXuCsJYKRcbqWSnhCR210IF9boYCbPg8wn0qk7zcwNKCjRDLE+tZBkyNJDciF Fl1w== 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=eGUcb1U2Q7UFIM23222Xju+tAHsdU2rnClNLMB7Kaxg=; b=Eg3yyOk/ItbiSO9PNHQURhHINml9CDqeSq1lOeIhiOPkDeIaYEIqKVzc9kldBpokQM jbtm8ue6mDi4pL7dIViKpLJiuSCESLyY240PL43HAW19A7FtrpeWjfBu8aCKp9XWFtYc CnMBCgo1nFxCesdHmO7CKQCSt4IHZfCvpa0G+3PYIKOEQ4nzeFylyhbIsR47WfQ3RRb5 T7pQb+rIJAg+rAUJk/bzHYjX5SNcrKy2Ufp9t3HWje525k341nb8LHikDAkgFmOlpLb/ iTg2tdVWeps+uN/C838Y12h728iwP1Mw8BdAk4gsLnxKNznnX6C0tu7LSzDFPulNCZeG zFkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qqjDmi7g; 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 hd13si760077ejc.686.2022.01.12.18.16.57; Wed, 12 Jan 2022 18:16:57 -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=qqjDmi7g; 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 1E7A368B301; Thu, 13 Jan 2022 03:57:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16B9968B2E2 for ; Thu, 13 Jan 2022 03:56:58 +0200 (EET) Received: by mail-qv1-f43.google.com with SMTP id a8so5153855qvx.2 for ; Wed, 12 Jan 2022 17:56: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=rJFJnkbrem/IpFR7KGWPQI7uUZQd3wY0KOWUWU/Kka0=; b=qqjDmi7gajxgyqwF6IkJD1ZenzuhOdlZLCUEW4UrjD6psF3qNY54XU3szpqt82YTp2 +mg9+qsTO0qKpctHDVVUIeBDv4hK3+ClUpsAH/YhIA0ZdAEX0beMce61NrTZ4z7xf85l 60GBvSbzvDZ6UsS9B99P2F0nrt9mrjbmuz702S+d2BkajiRRMtCm7zDv1RZtgw9hV0G5 gH/PhbCYsdNi3mkkEbec5ZTASaUZXGVmt2I4XnWU+I+903xDPRxmWjNjDYbKAiCYUqxE xxPpMxUlFKGtJypXH/+g0gV3mTGRbe855cty99pZwfUJmnSXZAHzWmhFwxFAw07KGPyI j3Rg== 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=rJFJnkbrem/IpFR7KGWPQI7uUZQd3wY0KOWUWU/Kka0=; b=5GsI3L3BxmXjbgSF9u95kdxlQAA+PPikOSresKlSOjZBy9MTCdXYN1zvpMApnyM2aQ nhs50DcHW3XD2HTSlyUgIc5c02u5SbiFa1Aobm/79iSTDyPxGvYC5IteATO3RjDMhgps 9x4xNXlucTqFAljWZN69muikufD1/oQC6PjgSFTxveoJjiOKpv2/zEFu9QnOl1smMx3G 21jipn3J9KbAo6OdrxOtp5Ho8FzjYryW3GT7XjMFhVuoV2x51vf9A+UTZDmd9mqR7O6V B+rgZ/eYEccxRQ5pYBlsMPImxfLSyV7hbxP8dSmcmn+K4/+PNKy+tx+Tqj1aW6jhkyBg ksEg== X-Gm-Message-State: AOAM532lUP9Wg3Xv+kVztFD1ljQgCmYtJV3Hwr6YAFxPiqDqA5uzXJf3 Mmpd1D2nMOjvVL+MbCJ0jyQndU8+6jg= X-Received: by 2002:a05:6214:1bc5:: with SMTP id m5mr2144376qvc.88.1642039016676; Wed, 12 Jan 2022 17:56:56 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:56:08 -0300 Message-Id: <20220113015612.448-27-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 115/281] nuv: 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: 3sEC7PeNBs/j From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/nuv.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 5f5cc50302..2cb1df368f 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -116,10 +116,10 @@ static int get_codec_data(AVFormatContext *s, AVIOContext *pb, AVStream *vst, return AVERROR_INVALIDDATA; } ast->codecpar->bits_per_coded_sample = avio_rl32(pb); - ast->codecpar->channels = avio_rl32(pb); - ast->codecpar->channel_layout = 0; - if (ast->codecpar->channels <= 0) { - av_log(s, AV_LOG_ERROR, "Invalid channels %d\n", ast->codecpar->channels); + ast->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + ast->codecpar->ch_layout.nb_channels = avio_rl32(pb); + if (ast->codecpar->ch_layout.nb_channels <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid channels %d\n", ast->codecpar->ch_layout.nb_channels); return AVERROR_INVALIDDATA; } @@ -227,8 +227,7 @@ static int nuv_header(AVFormatContext *s) ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; - ast->codecpar->channels = 2; - ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + ast->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; ast->codecpar->sample_rate = 44100; ast->codecpar->bit_rate = 2 * 2 * 44100 * 8; ast->codecpar->block_align = 2 * 2;