From patchwork Thu Jan 13 01:58:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp32512iog; Wed, 12 Jan 2022 18:24:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyduIjN4PlAs8/WKtbrCj7QepjXzdYwbO3yZvVw9qUbVCUO7njWWj6Pa+IttxWUkbz9KanO X-Received: by 2002:a17:906:65cf:: with SMTP id z15mr1549843ejn.420.1642040659137; Wed, 12 Jan 2022 18:24:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040659; cv=none; d=google.com; s=arc-20160816; b=eXh6tTq1PvVi8ex624kccYmdAZcObuB7WfSEhVxPX+3PVOgHhNGYxCXaDmQJT3rjkJ pJe9Cse4uixaI3DN8csBXHnxKDAep2HKfdeT12DTHEr0eedRzxUPrN+BK2RoFGoDfR1B Q78Zdw1YY01EvKOZOEyxTJdH0JqXz7YSJJr6LSIYOIymRLiPO6EiKbuY5biCvg0fLMGT rAcMvcJZDuWw8ICCs92691LBYSk6r8DIMhveN7fzlPTsDxmr48PTIWDlSxFw5zxhUnxk o8fhiZaYraOzCjRyENDSW+MVb0mVu3yKHwlzsx8ne9XXqe9+l+UU1j64ZsDOaVjgwpVj q1Zw== 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=uFjZgAazdP7h0S2mR5+/8Vqk1mbEX8lJdIFGDsMnHdo=; b=0GscMPLBE5ir20SggFydW2Y9bLzdPV62x/vTl2nkhEv8VQWqUNtKG13LGfvQU/mbbc TrbZ31KDKTh05HjNhaN/DJBKEDBc+3IqisAmOyQ9Tx5Neyur0ti2DxWEXiliNVTur1yB +tJrKCVu/93i4xjl59E1Ww00sJl4GR5NrvWuFc6YFV+UuMBgm82FCqjP0I0zblrCKviG +ci+aTl+kEKzIhcl6seK0Tqziuuabk59JD/gdt9bqmf3bgKv2xNGQ8XAxduFu19PLl7i roPvEhIbPpbRoeXoPxkUZBCxFpv6tZT9lKDEnY+vmE92e/DgErILUQ1ag+qi+dHqWTKE xAJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="adalVsN/"; 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 cz23si869025edb.1.2022.01.12.18.24.18; Wed, 12 Jan 2022 18:24:19 -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="adalVsN/"; 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 4C85768B403; Thu, 13 Jan 2022 03:59:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A16B768B3F5 for ; Thu, 13 Jan 2022 03:59:01 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id s12so1112664qkg.6 for ; Wed, 12 Jan 2022 17:59:01 -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=hibNVsvYzn1aiZxUv3D/rqNAdz1kKeRxbxH9DzALzQs=; b=adalVsN/1vV2a4HL+nHMDmSzK0xJ7BNytxfEqYuRNhgpDpuaUUdZwwqunv1DJ4x6S9 HCGUFp1i0cfADEtpDJOgXpHMCG6GKJljR9gePb3tbD4zDvBPwCMYsTiSZ/WuBwVMfiGZ FvrxDQFahUg3LkNQKGljzT3sPvziTPcgsi+3kSgMQ3Tl5pVpsgp8YWnRUPjHA/Pcn6ml m1sFFXZ1v9tOAkRe4+Geh9jYUj5ktc7cLzmaL2Y6oQ3jx9CH4H/GXvq2HeVfMipOi0JE L70p5g5ImoIrXObJcv2M93ROmH1NjXYfdUrIVKgpJ/fn/uxQCSJn7Joz6+j14Pte1Z/l B+4Q== 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=hibNVsvYzn1aiZxUv3D/rqNAdz1kKeRxbxH9DzALzQs=; b=mTkG5nl1vfG5uDIkii24mChBGJ4vZkMXZD2vNvs7clFLSBJjmZ29Dj+KhfAu4OEMJD P8csvjac8QNHmnbGPRc5xlwzBVLKgEYdZoBO9TwNr24BSe1ph9xQ0mN+WjwPn14gyKZ2 Ez31eV461Whpast5tyN1YBmjPBPi1EHBCSbDCM2PFbYqaGkM02b8cqUTCbc5sN1DRZSK kyoeruHD77msgqyQIeiEsdG6Dyky6q7znTBQZzzc55GD0jpxHGEW448A7y+o3pr0JAlT dYgasBjTLe7nfp9L9u/vTvhthfkLLgDHoSWmjonElvjb0jV93J4/129g2f0Qh8W4C54d 6awA== X-Gm-Message-State: AOAM530musrbHwZu0AQfPClg7wuGrFyAemwzwOJUPtnulcUXOdsdSC9O BQOVlat8wbq42aFOt+ps2LaFYyvRTD8= X-Received: by 2002:a05:620a:4251:: with SMTP id w17mr1800176qko.284.1642039140069; Wed, 12 Jan 2022 17:59:00 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:59 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:58:04 -0300 Message-Id: <20220113015806.519-29-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 147/281] smjpegenc: 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: h+vwAJ8wNkPQ From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/smjpegdec.c | 3 ++- libavformat/smjpegenc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c index dc95a822c5..d449162705 100644 --- a/libavformat/smjpegdec.c +++ b/libavformat/smjpegdec.c @@ -94,7 +94,8 @@ static int smjpeg_read_header(AVFormatContext *s) ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->sample_rate = avio_rb16(pb); ast->codecpar->bits_per_coded_sample = avio_r8(pb); - ast->codecpar->channels = avio_r8(pb); + ast->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + ast->codecpar->ch_layout.nb_channels = avio_r8(pb); ast->codecpar->codec_tag = avio_rl32(pb); ast->codecpar->codec_id = ff_codec_get_id(ff_codec_smjpeg_audio_tags, ast->codecpar->codec_tag); diff --git a/libavformat/smjpegenc.c b/libavformat/smjpegenc.c index ac5576fa76..8b40c09329 100644 --- a/libavformat/smjpegenc.c +++ b/libavformat/smjpegenc.c @@ -68,7 +68,7 @@ static int smjpeg_write_header(AVFormatContext *s) avio_wb32(pb, 8); avio_wb16(pb, par->sample_rate); avio_w8(pb, par->bits_per_coded_sample); - avio_w8(pb, par->channels); + avio_w8(pb, par->ch_layout.nb_channels); avio_wl32(pb, tag); avpriv_set_pts_info(st, 32, 1, 1000); } else if (par->codec_type == AVMEDIA_TYPE_VIDEO) {