From patchwork Thu Jan 13 02:00:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33440 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp34409iog; Wed, 12 Jan 2022 18:28:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7ny/DH1TrlLp/Li1+wpFNRMW9spZBE868ZCL7whPvv9CmiQY0emGpV4DhpjVX7PV/GWhA X-Received: by 2002:a17:907:c001:: with SMTP id ss1mr2007179ejc.265.1642040892112; Wed, 12 Jan 2022 18:28:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040892; cv=none; d=google.com; s=arc-20160816; b=DiccibkwSG3L0TDhNWezVbs9vyDF7eGNk9Fs4BbEbjuXaMXBHMy7QxUFiBPtaAZr3U q756sLv6EVgyyO1uVwrVZLCGRJ0nFdkmocBE9g7/1+rPRt6FV6wImJFIE25qlHWn/ocR WB/qAxnKjnLyKrucxYdommQoZ5+ocmsh3raX2Kkjrb4zX898iU0vpSxXaELDm/VJ2iZ0 apLAQZQGYiYabH0gM+pAsDYqHHG1zE47x58vGPL3AIljCxmZzK3RNmm9uVsO1DgiuLZq 5VsaEwKnMZDkRwfDkeafROxYNLQc0YimcUI3MiTgH8pMpvQKz60ZfsL0fy2Da3XAm5bc nmow== 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=w0OZ9ZNTjdW6+Xgug9T6+vqUXSKnx9DjMgs7egRzZRo=; b=pRiqp68Pel5JrHCC3ayWsvEfs+fSvJ/roHdflnyv9tvidmJP9MdW3IzsQ5BjRQDfix 6ezTVGYMygbUCarMLtTxTWQHv+3nU9iRU+k+8uZob+1eW90Hyh4ou3Ose9zdKtOSmm/d H4D/txsnh8SngpVbmWaSeZx8jL8AkJoxRXMJPWMXtvsQt7giCmos5nyw07KinfPCiA/s dw44gQ4TlbrGvmNrSTsqgnMGjwInOiVTtV3o+xfkmgcWtLnxQc9g5ygVfcZjVQdDpk71 9DBuogb2w9hMmr4AJHFPdgCZVJf/2q1Qnj1GzbKsiwQe5cWrNspZe9QnWiMqnKU1N2FW gLOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=In3Z8llb; 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 bl4si879321ejb.462.2022.01.12.18.28.11; Wed, 12 Jan 2022 18:28:12 -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=In3Z8llb; 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 EEC0768B4D1; Thu, 13 Jan 2022 04:01:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FB1668B4BA for ; Thu, 13 Jan 2022 04:01:20 +0200 (EET) Received: by mail-qv1-f49.google.com with SMTP id a8so5164176qvx.2 for ; Wed, 12 Jan 2022 18:01:20 -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=E/uhB+wQ1oLD8LidD/T/qZJeHZAxS/Zrbt44dJzs01w=; b=In3Z8llbejgQYSBVWRy2/rlqI5jmSd3dTRWYIVny2/GodbcDIhm3XqNO0RQtE4FTTp Wf7PA4rd7Apuctha1xygAOMruPeSeiAxyijnizzzh2xgj5zIgrOVtFQdaE2URm7z9dUP FAwwPl/jYzi2PiDCEyH6LZxHXbKLsKczSQky+ZSVXsOlbCeo/VnnOmOV12UasLLYbGog DNii9qKr3FSpBVakRD3UxhytOl35rQRmn9lPvDAgh51GKmpdXGxnjaFszPfUEVfOip2M yxolCVHgD6vCA+ErVI7zOC8CE13Hnk5coB35eIDdngL2vjozNgis0N2A7vunul+8a9F5 eaDw== 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=E/uhB+wQ1oLD8LidD/T/qZJeHZAxS/Zrbt44dJzs01w=; b=nJxFLTd4dW4/PsGcBUK5+5dEDQW2XkOT8kFCTdCe1wZsdKjM9DRs8IjTurQc5cIC0t yXpnEpTytKWUlQlmtft34pe8EUOOAOkBdHZ6oGA6jCRab+tcFd0/SJ0+0RR94V8hmruS dL8eRJzM5nByR7xd/OqaAbv85aF/+A8gZtkgBp1M3I6MYgZfTpJUJHDRrClK754ntjEw 6Hy/foXHHVIdT8w/8GgzeGwIiH3QlqN5c3zO7WM1t/IfjBw+Q+M3pHKd469MNqdGv7Ou YJRLoTaVfJHgQNl5N1MAiw8u+Z/zmmD5pqFXCBAujxMPCOzNgnkODb+c7IC+HMRcUQAP QFtQ== X-Gm-Message-State: AOAM531uN9plFZTx9tHJRqrLnBhBJ+QdZWyjXlsJfNJkuwqfZtY6pSsJ IgfREqOL0ur0KUKtzjrx+I1GFDelx9A= X-Received: by 2002:ad4:4ea8:: with SMTP id ed8mr2465239qvb.52.1642039279551; Wed, 12 Jan 2022 18:01:19 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:19 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:09 -0300 Message-Id: <20220113020026.590-14-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 162/281] vividas: 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: ZO96h1M/4xdB From: Anton Khirnov Signed-off-by: James Almer --- libavformat/vividas.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index d7a6e74650..5d0d11b222 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -372,9 +372,10 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t * avio_r8(pb); // '5' avio_r8(pb); //codec_id avio_rl16(pb); //codec_subid - st->codecpar->channels = avio_rl16(pb); // channels + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl16(pb); // channels st->codecpar->sample_rate = avio_rl32(pb); // sample_rate - if (st->codecpar->sample_rate <= 0 || st->codecpar->channels <= 0) + if (st->codecpar->sample_rate <= 0 || st->codecpar->ch_layout.nb_channels <= 0) return AVERROR_INVALIDDATA; avio_seek(pb, 10, SEEK_CUR); // data_1 q = avio_r8(pb); @@ -655,7 +656,8 @@ static int viv_read_packet(AVFormatContext *s, astream = s->streams[pkt->stream_index]; pkt->pts = av_rescale_q(viv->audio_sample, av_make_q(1, astream->codecpar->sample_rate), astream->time_base); - viv->audio_sample += viv->audio_subpackets[viv->current_audio_subpacket].pcm_bytes / 2 / astream->codecpar->channels; + viv->audio_sample += viv->audio_subpackets[viv->current_audio_subpacket].pcm_bytes / 2 / + astream->codecpar->ch_layout.nb_channels; pkt->flags |= AV_PKT_FLAG_KEY; viv->current_audio_subpacket++; return 0;