From patchwork Thu Jan 13 01:57:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp30714iog; Wed, 12 Jan 2022 18:21:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxApg8vmGzhEjS5CrAVjzUVAIN3ab+emGbfBQSFxhy6FvHDrfantBmGhevDT1kAjvlITJaI X-Received: by 2002:a17:907:97c4:: with SMTP id js4mr1976151ejc.422.1642040480829; Wed, 12 Jan 2022 18:21:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040480; cv=none; d=google.com; s=arc-20160816; b=wxec9+gXLRMlENah21+MidCOmOTRQawwZ7j2CsaYvSjv65goQ1/qLWYpPR4LtQZFBZ W543LEkgH7+7L/ZxhnOPU8tsvW+4ipYKfYM99Kw9ydeJIdWBysII4S+rfo1klNuGvJt8 HZS7+ju6wihBwL4QmHjY5+oZSiWJ/LRQPaIjZqoQBmDc8PEKmPMKOXt+7gFsg1ULk+h8 +0ASciI/8MsNigIdUAWflglXzg52ViGyWGDWaQnH0KdklGzKKmi5z5VLvhJEh6Dug1GT eysokyxCgxWMf3lvvL4metTiTh4FUJtIRoV7lys1q7wiOXxN/iRn/h0EG42mO2WibqW3 BtMw== 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=usbt7Pboz1W4f4jMGRqobLEyQBuAormZrCyg+J4eRqY=; b=wnaJiyCxfWlIDHooieBuBS/5nm9CAO38PzXgjv0Z7+Uc9tDhFSNMPcFUY4mHtzgyzA M8Qi2scVpN3+Q55CY4DVheb8RhZOmI6j9pLnliNEfFesxHOXdSojr3m7HfDrjw79jpqA zP5QjREMAwwNDC3aqxdTyEFUAW1COSiWm398e577MzpVHlcLa6iwYu3G3VvylEv6Qd7x 4KjltzrH1pwz0JxdED6ZjYnh2v47hDCHTnD/hqodGSR7yejP3PvuLieDp3Moo6ogmV5x GmF5p8wRFrrbO2nGVeujEifCq0aZbGDXTotq+KYboI2mNUs2Sxp/rIA+hZbxFBCQrnwQ NkXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Zz4uSUCC; 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 gt20si804382ejc.500.2022.01.12.18.21.20; Wed, 12 Jan 2022 18:21:20 -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=Zz4uSUCC; 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 28B2568B39C; Thu, 13 Jan 2022 03:58:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB2F568B377 for ; Thu, 13 Jan 2022 03:58:45 +0200 (EET) Received: by mail-qk1-f171.google.com with SMTP id 193so4870108qkh.13 for ; Wed, 12 Jan 2022 17:58:45 -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=zQ/ojn6+rK+zjPQuc5CD6dDUCJvA1ll2tfdrTmFN/vc=; b=Zz4uSUCC9QiwPBvYUs26CB2mr/V1csSTyBR5+FWGqROroml7TyswkZTDUqj+cWMRvt hkY+FJIQmFoNIyVnESIwIf4aH8JHSEYQlDFc6Ju7tjYAijRjYWwpdFw62D/zk2IQM0HZ pyWHq3v0x08IDNFbDlhJy5Y5Qfh7XJ9yeqTVxWNlYPvuz26lvH7nTUMQ9iSZa2vMgGCs h4DFH+JJSQ6iLFn/Q2em9RSeiFOOEj3Yf38IEczL4xrUaU+QSdp1VOBwtLoXm4uC6Uj4 0ZfbbXf2C1HvOKngTYU/eFBsZ4L9dzj+i+Soxxfx0Vgn9/i9zAdawev9eYcuPh8hyL4F v7wQ== 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=zQ/ojn6+rK+zjPQuc5CD6dDUCJvA1ll2tfdrTmFN/vc=; b=4tJcaM9WN2aw4DovkSPyl10VmXCyVEwiUflBhys9oVOVJY+oJOcWmq1ve3WRdGraGM AV8wgTxl/iwGAQ2Np2Xx987NVMQy4yKedmSCvI1GgyCrg4sF/1iVYZDhgXgx2OvbEEOb zCnChpdXR/hVLfTZkwBEd2JWnmYW5rd1zMNFCw4tY241M7ruNBqPaZRSyRKmcGfyVvEt 3sayMR1GkAJQ7hCbNDqwAgG4h69yEfXehUNwwIQ3X7gZd0q1wjtCJih9Hol4yAUdvat8 aBOxqeFaVDApgkK3KcC8B8dH4sX9G4SoeabyDzdxchvkAQGsQAkbCC2O6lcM1nUMztJ9 ujjQ== X-Gm-Message-State: AOAM533prWiew0hVl/LGhTkqrg2+8MTVgGXYvx9WYy4+WwzXdjq4EIZp 2yL8dj9RiSvHl7qP5yBE3SYj5IS0HAo= X-Received: by 2002:a05:620a:424c:: with SMTP id w12mr1878778qko.62.1642039124203; Wed, 12 Jan 2022 17:58:44 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:51 -0300 Message-Id: <20220113015806.519-16-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 134/281] rso: 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: C9IuO5TIEE0p From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/rsodec.c | 3 +-- libavformat/rsoenc.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index ffd0fdff0d..569368b422 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -62,8 +62,7 @@ static int rso_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = id; st->codecpar->codec_id = codec; - 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 = rate; st->codecpar->block_align = 1; diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index fc327d8a2f..858b53f6c6 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -34,7 +34,7 @@ static int rso_write_header(AVFormatContext *s) if (!par->codec_tag) return AVERROR_INVALIDDATA; - if (par->channels != 1) { + if (par->ch_layout.nb_channels != 1) { av_log(s, AV_LOG_ERROR, "RSO only supports mono\n"); return AVERROR_INVALIDDATA; }