From patchwork Fri Mar 15 16:42:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8c91:b0:1a3:31a3:7958 with SMTP id k17csp370488pzh; Fri, 15 Mar 2024 09:43:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUqooZtxt+4U+Qwo/VEqz0LKfKuRxIRXygqFHEO+Wi4tJHjsdNoNcRbwvird2AVlvjE0LmfS2bC94mGK2vvkdZSHjmAKEbZ/UZbg== X-Google-Smtp-Source: AGHT+IGATToO76C4Oxd4LUUu2AJn6QbFtX9g95RzI+aAphTaiH1qofRr2nOPbK515L5u4kZv08vU X-Received: by 2002:a05:6402:390b:b0:568:b48e:bb2 with SMTP id fe11-20020a056402390b00b00568b48e0bb2mr1578602edb.25.1710520992176; Fri, 15 Mar 2024 09:43:12 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l18-20020a056402255200b00561d0de3e07si1946545edb.255.2024.03.15.09.43.11; Fri, 15 Mar 2024 09:43:12 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=NTVg6gCh; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1351168D137; Fri, 15 Mar 2024 18:43:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2050.outbound.protection.outlook.com [40.92.59.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A9A668C068 for ; Fri, 15 Mar 2024 18:43:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xsp4u5AzcMV2Kb2/0hreqqop7vDpVxHDPTggO42w3ZghjLepZaj4Lbq472Wn8SFXp0jlfD46Scr0tczOZpsnWZEorkROAvqYFvS2FODx+o1bg629V1jY2pkKEfTOBVWeOtefav/BPVNDo5zALX854csVHer1ZMjEgn71uG3hcWiIs6WUIUrThbKAM6O5uaQ18k1wNF/2hoz3XHCe0z5AYFpQDmlsi3XSpWYea3/0g/ndEQZ/izRps73AO6VElJxzoEf1YEQZdxduUAm/RhCXoXABI61neIyo8guNN4YPpZtSRTjy8e38Zk9mbRYtp0Z4gPm/aOfm5nFO+g6pWl2WmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6XfJwOYphET5a1clQN0kYNpqLAiOOi9LNAmhyh29fNk=; b=dx71yMJw/84t72TB6DzeOrdtqoK3PPr/t/TARygSFptbvdJIlwN1so7PFi0xVIhi4yuyoMpQFx14EuV7q8e5l4KkF44ogIWBcXssNX3HwGXyQ4Oe+OeH/v9KA06q3s12XJAmtC6HS08n6HjpiR3b9B+abNhN4lMDK/LUHZz42rIncVbsfcRpWL8TNqm6OFB4hxcIAHR1E5T2y2+A7gWCn1Hw2L8a9gRckQUQ40HFND9b7PxrGCjXmYOaiHvJ+uniInzGpWnndaLVINUe3AT1/JaoJPoUE80dPC2y9ZkQq5VTV5PHmXHayTb8+A0T8IhkNBHcVmVx8KO+Xkj5ExbLeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6XfJwOYphET5a1clQN0kYNpqLAiOOi9LNAmhyh29fNk=; b=NTVg6gChBljnXC3xdL25MyutnxK+sP2aKJqjsX7fXfp9AZnXF1osS5UCBHRW/Y0LsD5JH2Tdp7BZSxGbknYExfZ2MLvUZHchHMG4SjdIRsyvr+9toAYRS+zOLDbPqCQ/Ozm3DXDG5aRWcIW63E09C7C3OeBCz49EPjk4WRrBqY/SwMzAR42oJ60UEu7ZNqkQ6e4l3fkv9wbTufZVPFK+ey4aQzdF2qyy+ELoiqS6wC4CP/59D/60LnLID35//8lE/dKIaAgG7AvXTnLZfudRfWmeqSOIprTYkR9E1O57miFl5mpSR6XsGye0ieBQi8XlTmQtxXnCVP2/OdGGIU7O5Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0592.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26; Fri, 15 Mar 2024 16:42:59 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Fri, 15 Mar 2024 16:42:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Mar 2024 17:42:49 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [L456qQXVidHsQh8sK2r+QQ/wQogajvQD] X-ClientProxiedBy: FR0P281CA0109.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240315164251.64758-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0592:EE_ X-MS-Office365-Filtering-Correlation-Id: 80f23284-aa06-4bae-e1ff-08dc450ef8db X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JFIX/5rQBkEyPPe6prQcNrHa6gu6faOw/wCPF8rcR4FTLvlICH3v8sgqxSyvKH7gAoyFmpYxVLf5XmH2muKK0pI/xPuNas0oAs6WOP6sA8MJkBXuqzF0P5ORhge4ELEOoWH9EqLf8FXC+WG12D4EJCkszCdKCsoK3PBZzIVogjBBFX3gwyxlyPxLeu9uFnn6dFPcndLf4mtOrP9j/aDW934ghxYdIpaytKZVaG3pkutPQPl+Ml6EsGafOo1W4hX2rJ/QdODoYte5k5VtZYMx8XJJ4+dferuxs4w/xFm/eAE75xOecWAXjbh20RW+zsoydeZtusvasIlphvPGoDAvh6+bMxTW9hOhAafdiFWqquuQckIJOqrhabTuSxK6MnXw8spyLHNA++kI0jJ1wSwVRHRv2Zo6TpP9kZuNWqVTXX76a3JZkJcvkg2EKmnEz3HiDIgNq87jwxDjdQEIF5lknend1XJI89W+uRwc1NIYOZnDJGB+8+2h91EMVXuv8itjsd5qU7yOO2TqJCDta7b7ZwaAeLAa4b8iX0xLEABPmezT69lNdtXgc3VxlYmxWw8QUh4o92s5DQNxlLot9EaxLRpYZRMSumHnht0oHm1V5q5PiEfKWNjmaWng/M129EJj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hh74fGpJcfOsASg6ujHpblY7HrwZRGx9sA9hlbhqDmFqvzu8rhcOM7jpjD+vMQaYAYbcYq410omht9J11gmFSup3BHfzGoJAUoneNVEn98v/UjPjsUc33sWJuT9G7SoM+gzWsLdXsMby3v+hYmZXylvEUMrjjmD+7PFqZrdJLmqe+r12IFJs1M02pFYoTJ48sEXfhLiBFvZwl6/Ob0IoGbaHmwB8pxZ+LD1eF3hzKJwHJuhCxxM8Z3tZFxK/DEnmYZfWdLUjs38QwIO1YiVLy8XITbiK3n7knu9kjlqyTh0X0la0j6apG12W6nxRBh1v5s9dLGAOrA5n2XzKeMXQ3IwVf3pRs5QzDJRzzdbX3VVQCMd2YbhfMYeL4+jlL6fT7UOfQ1HeGdRaZDioKiJ1idmh9xyV+5hjan7YWZBuG22x7y8nY+Ch9wSPXntHGxQPXL+iwTZvtFzmepyrA2IpYYN0B/no94BXLthxzCyDoDRzk9jtTLuzWYGBzLDhvQt0PbMjC6fQVgejdtXynLk63MidYTtZC62rYvVwQWl+n4Zyx8+8EHVQkVHrv9376U/wSZ/Kx9Sn7DvD2fZY/j0O0ZYuN9vtwGqLcqZ653qjuJbUf/+nw3MPqNIRyxKeNzAeFWb+FRKysS0yFVmapw8AbCDMwTmQcu7+7JusOlNnT9cjCUfIyHE50Q4Cb2OTo1FxHEVZj3s8J+oyBDMAZlMkU5aqnOGx+IPlhUldwYoYcdfyToiWBbDkhBZkvIemcsQQW3YP8emuDocKILX38gqFMvaf76bWF9/z12EpdTuFHy1he3MxAxTmBjaTkMlCEkwanaJ0qItLAK5nJRcK14jIkmYh9z4bWvnVdf15+sUpGelv4oNmRgDFpL8z6KNgk1SWZHGLET27FWRjjqHPa8FY/Ro7W5Z/s6KLsvS9hoYA+/k3WwSwq7Wvj9cSr3BWFR+UhUugyY6wOzflZiEV+JcLgobhXQi2RAaWV5AnjFeJ88EGKnW+aZvjHhjugER4SPFaIkrFOFdOHDdoHiTIImzFTNIDhsV+1HnOwNeb9EAt/r2R8BrYDu6z08nk+jsrY+9IZl4/WScks+z5t4hZLzyhceI9h82VV7F6tu+xiqN95dB2sjGyDMC6klN1NdstCfqmgUscnqbFaCXm1LZ3sppMw681UhwWTTxqc1hY1Thisl9KEgneRocpu/yuyZGuNtIRYMXz0X/sB6M6j+/oRu6eKtpeg9KKY+W7PvzU4X3e7VR33vD4AUWUJkYwx+vcPOVKR271i9cZWoADbyUbqMM+yA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80f23284-aa06-4bae-e1ff-08dc450ef8db X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2024 16:42:59.1782 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAP250MB0592 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/aeadec: Export title 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DyvuSQGk6kMN Signed-off-by: Andreas Rheinhardt --- libavformat/aeadec.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/aeadec.c b/libavformat/aeadec.c index 4cb2da6639..20170a89b3 100644 --- a/libavformat/aeadec.c +++ b/libavformat/aeadec.c @@ -23,6 +23,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "avio_internal.h" #include "demux.h" #include "pcm.h" @@ -59,12 +60,20 @@ static int aea_read_probe(const AVProbeData *p) static int aea_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL); - int channels; + char title[256 + 1]; + int channels, ret; if (!st) return AVERROR(ENOMEM); - /* Parse the amount of channels and skip to pos 2048(0x800) */ - avio_skip(s->pb, 264); + /* Read the title, parse the number of channels and skip to pos 2048(0x800) */ + avio_rl32(s->pb); // magic + ret = ffio_read_size(s->pb, title, sizeof(title) - 1); + if (ret < 0) + return ret; + title[sizeof(title) - 1] = '\0'; + if (title[0] != '\0') + av_dict_set(&st->metadata, "title", title, 0); + avio_rl32(s->pb); // Block count channels = avio_r8(s->pb); avio_skip(s->pb, 1783); From patchwork Fri Mar 15 16:43:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8c91:b0:1a3:31a3:7958 with SMTP id k17csp370820pzh; Fri, 15 Mar 2024 09:43:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVeGvzlzlG65lDc9AJ3abgXDWuhX5JM6j5Y03bnUKCktmCc++YVEE9Aeg+HWNqkVFdq2bjqM/9o/OPavE0gxbeGw/4Gc/42kN9kYg== X-Google-Smtp-Source: AGHT+IHi6r0EAVcYkhkPHDe3UFAPk5KGqrO6PcOj00mspRDLVkj3DE8ZuVk85e3luSAsBxF6sOBP X-Received: by 2002:a05:6402:538f:b0:568:b815:caa0 with SMTP id ew15-20020a056402538f00b00568b815caa0mr919460edb.39.1710521035521; Fri, 15 Mar 2024 09:43:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ig8-20020a056402458800b00568b086a7ebsi739564edb.118.2024.03.15.09.43.55; Fri, 15 Mar 2024 09:43:55 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=FDEomuHP; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 373D468D164; Fri, 15 Mar 2024 18:43:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2066.outbound.protection.outlook.com [40.92.65.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45EC568D09E for ; Fri, 15 Mar 2024 18:43:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FAK2aIfjJvcw0zfO3pv3+YsOEPqJojp2VLiQDbPFrrMZ9JJQHvfMP213csdOvVIgLmczqawY14y/cxO6/Dc8HTNL9EYm3am1Jj3X2peK1EViiTe8SzyVuD+46iyGkaxx0xqcH33CF+pPeVvFsZChW9Os8D31gHqj6bobGGykzHvYZBIM81UxGQ40QT+QEK9AV3nH4HfAn1DoaAKo/UQvhOn0D//NJrpvhJYsfe6G+k1RC3coad44D+mwU3txzaBuDoEEakiJSKOj33RFYvPP3MH7/zyYtqLHv59PjlQw9OlZSfb9lNyFRCTmV4Sg5HEdD281Ahc0E+8Hd4GdUC8FTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eN+Y1P7hPqp1hS0mpyzjnK9SmjjdA7UUjpk7G9FDBvU=; b=NqYKB7vllSXCmjAxaMQB3hLwTk5a16u9RI7SUEdqlzl+AgJpcxpcFEdZdAjGcSZadN5boFST3rwjhEJ2xpbXDi52/Indw+VPGNd1haXP8tFv2DSwRSn7Ip93dNP8yJPebWdPlm/wdYDwVrGWcYdgSa7Q/aV+4NHQXeKb6ASmBHcz7QNV4Ef1NK1sltHhIz4n+S6dxYMQGpqwwSWdrCh+EdPsqERe3Iz6fE7QP7w3kaPd0Xmqr7nIFN2682hY/ao39eZ5rvRZU+siHMASNEpEUpn/W9syYqgFkHBdvMKiUKks8aa+dGu010JPp4B0ugJO0AZec0icvj4kTWdcebB6qQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eN+Y1P7hPqp1hS0mpyzjnK9SmjjdA7UUjpk7G9FDBvU=; b=FDEomuHPv1CcpG1EDSLWoa3sIhXoYwGsrUW3Ngirb4TX53HuVtCo14pe4ooQmrjXSCVUc/a2KFTlTAuWtkVmQ1bbLPL2ct5J5wvXDi/fBfzJv19ZQ7VPGGHg0Q8I7orQH65nxaIF+HM7i5ynz6inFkYa09fhkcTpBncnn2/92B2Qqf9K7sxnkqLGGgQk+IHMd6m4LLZMFIKatDRxcg+auMYjcF/POsQGVNsQOnEXFQ1c8kMQUZjr/iMJkNNtdsNPT3e4WviQujRfNReK0OLeKXsnnU96vosQx97TkLR0ce0JlZ28SZneySzZ88juNn0nhxufNGlvdCkk/CpTkoj8VQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0072.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Fri, 15 Mar 2024 16:43:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Fri, 15 Mar 2024 16:43:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Mar 2024 17:43:37 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [8o1fA6ghEtEI7D2M+4+jMJzwwrJvUfH+mwm6TQKzO1s=] X-ClientProxiedBy: ZR0P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240315164338.64795-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0072:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ab3bbbf-24da-4fc7-64d4-08dc450f14a4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SC2R7FTsJ9+FW5NNT4xP416W/dLhtRW3n+7nuw/eLTJVbzU1kPJ2GEGqYjmHrO+hvdFYLWndXrXRfyM2PYZsiY5YP51ScC8YbAQyhEpaj8HJA2x2fKYgGzzowz9NZbGn0+9zwbC6qMEw2fchYlvx1okKzb04UW0OknsK3FIrBVejgKHgVSC48FwqHgv6muiW61wGEwmFY58DATQgLLFr2cyyF24VxhGresGyQueD6Om8fEzZ63XZP1BSdzKwXLFUGpNLfZ3VinXKg7nWMB1LeuwkQq4atVTEXBgS3rLpnAYllRjCVvp1Z/OEHCktS0vxgjP7utTa6aQMw738fD2ijIjclvX1klOBMDGZd5CUZPtTwbGuhCVpXZxiW/e12+AcW5wvnwYi8nSYAoNf329qYcp7MQ1gzUs/CmhrjjtZg20w1rtr5YqekhaywH2zXfIrO3iuw2Em8zXyHKbXfRhL7IjD6ToK66sPjCf5/knO+KKGk3nOIr3q0P0jAGPWXIonHBuTBwPZLnOtR2ql0/+oDfvOcuUjFA0xr/rycU+WnCAmWySrk5J6rD5/pau9DtNQzzrWmfsmcA4sR5LXzR3gH090smpcIRFGYY88eSex6uHkJ6e4yU4QP/Cm/bC6W9Gm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 17ToURMYV3meZXu4+bhoueiX5VBAAkY2Ik6Y0peQErbK1cGZ14lFp8Gu9VGSaNk+pzIMlvu9Q2adTyYII7JBFWtP5xxWFEj//434yGvo6IpP4lgHibLsX1r0Wq/FBVPt0zpKiouZCE+eRHxWPTcanKz0vOWQny5Bh7DgAHF49WRPCjV5RjtMhQaRuTt1+C/1VIa4ObtZ8FRKuKDYInfQcdmOjH4QVVJPfpsm1nf4ESAyoyfmFsvqHWQevH76k4dWKGprh94Fx0tvkipPCGjQGfhIHtB2vfqLgt/iYi8LrpwFwNY9ZVb40NxRXunr0zSTRi/6+GZxzo65Y5LuYNuB+FjiCXrcpJQPaNX4t8lBk9BTP3aiSBAc9kaRRVeAHSykOYnzgeJ6vELOXm3DDMYDp67VG4+U9L09UqAH3YVqCOA2ssaBq2C2DxUp68PoPxoc9hkSztMVI3mXXl/L11AUxuvDw/inVHuNbW17tTg4u5HS2ee8XirZ/uZaxvJL5W1bxMK9iPPvbfWISl4fK5WraqCaFz13HhLiH8rxL/8ktXWStfM1HtGvM6V/ahlwRO/FWbqbzflYXe9UWyN5cWtOiu+kb2diM/6ihF/kT1tbcQ4FA3gpFYGSMWw7fxslofGLdGTy7VcoTKKTyMjEeBgZYVMclLF81HUB+KcpAOJlWBAqAFHoFjsNN9A5Uk2/Wt4DQGXHGzHqYUfEgKp3R/bruSckQWsCazIHQysdhp7u51s+JuGGRsv6mN0EaFKXlqR0ZTTuo8kOt+Ng0bzMsJvWosoS5Ku3MTYVIcX8p2pFiU/23vrfMvVqrgPRS0Jr+Vsu3pnS+XjFm3/qB5PnDLRbKxWIaEHJqTXuOG5z723e6dq+mdV6924el6S4n9BNoAk/jfKbOx6YQK2V5Ml1xrl/ghnV26BKGaoZsK9iuY+HCYF79fdFpv9qb3iwsH+pLW0Bp8fmMCFV17B7GGUpTj7GOaVK5yEPKhlZvqfJvNPt/ixARd0KDItMKsjjAuH4Lfcg76ONYe4ZrxM6eWMTqROPmALtTupiVQKP6rsaU7yTKSNVCcG4nhWYx1AfNAGxejcYRPEwPQlr2LYovb4nCAJyToXXVIJLv9N9T9wFZzUr/jhkuJU82Bvj9J+QPc8JmLt5m3ApLtI7rMrQ5p4JZK6CQRR9OB4UwUBtm0MgXATZ6GhWP6+Ii7xQHJeFJy2kg5JqSiQ8MJFQgroQFwdGtUQHHgAZQseyCBjdiVTboKFK0i32ANlwY03CbB94C23/KQ0GrgHE8DTLpCqpMKMLI3o7jg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ab3bbbf-24da-4fc7-64d4-08dc450f14a4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2024 16:43:45.5107 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0072 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/aeadec: Use sample rate as time base 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MMKH6l4UR1MO Signed-off-by: Andreas Rheinhardt --- libavformat/aeadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/aeadec.c b/libavformat/aeadec.c index 20170a89b3..be18e7b725 100644 --- a/libavformat/aeadec.c +++ b/libavformat/aeadec.c @@ -25,6 +25,7 @@ #include "avformat.h" #include "avio_internal.h" #include "demux.h" +#include "internal.h" #include "pcm.h" #define AT1_SU_SIZE 212 @@ -91,6 +92,7 @@ static int aea_read_header(AVFormatContext *s) av_channel_layout_default(&st->codecpar->ch_layout, channels); st->codecpar->block_align = AT1_SU_SIZE * st->codecpar->ch_layout.nb_channels; + avpriv_set_pts_info(st, 64, 1, 44100); return 0; } From patchwork Fri Mar 15 16:43:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47114 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8c91:b0:1a3:31a3:7958 with SMTP id k17csp370896pzh; Fri, 15 Mar 2024 09:44:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWp74WBTubu/AYiKRmRH0gJRmeCNQdRCVQJ3LqcrsxHtPHCBF1k1LQ8sVmK3cQFy3baiqVmI13tqR7pkZ+7gW1J/Ut/7BxqMnBCog== X-Google-Smtp-Source: AGHT+IHdfnVWdicg8TA/NMBK48EJ/REzHe+nEGD7scoDf+B/RGovlkm3FJZOE1njUAUhDKJX71lA X-Received: by 2002:a17:906:f845:b0:a3e:8300:1af3 with SMTP id ks5-20020a170906f84500b00a3e83001af3mr3546052ejb.30.1710521044201; Fri, 15 Mar 2024 09:44:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h11-20020a1709062dcb00b00a412f5dd982si1879679eji.176.2024.03.15.09.44.03; Fri, 15 Mar 2024 09:44:04 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=m6Eyuhbo; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46DF068D171; Fri, 15 Mar 2024 18:43:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2066.outbound.protection.outlook.com [40.92.65.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C76868D09E for ; Fri, 15 Mar 2024 18:43:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WmO9wvB2NMhEEl9BVg+8LV43O7Cq7crXso9YeCjpCMEprnB95FAoXPJmckpkl2LmPzZCLqp6vNIMuQUhnRrv59DXeF52Qj11aaKH0g/hofNXrySADpMod2d1asssmdV6p5sLqwCWWPjZGssNIb8cCHCSbkBSfxRNUj5bustck8LtC7wSgk2Ax56/0aNFzKWbhDPrr0Vrgp3JVtzdPjYtQoMaeMQlM2lbfYNihIwYz8O49tfRe+Jy5GI2aWqSKnepNS5TqgdtnvsbE1QPJidRkVk3FiTz+vX4bwL+cN5sR9Js8yF5TUCV4B/zRkC7xNtFdJ6M7DlXeXeMP6E7mmdSBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l7RWommCLx2uTDfl8sRbiMocYcwJDUS7LCt+pM3lfqg=; b=O+NJLG8+3/qWFuIXsNGh02U0YPSC1CwswDEBNNV620vKEft6kCxeIufHjIkOf4d0vx8Q300d5hhXIzjJ86UYr8AHL2mh42x8FKO0mx2hL6/M2gmUqWGUj1KT27dXtJt29KXX/SSMkfZUeaTZIkhlqEFGNcyTCGEQBeinE7cfyfsv+QdnGg3AEH4IqpGzFGwxlKYZfY/VgxChSkFU4iI6ZfUrSNkQTistBdtzwSy1A5qn6wBx4a+fAO/db1QYRTiRWBtvZu94BmDhptkdY3LowKLXx9KwXrtiH4E74esYCycG2FCFuCjU9ST+Oe562ku0qUKOSWMdhq4YDEXfCoARnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l7RWommCLx2uTDfl8sRbiMocYcwJDUS7LCt+pM3lfqg=; b=m6EyuhboaPyde9RZWSCb6KqaqY4SGO8hpDFil7T/sAkiNRIfZdZuUJZRbQyB5UAS0I5QUSqxklR8EFn8tAt64n2aFaHDpnhdQDgNjQ7PwSAZwlDvJaHAQh3pRN0Ok2edzvmUxgZi4NlArqjxqTl2yzyQ9awxpFk0+1MNExZBwHFkqUwukouZmIFG1evQx7eEgZMBEhAsEUjLqfyL5TZ0dH8P/pI+dgp4PuBxGVZCx06iUXpUa24Hirt4orR1KRSKGdgPUdk/VPODo9+vEnSW7ozGnYh43MziuzmBJqLySLQ8u2DWN3R3xi3W3ic4Ve5jKDuk/TWM4AKy25FxUNHqFg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0072.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Fri, 15 Mar 2024 16:43:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Fri, 15 Mar 2024 16:43:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Mar 2024 17:43:38 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [8hlrAL0jbV4sUF6/QlB4i+RHKbTByUPMoUmZPT1RoIY=] X-ClientProxiedBy: ZR0P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240315164338.64795-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0072:EE_ X-MS-Office365-Filtering-Correlation-Id: 261a24e2-3641-443e-55dc-08dc450f15c5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IFowrXksFCPBPOxbatFFeJyZDcgLDeA5MFVs6DeePXxJugsTjkOrTbt4JpsIWpGG4zef8qEbjIT8tDu7BwUyQX46/Tz6OLvKErMlYllvE5oAbMyPKqOcI6ATjmBH1lD8zFKHMYRhzE6nQMiQ4bO76o7tyaqMkOM6t1mgkha4M7raPJl4JBR2n/63N1cxSRfHLscs56aeB15TlRMuWo/JMhvtT7TINERbiRqbbT/UFMHbraAVtK1xo62JDWdZIx90f9+5UmRTkcJVmLB6Gz709wdNSKJnKJjD8nIccdjMdbKZKTdyf+j4Vp/qN7FccddN+7KIOktZBjfORkQPaNfWNyNGwsYp0r3ezs/Cglam+JUVnukm48ljFZOkSV+E+tmR5cA89eJijbHlsIaSP5kWXXZALxAADTJwt/+nRdzaaUpcOH8Stny0dV9dqOxXfnXoyCgr81Cl1d1TJt4cm3+vez9PtF7xagP6Umd7bO4BV1Fsz7HHl2qh+xUNQ0mvJYLv5QUHFtWea1rmRD0KYesrODoLXu2ngTtRFIOfP3XPHzQA72iqA6uwJiZcdaEHjnjM6iIRBcOhgGotQpR7qbBDYiMUHYwxd67fQs8H9T16o2fgOgHz6sDNqmA8M2xwF/cR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LOruVr8xkkRvj23UiNUzfbcyyGgkgdVcRgwKzrBDdAi/ZsnogiQoErQ3Lwp8Y5dsM48KgErfT+ftG3Q2yW4WjOByTMPskNuqCSchI1ThfD0oINjnoZDDKXXssm6gjWQ2n9FUAl3gDkMiAuvuV8mn3hyfkpBW2bBP8ThOIyi6ltQE5wlc3zKyFrwhmOy7IF9Y563bm5ouYjJFtjq0lTXxfvKSzWgbq/4l0Bahjst0SmA9d7lh6LiINIWMOTv4WpGicGEtNUIQ9V2MmhunrIOUW1R78+vC2NYV9dz0KeCuH+nDEtq7Vz780u2goNAn3HYQbUX/XS63/NeYt6UDHj8Gdr2OVH0EcmBaZMpAxe3Ri1ZmizG00ZWk92EIQ39q1ADTrb4svd4WAUkaGVJv9svzrnOzIAkNxu41B1mZsa6yfA8GlYVeagTK2b5g0Tj8TyKx9o2wwwIJmIyPzo092z7ewhjW2LbADZ23oadTim3BO1cY9L+xJWDg1FicGHMbPCeFZAhk+DjjuybL25eZyq+5z0+50MHSC2UwagNJZQa0wdkEr4tpfcL+Gtiwi/NuDAFOCkV4lGB+LTsMpRCGVA4txJtzcF2MKLGdJYZgzoK8q91xY+WH9/M/3lzs7gSjNx+NHmbtG8r7mVLnAAWbbif1GmvjtzHg2Nk03lwSFzcOjztKJ03mmkiGMz3Of4lwSPJSchiz9i76kxyM018UB+CU1sa5uB7A0cncHGxsPdsLb/wF586cCe8gTDoIvFHJfgMHwJ4xYtT0PIJaBbOR8RqgF2I30Kv0tSfOqzZuYYHpz1NOljsOtQ2tzVqBbTb7QG98FTupIM6DiPSm1h7jn6z8yeLC4gxkFNjuDPXCsMray/Ks1kv3SHNqozK5tSidFKZDS+KTLoKFMxlUUa+5IiFI8/snn6DdCCXnjGa0/8K5XOi1cSU192tVGGGz6YhYckrByAgUV2kSzE4+TrCyTsy/ksAeo0GjgySBns9PHKR++eZYcxXdzRomAf2AD1r3KrTyUCM39HamW3OCiqB6v4Bs7vaB6eM+E4YzwZnJ6ZVIbq4iNHo0WS198hKTlrZs/fwhjC0JsvnpqVI2M3YuHsqOTzBahtsAxL/PrLOSER1SFZrDpXYKQdb3RrZ95RYtzhjOwwH2GqauoHlaxxqZvvvvK1e34VV2Jv7ToaM/+tB81BVcyeWppjZEQN8CwBpFRu86i/ZaPzzMe51OeWiO5rONkBXzv34jBZNqwekGhdV5oodRFdmZb4uMgB8LOfIUKlsRYZACtWrjSTUx4ibGKOvKHA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 261a24e2-3641-443e-55dc-08dc450f15c5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2024 16:43:47.7366 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0072 Subject: [FFmpeg-devel] [PATCH 3/3] fate/atrac: Add atrac->aea, atrac->matroska remux tests 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TpgM9ev2V5xe Signed-off-by: Andreas Rheinhardt --- tests/fate/atrac.mak | 12 +++- tests/ref/fate/atrac-aea-remux | 94 +++++++++++++++++++++++++++++ tests/ref/fate/atrac-matroska-remux | 94 +++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 tests/ref/fate/atrac-aea-remux create mode 100644 tests/ref/fate/atrac-matroska-remux diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak index 1c91357559..592d1819df 100644 --- a/tests/fate/atrac.mak +++ b/tests/fate/atrac.mak @@ -37,8 +37,16 @@ FATE_ATRAC_ALL = $(FATE_ATRAC1-yes) $(FATE_ATRAC3-yes) $(FATE_ATRAC3P-yes) $(FATE_ATRAC_ALL): CMP = oneoff -FATE_SAMPLES_AVCONV += $(FATE_ATRAC_ALL) +FATE_ATRAC_REMUX-$(call REMUX, AEA) += fate-atrac-aea-remux +fate-atrac-aea-remux: CMD = transcode aea $(TARGET_SAMPLES)/atrac1/test_tones_small.aea \ + aea "-c copy" "-c copy -t 1" -fate-atrac: $(FATE_ATRAC_ALL) +FATE_ATRAC_REMUX-$(call REMUX, MATROSKA, AEA_DEMUXER ATRAC1_DECODER) += fate-atrac-matroska-remux +fate-atrac-matroska-remux: CMD = transcode aea $(TARGET_SAMPLES)/aea/chirp.aea \ + matroska "-c copy" "-c copy -t 1" + +FATE_SAMPLES_FFMPEG += $(FATE_ATRAC_ALL) $(FATE_ATRAC_REMUX-yes) + +fate-atrac: $(FATE_ATRAC_ALL) $(FATE_ATRAC_REMUX-yes) fate-atrac3: $(FATE_ATRAC3-yes) fate-atrac3p: $(FATE_ATRAC3P-yes) diff --git a/tests/ref/fate/atrac-aea-remux b/tests/ref/fate/atrac-aea-remux new file mode 100644 index 0000000000..45bab7abbb --- /dev/null +++ b/tests/ref/fate/atrac-aea-remux @@ -0,0 +1,94 @@ +1fd2eaaebf44772f959c25b58eda9b5d *tests/data/fate/atrac-aea-remux.aea +100000 tests/data/fate/atrac-aea-remux.aea +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: atrac1 +#sample_rate 0: 44100 +#channel_layout_name 0: stereo +0, 0, 0, 512, 424, 0x3b6509a4 +0, 512, 512, 512, 424, 0x3b6509a4 +0, 1024, 1024, 512, 424, 0x3b6509a4 +0, 1536, 1536, 512, 424, 0x3b6509a4 +0, 2048, 2048, 512, 424, 0x3b6509a4 +0, 2560, 2560, 512, 424, 0x3b6509a4 +0, 3072, 3072, 512, 424, 0x3b6509a4 +0, 3584, 3584, 512, 424, 0x3b6509a4 +0, 4096, 4096, 512, 424, 0x3b6509a4 +0, 4608, 4608, 512, 424, 0x3b6509a4 +0, 5120, 5120, 512, 424, 0x3b6509a4 +0, 5632, 5632, 512, 424, 0x3b6509a4 +0, 6144, 6144, 512, 424, 0x3b6509a4 +0, 6656, 6656, 512, 424, 0x3b6509a4 +0, 7168, 7168, 512, 424, 0x3b6509a4 +0, 7680, 7680, 512, 424, 0x3b6509a4 +0, 8192, 8192, 512, 424, 0x3b6509a4 +0, 8704, 8704, 512, 424, 0x3b6509a4 +0, 9216, 9216, 512, 424, 0x3b6509a4 +0, 9728, 9728, 512, 424, 0x3b6509a4 +0, 10240, 10240, 512, 424, 0x3b6509a4 +0, 10752, 10752, 512, 424, 0x3b6509a4 +0, 11264, 11264, 512, 424, 0x3b6509a4 +0, 11776, 11776, 512, 424, 0x3b6509a4 +0, 12288, 12288, 512, 424, 0x3b6509a4 +0, 12800, 12800, 512, 424, 0x3b6509a4 +0, 13312, 13312, 512, 424, 0x3b6509a4 +0, 13824, 13824, 512, 424, 0x3b6509a4 +0, 14336, 14336, 512, 424, 0x3b6509a4 +0, 14848, 14848, 512, 424, 0x3b6509a4 +0, 15360, 15360, 512, 424, 0x3b6509a4 +0, 15872, 15872, 512, 424, 0x3b6509a4 +0, 16384, 16384, 512, 424, 0x3b6509a4 +0, 16896, 16896, 512, 424, 0x3b6509a4 +0, 17408, 17408, 512, 424, 0x3b6509a4 +0, 17920, 17920, 512, 424, 0x3b6509a4 +0, 18432, 18432, 512, 424, 0x3b6509a4 +0, 18944, 18944, 512, 424, 0x3b6509a4 +0, 19456, 19456, 512, 424, 0x3b6509a4 +0, 19968, 19968, 512, 424, 0x3b6509a4 +0, 20480, 20480, 512, 424, 0x3b6509a4 +0, 20992, 20992, 512, 424, 0x3b6509a4 +0, 21504, 21504, 512, 424, 0x3b6509a4 +0, 22016, 22016, 512, 424, 0x3b6509a4 +0, 22528, 22528, 512, 424, 0x3b6509a4 +0, 23040, 23040, 512, 424, 0x3b6509a4 +0, 23552, 23552, 512, 424, 0x3b6509a4 +0, 24064, 24064, 512, 424, 0x3b6509a4 +0, 24576, 24576, 512, 424, 0x3b6509a4 +0, 25088, 25088, 512, 424, 0x3b6509a4 +0, 25600, 25600, 512, 424, 0x3b6509a4 +0, 26112, 26112, 512, 424, 0x3b6509a4 +0, 26624, 26624, 512, 424, 0x3b6509a4 +0, 27136, 27136, 512, 424, 0x3b6509a4 +0, 27648, 27648, 512, 424, 0x3b6509a4 +0, 28160, 28160, 512, 424, 0x3b6509a4 +0, 28672, 28672, 512, 424, 0x3b6509a4 +0, 29184, 29184, 512, 424, 0x3b6509a4 +0, 29696, 29696, 512, 424, 0x3b6509a4 +0, 30208, 30208, 512, 424, 0x3b6509a4 +0, 30720, 30720, 512, 424, 0x3b6509a4 +0, 31232, 31232, 512, 424, 0x9699a148 +0, 31744, 31744, 512, 424, 0x4b15b57e +0, 32256, 32256, 512, 424, 0x690fbe86 +0, 32768, 32768, 512, 424, 0x8980bea4 +0, 33280, 33280, 512, 424, 0xc792c244 +0, 33792, 33792, 512, 424, 0x57e1bac4 +0, 34304, 34304, 512, 424, 0xe813bebe +0, 34816, 34816, 512, 424, 0x022cbf4e +0, 35328, 35328, 512, 424, 0x36e1bdce +0, 35840, 35840, 512, 424, 0x243dbdf4 +0, 36352, 36352, 512, 424, 0x8eeebba8 +0, 36864, 36864, 512, 424, 0x8088bbac +0, 37376, 37376, 512, 424, 0xf75fbc8c +0, 37888, 37888, 512, 424, 0x9678c284 +0, 38400, 38400, 512, 424, 0x45edbc50 +0, 38912, 38912, 512, 424, 0xe9ffbe1e +0, 39424, 39424, 512, 424, 0x694bbdf0 +0, 39936, 39936, 512, 424, 0x3f1ab970 +0, 40448, 40448, 512, 424, 0x6114bbbe +0, 40960, 40960, 512, 424, 0xf67cc210 +0, 41472, 41472, 512, 424, 0x9d9cbf4c +0, 41984, 41984, 512, 424, 0x72ecbe4e +0, 42496, 42496, 512, 424, 0x1bb4be96 +0, 43008, 43008, 512, 424, 0x467cbc1c +0, 43520, 43520, 512, 424, 0x1b2abc80 +0, 44032, 44032, 512, 424, 0xd0e3befc diff --git a/tests/ref/fate/atrac-matroska-remux b/tests/ref/fate/atrac-matroska-remux new file mode 100644 index 0000000000..b34e801806 --- /dev/null +++ b/tests/ref/fate/atrac-matroska-remux @@ -0,0 +1,94 @@ +1e0eab5c5cb6ee0a77ff9c4611a3044b *tests/data/fate/atrac-matroska-remux.matroska +450932 tests/data/fate/atrac-matroska-remux.matroska +#tb 0: 1/1000 +#media_type 0: audio +#codec_id 0: atrac1 +#sample_rate 0: 44100 +#channel_layout_name 0: stereo +0, 0, 0, 11, 424, 0x3b6509a4 +0, 12, 12, 11, 424, 0x3b6509a4 +0, 23, 23, 11, 424, 0x3b6509a4 +0, 35, 35, 11, 424, 0x3b6509a4 +0, 46, 46, 11, 424, 0x3b6509a4 +0, 58, 58, 11, 424, 0x3b6509a4 +0, 70, 70, 11, 424, 0x3b6509a4 +0, 81, 81, 11, 424, 0x3b6509a4 +0, 93, 93, 11, 424, 0x3b6509a4 +0, 104, 104, 11, 424, 0x3b6509a4 +0, 116, 116, 11, 424, 0x3b6509a4 +0, 128, 128, 11, 424, 0x3b6509a4 +0, 139, 139, 11, 424, 0x3b6509a4 +0, 151, 151, 11, 424, 0x3b6509a4 +0, 163, 163, 11, 424, 0x3b6509a4 +0, 174, 174, 11, 424, 0x3b6509a4 +0, 186, 186, 11, 424, 0x3b6509a4 +0, 197, 197, 11, 424, 0x3b6509a4 +0, 209, 209, 11, 424, 0x3b6509a4 +0, 221, 221, 11, 424, 0x3b6509a4 +0, 232, 232, 11, 424, 0x3b6509a4 +0, 244, 244, 11, 424, 0x3b6509a4 +0, 255, 255, 11, 424, 0x3b6509a4 +0, 267, 267, 11, 424, 0x3b6509a4 +0, 279, 279, 11, 424, 0x3b6509a4 +0, 290, 290, 11, 424, 0x3b6509a4 +0, 302, 302, 11, 424, 0x3b6509a4 +0, 313, 313, 11, 424, 0x3b6509a4 +0, 325, 325, 11, 424, 0x3b6509a4 +0, 337, 337, 11, 424, 0x3b6509a4 +0, 348, 348, 11, 424, 0x3b6509a4 +0, 360, 360, 11, 424, 0x3b6509a4 +0, 372, 372, 11, 424, 0x3b6509a4 +0, 383, 383, 11, 424, 0x3b6509a4 +0, 395, 395, 11, 424, 0x3b6509a4 +0, 406, 406, 11, 424, 0x3b6509a4 +0, 418, 418, 11, 424, 0x3b6509a4 +0, 430, 430, 11, 424, 0x3b6509a4 +0, 441, 441, 11, 424, 0x3b6509a4 +0, 453, 453, 11, 424, 0x3b6509a4 +0, 464, 464, 11, 424, 0x3b6509a4 +0, 476, 476, 11, 424, 0x3b6509a4 +0, 488, 488, 11, 424, 0x3b6509a4 +0, 499, 499, 11, 424, 0x3b6509a4 +0, 511, 511, 11, 424, 0x3b6509a4 +0, 522, 522, 11, 424, 0x3b6509a4 +0, 534, 534, 11, 424, 0x3b6509a4 +0, 546, 546, 11, 424, 0x3b6509a4 +0, 557, 557, 11, 424, 0x3b6509a4 +0, 569, 569, 11, 424, 0x3b6509a4 +0, 580, 580, 11, 424, 0x3b6509a4 +0, 592, 592, 11, 424, 0x3b6509a4 +0, 604, 604, 11, 424, 0x3b6509a4 +0, 615, 615, 11, 424, 0x3b6509a4 +0, 627, 627, 11, 424, 0x3b6509a4 +0, 639, 639, 11, 424, 0x3b6509a4 +0, 650, 650, 11, 424, 0x3b6509a4 +0, 662, 662, 11, 424, 0x3b6509a4 +0, 673, 673, 11, 424, 0x3b6509a4 +0, 685, 685, 11, 424, 0x3b6509a4 +0, 697, 697, 11, 424, 0x3b6509a4 +0, 708, 708, 11, 424, 0x9699a148 +0, 720, 720, 11, 424, 0x4b15b57e +0, 731, 731, 11, 424, 0x690fbe86 +0, 743, 743, 11, 424, 0x8980bea4 +0, 755, 755, 11, 424, 0xc792c244 +0, 766, 766, 11, 424, 0x57e1bac4 +0, 778, 778, 11, 424, 0xe813bebe +0, 789, 789, 11, 424, 0x022cbf4e +0, 801, 801, 11, 424, 0x36e1bdce +0, 813, 813, 11, 424, 0x243dbdf4 +0, 824, 824, 11, 424, 0x8eeebba8 +0, 836, 836, 11, 424, 0x8088bbac +0, 848, 848, 11, 424, 0xf75fbc8c +0, 859, 859, 11, 424, 0x9678c284 +0, 871, 871, 11, 424, 0x45edbc50 +0, 882, 882, 11, 424, 0xe9ffbe1e +0, 894, 894, 11, 424, 0x694bbdf0 +0, 906, 906, 11, 424, 0x3f1ab970 +0, 917, 917, 11, 424, 0x6114bbbe +0, 929, 929, 11, 424, 0xf67cc210 +0, 940, 940, 11, 424, 0x9d9cbf4c +0, 952, 952, 11, 424, 0x72ecbe4e +0, 964, 964, 11, 424, 0x1bb4be96 +0, 975, 975, 11, 424, 0x467cbc1c +0, 987, 987, 11, 424, 0x1b2abc80 +0, 998, 998, 11, 424, 0xd0e3befc