From patchwork Mon Mar 6 00:57:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: asivery X-Patchwork-Id: 40591 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2510759pzb; Sun, 5 Mar 2023 16:58:05 -0800 (PST) X-Google-Smtp-Source: AK7set/JJ/pZq/BSX5b7VRwEqtRrUuJYelXlUE4cxZ62YzNGrR0IhLTokQXts4QSKGdVmYsWFVCI X-Received: by 2002:a17:906:6951:b0:8aa:c358:fc01 with SMTP id c17-20020a170906695100b008aac358fc01mr7936047ejs.67.1678064285012; Sun, 05 Mar 2023 16:58:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678064284; cv=none; d=google.com; s=arc-20160816; b=Rit3zEE69289WPykKXyMjiEJgftAkwNQB4TCX5RV+e5oO0j5Ec4z9hnjq21qs6Zu7q 7uCv6lLlQRZPZrhGCUKGggBoZM/cNK6Guvx51Jp5v+WnDOCD0DlYJjXMNEh1Eid1cUOl KHlvOtYZNOeoR6Gome22H4ISwA97qdipY8NRV/t45oNQMLJk2XCbFkh0sKnEsuwYwBup LuI41u3K7gKpZLQhJubwxGVrJoLPh2YZJPMlFtSV2bTLT2oDYK44B7ns80YVwmeF7N2c BKs/xO2noEAfOduvqnlZde4pbSQ48wUL/sIfipIYhkUK5ILsyrL4LcSYj2MLmFfthfDJ saSw== 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:feedback-id:message-id:from:to :dkim-signature:date:delivered-to; bh=sv1CPGsgKU5JadG8E2aoZAo13AS6x/HaRbIrSw367is=; b=Tb33IyI1OH9Khm43LJTKFQB8vzk7+aXr8rUA+QXzUB3TmwGsqg1IV5D0m3gBO6+8WB 1ker3LOnhppOehe90rJHBkuy1L7IBtXGZBQNe4/TC8iARgXjSsbzKRKMdU3YLwyaHy9c RYnAa2cyrODdFllFdrXrmmStej2pJr53myW+UlsZsGd3vc2Z3ZAPIAPkSOtYscBrGxMZ MzwqhjaWNEMQLC9dFD+RIOwgVqUStL6hhEV/eUf9Cqpx1Y+1QNToygC7JnRYblojjVJk 53RvAlOK3OWr7HM2gj7JIMZF49lXTno7YZ8l+7HG4/F3KAUHEaJ1kv9WS7kOiOK9Wh33 l4XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@protonmail.com header.s=protonmail3 header.b=j9XmNe8J; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j27-20020a170906279b00b008cbb481fc84si5698483ejc.20.2023.03.05.16.58.04; Sun, 05 Mar 2023 16:58:04 -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=@protonmail.com header.s=protonmail3 header.b=j9XmNe8J; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E5D668BA07; Mon, 6 Mar 2023 02:58:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-4325.protonmail.ch (mail-4325.protonmail.ch [185.70.43.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E4BF680B8F for ; Mon, 6 Mar 2023 02:57:54 +0200 (EET) Date: Mon, 06 Mar 2023 00:57:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1678064273; x=1678323473; bh=JjtPvYZ6pLL+unUnfjogJPmGLEWXZFJK46GE0QagQck=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=j9XmNe8J8CMKCxh/0EqkEbZPQr+vgzgYcs11bv7ePviVfGDkb9MA9+Ku+S+L84Mn2 a/2CU3NWBKriJxoYamlxjw6SJ6g+7g8XcIfnTU9Zof97rTx2tJ98ZLv9u7hXUeIsDH 7QWwHoryfWoOQ/dUxOUMLYnw5BRNR9nVpANMZvgniOBYB1qFiMdyWI19d1YG7VREob C2RG+EAWuIudwcYuKJyNeWGjfTAW1nweyJjIEcMlEyOhNMeJv/DixgUWy40eXWCnUN rqE3CZx1zIRpv1pov9Rq/qOdlzGWieQ598N9iWYYhfBxIyviFeijfcr5/OWcP9i2Ys tLffoByZmgaNQ== To: "ffmpeg-devel@ffmpeg.org" From: asivery Message-ID: Feedback-ID: 33509725:user:proton MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avformat/matroska: Add support for A_ATRAC/AT1 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: VJgS5yeqEGYv Signed-off-by: asivery Signed-off-by: asivery --- libavformat/matroska.c | 1 + libavformat/matroskadec.c | 2 ++ 2 files changed, 3 insertions(+) -- 2.34.1 diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 90d94b65bf..37305a523c 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -55,6 +55,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_REAL/ATRC" , AV_CODEC_ID_ATRAC3}, {"A_REAL/COOK" , AV_CODEC_ID_COOK}, {"A_REAL/SIPR" , AV_CODEC_ID_SIPR}, + {"A_ATRAC/AT1" , AV_CODEC_ID_ATRAC1}, {"A_TRUEHD" , AV_CODEC_ID_TRUEHD}, {"A_TTA1" , AV_CODEC_ID_TTA}, {"A_VORBIS" , AV_CODEC_ID_VORBIS}, diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d582f566a2..0aa8e6f3b3 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2795,6 +2795,8 @@ static int matroska_parse_tracks(AVFormatContext *s) track->audio.frame_size); if (!track->audio.buf) return AVERROR(ENOMEM); + } else if (codec_id == AV_CODEC_ID_ATRAC1) { + st->codecpar->block_align = track->audio.channels * 212; /* Constant ATRAC frame size */ } else if (codec_id == AV_CODEC_ID_FLAC && track->codec_priv.size) { ret = matroska_parse_flac(s, track, &extradata_offset); if (ret < 0)