From patchwork Fri Jan 7 10:53:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp279207iog; Fri, 7 Jan 2022 02:54:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxS6MuIeUzujLFgkZMfXjyvAPPQhSc/0xN2aU6DXBVWbqjuJsSKBvd15C3/tnRWw49xj1H+ X-Received: by 2002:a05:6402:491:: with SMTP id k17mr61563945edv.333.1641552843381; Fri, 07 Jan 2022 02:54:03 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf36si2759502ejc.638.2022.01.07.02.54.02; Fri, 07 Jan 2022 02:54:03 -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=@outlook.com header.s=selector1 header.b=bJFCa7k0; 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 D30CB68AA82; Fri, 7 Jan 2022 12:53:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067033.outbound.protection.outlook.com [40.92.67.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B31DF68A1B9 for ; Fri, 7 Jan 2022 12:53:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l8xcoGsQ3WHe3LymILhEfBABIL7huSfZE1Ff0fcz4M511+iDyE9oKRxvTo416HVM0OPk0XextKMY8Met2WnfZu7sDqF+FgJBCI2MrPxwy/XzxqeSV9aM7BS+lPWHSlnTC23RSS4jlJb3HIknAuG82OkKDhQZV++17lzg7rIkS6LHuqXDFGmNaMGs/C4R0G6zL09vG0GAo3O8m40M3g+4fSLuv0Dcneif7xIolCg6HwsZrBK9a35nChUbUWw8ySpm7G7CKLctOE6hca6lLXIAJ1+g4rTYIoAqAl+ePX2bpTHxhnrD7VjLiWXkDVSHmA5c8674wA8ak04I79TZP/2Baw== 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=8qkeDhPiEyl8pRtj6x2MKOViYtp9IK4Iw+NKcp2fNns=; b=Tu7s+9e3Bmy0QZyuTi4g1vvd1PJwy+nVhPbjNVXr6CL48zW1J3nYI7miiG3Kso3SYnreHVZNIZFUXzAH8Ys6ulreGqklOBCUTyjMcnCiU7vT8TeFKUrxWtLfxafvPMEfYy61mMcAd7fQrNWbV4UMFnsuOSVJ2QIUuZA8KCu/G+skhma8k5hy02oMY5X4Q2/phpnf9gqd/bH1eB3QwwBNv9734Ai34Xj58dfJwyz1E5QEXIMWZSivByJudkYjMbH61AXwqV0Fuz7c20tmdM5+uVnjxuvhcOwbOJP8Y+R4DbdjVKXNpAPW0nCYDK6+690VMvWt8SIU+Pcyr0NaodUgBg== 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=8qkeDhPiEyl8pRtj6x2MKOViYtp9IK4Iw+NKcp2fNns=; b=bJFCa7k0FWe0qvISNY64RrK5MkZNa8cPzOv1WqyRhyWhwTg4pd+T2voQPiSmYeIouGnpzFgsQ9+bBuUoOdCoE6VLjG/Q5MYTKeLD1xYXDPR9Fl8edy5bmH3rS5t8Ak0Mf3dxd0l7CrZ+1tcYxYfXUXdS2Go/zIevr7kiRkTYWu4LZp1sey7utd1PaDJRnyCRJg421g1mseplVLihn19qyfvDdild9OFgQApLF9gvuLr6pASMJ/oCS3kcL83eeqD3+6drtDlmygoj2gL/R6O0FgdmZOc921PJC5HnzAaS5FioXFL/QOVJOFcvmb2R0Zzo03fmUgME34yhQlYmAnsgAg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6184.eurprd03.prod.outlook.com (2603:10a6:20b:141::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Fri, 7 Jan 2022 10:53:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.011; Fri, 7 Jan 2022 10:53:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jan 2022 11:53:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [MfWItW/q7DviAZ7Jx58ArjcynAc1WF+W] X-ClientProxiedBy: AM8P190CA0025.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220107105342.3241608-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27581172-6cfe-4c57-28e5-08d9d1cbfc75 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlridfjIko0CxIpBKC5Bk3h9Qpe512HjfavbAPegnOTbDRXOeGup9fOAu+M8rertFu68a+4JRxtE/KTdkrK6Gu5w0PF+vpDLdpHC1JLJ3nNi1W8RjAseZ25Gm9lqiM1LSZMFrhQ4ptGToN9+B0YlkQDudT5NZHhc4nz8nKJaTVMDqX53+ZXcda8Mei+t2nJqCQp5UjeSSShQnQAAdjVk83H461Y8AmwV2BzKbgWOkKMTifygrzXti3Ip9bbHpBJx+UBG+/pxX6b1mJNubXz6GL+uHRTfW50dJiK6ydNBwVF6rPqrG6Ujl5hza9eEJ20/B4+gH3vMdnv8UvuNRlsapN9I1ief1Kl10GXvJdp2XEs34h6Lp4dc6xV0jhpjkuD1PhP47aFsdpcsVVC7SPC0Rs5ueYX+nHNjncus5dnPFuLcmqgieEMmgthwx816yfoxoa8DZqvD2v9pQngFvHAzM6tex6KHtpl/p1B5a23hnZtxvE6dwTp74y4lpHPlieRfzYl2DV3M8ZO1eDfp8SOno7YXb7kQWhieXieMS1WwaADzn11hJjr/a5CIagoFQrppePiwZnrGrR1G0NjCrIj4YIFAwB+/lRCP6wz6xEtddIm7HS13w3QVQxjs8phCo82aL5yfHYoYWfoex9OQ3RP65mxVdFAiuGPD4rnsL2AmFBGAhEBjOmrBbrINEvWi1cRr1Xgk40B0iyZa4= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dMP6MhKgr5PG4R3HUBpNfTE3c0+8TkqMYFKnWHwlVAF8V29S3dKbEAn5GXBFueeZ11dHbDfBqIIRuVYqDYWaaNECRKgQapyOfU6ugB9/0JyR6gUxZSRriqGeOw7ThLc5v6qMS3Cgf7pv8OFLQBHO0Ae5ewDxpKbPgvK0Um0LPcq/EUa0n4wQBW6IsgN5KzrFzsJLVMlbLVZN+YF/CQJYlmnbbfkRV0D9hi1TeEg0vWXSgkf3nUIBjA2XjxNH94iCJzf9NI9MrQajrypKAV0Tq0GnQSEkWtQxH5vwxsMyz0OQLuxdt82zOH9cRlFVqbq9pFmA0OQBNhh8bi7z4B2xZ+eNrDy+gi6Mv6hcUyQQh621g68iYGXE9VDQkOax+Fns32bTn0cWEpWqa0yzEd9vIvEQ2M4ws3sOC7vgkV7tMKakhkDmk48MIZXkf/HsXbv0w89ZUPFnfBJgsndGuPRELPIW+ugwRgpnnMoCustXJb1LekxdJpkrXc7eHR3HlYBfW2crRm3j/vA85qj6fyg8Gqe68wXz6p6PIMbflQNaS5jmMHkvcsY3CrnUXJX4Q9yUqxd9O8ZbzXfeErx7RkERtw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6lBd9Lm9waZQ6fI9NSHO3GD55vDscSDExKCvQppaSMbLTutwEANhOW9jirOxQ8yWbnbyMV7DoHcldWEWQeulcHw/zw/8BysbS+7IBX7PGeUktO7vGf1cduEXBgjbeGCEC0xyp5jWaqWRYPLh55JVnYoXugZ3YxbdZII/TY+OSXYWA51nfYKSa9+XTvCgMFZtFArIFdae/FLydmUtGz8WJvE3kMxy2Lf48If+HxfjQvF+w4PZGmmCH7ufdKkDdDc4wMCXB5oIOqOGgwFs/HKcZwqtbPQ0Sd64tr6FWe2im1RHRbETeaZXijia2EW96HPrJdGF/3LoZHaDCvnI5hwf/N1volsid5QR53YDpV+seIDfJZ3/khaf3ed2jjvVp8fDuRjq9EPPLTlxWbnSDubjqjW8siMPg026oeZdMfRTStznwbW4gzqYW1djV4tUyapQ0ewUHWHk+4WcRa52OQH5TbLZtP13n4ya7pzaabUHesuXEpYpNtDt7VbtE6UtD07scP6UM2g8GpM06qbI0GVvx/6MLFi5K0QbEruYLklQMf44s7+G1ftLSFPbhqOp3g8IKFNBgqD8Ycd6AifZlgKwYTlPvVMmIw46FrWyA/nivmty2zu0B5wdyZRvAwcrIYqQ+ycIN46FyYdsZnvt+UPm1ehFZ38Rvc1kFNkUZ8o23gQKi9EaWFthqk2FKd+CzFW9NvETXZJmKFUipMphu0j0/Ye/rfME5qCxtnzRLB7MA584p2I3ngYlPj5Vz/8fH182jw9qxAV5tv76VSQJPwVdBYoMysA2cdvTx1+xSk3y57uLkTpjG9WWBGITd/ypGeSiEgA3eu2+TJQVFytBx4iu2ZZCBSaPh3UQpdSyWH6LHu1jEiCMiDpM6qUdHRcNt0A0/VbOA2Qz9ZIDAX5X9avJCYp+r10gW+DVxCzRwbKUiPCYqNFIQNDC9e+DQyLo+7tKwnFtLqI7oJghuvK5qK/RBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27581172-6cfe-4c57-28e5-08d9d1cbfc75 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 10:53:49.8268 (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: AM7PR03MB6184 Subject: [FFmpeg-devel] [PATCH 16/18] avformat/matroskaenc: Move AAC extradata check to other audio checks 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: dFqBl4cKfwdK Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6ba1dadee9..303aa1ce50 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1173,13 +1173,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) return 0; - if (par->codec_id == AV_CODEC_ID_AAC) { - ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size, - &sample_rate, &output_sample_rate); - if (ret < 0) - return ret; - } - track_master = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0); put_ebml_uint(pb, MATROSKA_ID_TRACKNUMBER, track->track_num); put_ebml_uid (pb, MATROSKA_ID_TRACKUID, track->uid); @@ -1377,6 +1370,12 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (par->codec_id == AV_CODEC_ID_OPUS) put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL); + else if (par->codec_id == AV_CODEC_ID_AAC) { + ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size, + &sample_rate, &output_sample_rate); + if (ret < 0) + return ret; + } put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);