From patchwork Sun Jul 10 13:38:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36723 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp803376pzb; Sun, 10 Jul 2022 06:38:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sSjSxYqbI/tAk6RFZYHFgOrPcos1GayCpbzL8WTuyItrimLJvYGTt7HtLVIm6FCEdt9uXe X-Received: by 2002:a05:6402:5384:b0:431:6d84:b451 with SMTP id ew4-20020a056402538400b004316d84b451mr18050192edb.46.1657460327252; Sun, 10 Jul 2022 06:38:47 -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 u20-20020a50a414000000b0043a6e796231si5226581edb.544.2022.07.10.06.38.46; Sun, 10 Jul 2022 06:38:47 -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=kw0UVwYi; 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 3482068B919; Sun, 10 Jul 2022 16:38:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069067.outbound.protection.outlook.com [40.92.69.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A01D68B5F7 for ; Sun, 10 Jul 2022 16:38:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ua/pQsy5rs5HIFZD4htm3+7JM+7o9FzkrsgHm0pgLr5w2Z3CaEql7AyVNND6NNpK/nTikybwIhLrDEltOQ0lZp0Y1AO/6qRKLEZBJtrjZwKnbsuARnH1CVFWB/oYLOwqa9fZYQRtPZv9CWWGndpTL6vEEFWCGL9MBxxhOMBNJ/XYgWcBD3nGd08rq+aObX5U+uqD/yB63RY7zNmLXcWE6nMJXTn+Quaq6kDtm4X+E3HqscoePR2ZBipeC3mNDDefZaEd1Tq2EE/2UaPOuFpNbEvodBHJofArZyg9SJr6YsHp6CvtCFBfhHUgCVW9xjKVACMdZZXSp8sPLdwUlVTL7g== 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=WsbVWuEefNM359uVCG3K6IEnJ2EA+yozJhOeZJEERKs=; b=BZhaWCD7fGrIQJVOviGNj+eJRH6Fiml7V5Nj5VNdJL9XKWkeMuKytX+FuwCu7fmtyKX/Avi1XOKf1pTmga1qPPZwVwLb29oKnN681uxwfdwIufuws6RerrR+ZV4vmz+8W3dhD/bDkM+7JuhQ2UWf02VjIyr1n26vU7PDrxlxJcchi39Kfs6b1H3SP3nrPRrdIth7OY23biMWQGyBKKDnO5bjDsjkWXAoVeiRkh5ryilVuiq+3OXODmto4gwhsi5AM5uT3PuA45e8z5ksU0maBbBFwlJ3flJEPn4QY0XcCSPPqAypNELu1XtMG7+gt0c2/02O9VBB4WRXNuXpQY7IZw== 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=WsbVWuEefNM359uVCG3K6IEnJ2EA+yozJhOeZJEERKs=; b=kw0UVwYiPiNt2Jfn3J8l9Npm4CbGoO/WKiyVIYSx7Ez9dvNyGd54MVnv91gJqYWq0EcoGhIh9/cenUNZXRgNaQpN2wsxqrtOQ3qZcwMmKgqzWo2gaaAlDbQkZjgm9WiLR3vbziOGwfdh5AEaJMgOIgruK1lm9PEPii+8WbTmdcX0i4h2QWFYWWq/mDA1UKooaXkm66h9jjjuA/rnYSlLy00+JDYUGtv/YsapxfXpGc5qwGst/1oeOm/+YdvHpijsk8RnG4hhAeRv/jT64hqrfa5BJ/p4Zxk4Z2dUbd0WFr+q563Me8rOVdMN8gA2h18r8ZgK9YgwAR0vK1vRan1iLQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VE1PR01MB6143.eurprd01.prod.exchangelabs.com (2603:10a6:803:113::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.23; Sun, 10 Jul 2022 13:38:32 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.025; Sun, 10 Jul 2022 13:38:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Jul 2022 15:38:23 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [DsZlkkaTGeTovTUOWdZjTmzO0tvNMDB3] X-ClientProxiedBy: AS9PR04CA0113.eurprd04.prod.outlook.com (2603:10a6:20b:531::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220710133825.2677425-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d5dd962-059a-4c8c-8c4d-08da62797b3d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQpgUKb+VO8j2oHRb5MJUwA9DodMcAvm7WjuCZp/r65Q5OndYkH2ZtgqOkUoXfp38ao7BhlQfizb1VooUZV7ZyYrPx1Z7QmmEnJUsLPZNTiNy2czqN41yl4hs+EtLFYDVG5iFgbeokzFu2FVjOHaXXqajxp+Us3+z4LX125gTfDNLDR+on4Rj2BFgCnhZBzjNyx3VUveGgc6V1L3MSWqWcJ7lSqPEh0EMlK4hViaQ2J64MbedhV5uLQBthktw+2snoXWm5WM76UID5mg0cU2mTXQnUCe9SAk1UNq2T4HaONSKdN/I5ZTRam27qVXjXgc78qkPb28iuLNEG0dNKoxVwTmHbMTEST9PF7mJZOVldPrk1h9mveSzukM01j+7BjLInIWyo25ZPovM0ibFuabVWqw+5RDe94VtTV61Zw5tdZTAvHnUtuNRezOqZMhY8qFhPmEYbOcCozbU1f98L/EUV+Yci5PWYg1T7/jHjwpLyscOYihaCqBLXl3agc+rj0HQ8aQ2ZLv3LZ9IAQPYrxUjCAH8H2pd8ksS6cAFEVD5ftpmQAr5eohxNdi42rx8R86obGLOgqSnD40NFdrruyNipm4mlxjDsJTk/Cet8b5YoODyWNKWMP71GicI3dntGVgPSMZZCIrAUknHMAId0hp5d/mQ9h+B5y3k02cCijr5N+cdF3LCEry8o1dILMpKKzBPVRTE1sijEdYpzKINxS2M0or4gbR0h1/fRwaHQAwUkL0bWSLFUsyMLTmRZUtPNprec= X-MS-TrafficTypeDiagnostic: VE1PR01MB6143:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EFKjs5DKowImWC7AIut8IA9eonk3rKGDf73xr/az25lWLPhk1ZhP0ukabt7SdhPnoTAP6TVMbYUTg+0UHKSd2hErbMjS/BbmxoiCVC42TUpPI4xv0EgLq0//EVcltUVvJvkkyPryI762aXz5/8JmrIGLp82fS/WpnqwAUL8uNPDcimTSol/3nLN+SR2j8HYLRWQeTKA1aWJejDuDqq1ROb1lZYoKdgORjwdLdRiSmxaTIFaHb1h90uZBYFdYqcIO89DTFATdvJxjJvaSMDH2GO3hQedU+KID+QigiU+XtbIRWX6kAzJdmsGu1IEgMzHMI/XwJ6AHOoU5RcRkZjYGmit9Aj/FZ3FOD0qeM5XmzwA+3EoguMT2X8/DUV9s19C/CqG4AxyiKQE56kLMI37p5aHlAgL7o+rTNFSwO8TG58hvJPA7ES5AkORzTyz9NylxGqwr+A3ojDPaYUXayokp3ucSMlHYd1XaFs0QEg6kQ+BqwhaVkMR0YFeGSmGH5B4LyRnWil/oXdTPZY2ZDDQIWDRXKuEz5+C5P0iijpFmSYHM+XIvPmPOVLBQx+mW0ybDGmBA+pvkKrXbGhT3T55Ll9bIutBeIUINxr0azDBkLA3tiGVbxzporNJv491sW/M/D37lEN5jEyRgrA1RG26gPkFvGiRSW9NdCqcvoF34+ZFCUvlld/zJwoKf0F32nC6A1i6ZuYK6+FbWq+QKJdIAHw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yg3ftVJ0FHnWa2RoIc1eYvzAkNxBN1rQ5pAUWQg2m3VfL2EIi6ej/8jcqNd5AnqWq6MVkV6Cm+Bfu2R4/S+1LuWx7E6r23DrkRRHz5ZYnGds2P45g8rbV3iDSb9eVZEt9AA7ZHLytm0o80jkZd2oKb+cPBnFfXyEeoXJkTSZu7m6oqICrHVoc5soS2B3GYf2BnBL2gMOEqkjLA3SIKNKKT0EzuMnhUvG8m4MqJ9JszrlupHmsC4QFkQJQt1hhIQuJNUdBwK5OnxBrY5t5JZQO/ENuMpNBcqF5uIcv5lSZqo6uNvEqh+3DQhf7TqvcMCIaT22iBpHgYg4BdwXDB7F5/CjjgIcghkhc74Q1AyRRQTU+kgRBcO16Hc2GaSO2l6GEVT7Yixrw/7JyBJAtTfI/cg9BjFfvt9KkRPMeXlxhdN/Z1BDUVCPRvYOPI8e0zTvhBeFzJYxrnHd9TzTBHm+MQpQxib2ktr28Ml6Js7rsf1wA8ejAqnxXtaacgEV7p+5hGgYAb1rfL2MuEmXOPHG4pleBNHh3viiK0obqhrPAFEVvXdmz8WEXurk3pq+EEHxiqjOi7tgQSezIwU2Fb7NCgvLu9Oa4QX5Ho2x0KphXR1ETORmLUEcmtPs7TvPyV6KpgNITApdT8/sNwq0V86SlZ5VV1OYzUKe7I2YbSchmhDi+2GOiHritKPKZ5mu9HV/GyarseOuabP1wAtWjE1jHvD2c3zOb8HU2Ub83U4hz8iaoHJRbhGAU8yngjfOTwP/cC/AG+Z1SgmCgEelvz+20ZFvQq8KwmsZ1BPnFfyS9wq7Cv6ipYnqXu+omIWTOjiDy271nZBmKKLFLVVlK8UH6aCBtRMDQLIvy33V06Yxb1QWwNPCcFMXxGMosMza3YKhyqYifF1dLGbdGohFdt3SLsAsg6/lQIX76IKFOWQw9U3rvMH3BxJAjnUFn2rhJC5CVh4cj8i8+YP4lypTOqhT3t/ZLbDh6atW7ff0QKBT5N6n/jlMRHmwMBPntb5Oa2IRbqWfUZXpBvFFqbDSZ/ss8l6LdOcBN9lfcmz/YMxtB8cwCCBc/2q4p54hR0gPz606mlEKmA1pTfkI5Bl9tnCsdrZnVfGfQJECFqCFEUWvO4z1/FQAtIX/iO2uVX9aDD2whXAXT5exMFhjEMXobjsrQmGAMG8ugGnmHz8bFf28swGCLAwk0A/zbuIAoptJSVw4e7QhFzuvnvx1j2Xv6RB3NtG7XZWUJIfl9heDQCjFPI4GtaZJyWwWZPoPi7cs2ZIivj/XI7vkqUe9zFUpkf8lplMAMotYddzT5e7/btKWT/8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d5dd962-059a-4c8c-8c4d-08da62797b3d X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2022 13:38:32.8917 (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: VE1PR01MB6143 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/pcm-dvdenc: Remove unused extra_sample(s|_count) 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: xuLsHTudrBdl Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm-dvdenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index 6bab1e0aaa..c7f1d46ba3 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -31,8 +31,6 @@ typedef struct PCMDVDContext { int block_size; // Size of a block of samples in bytes int samples_per_block; // Number of samples per channel per block int groups_per_block; // Number of 20/24-bit sample groups per block - uint8_t *extra_samples; // Pointer to leftover samples from a frame - int extra_sample_count; // Number of leftover samples in the buffer } PCMDVDContext; static av_cold int pcm_dvd_encode_init(AVCodecContext *avctx) From patchwork Sun Jul 10 13:45:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36724 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp807116pzb; Sun, 10 Jul 2022 06:48:14 -0700 (PDT) X-Google-Smtp-Source: AGRyM1twtzCMfPMa6ZnQ+n+s5TnaX7mJsmdiqQzZDalrjLwo5rtOosl1uFJ0d2TzJwvs4tMsLmaf X-Received: by 2002:a17:906:7386:b0:715:7024:3df7 with SMTP id f6-20020a170906738600b0071570243df7mr13846772ejl.543.1657460894114; Sun, 10 Jul 2022 06:48:14 -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 ho40-20020a1709070ea800b0072b4b303e17si3312906ejc.448.2022.07.10.06.48.13; Sun, 10 Jul 2022 06:48:14 -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=U36KR0DI; 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 09A7868B965; Sun, 10 Jul 2022 16:48:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073017.outbound.protection.outlook.com [40.92.73.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96D9268B7A1 for ; Sun, 10 Jul 2022 16:48:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sdv0+OyTwkmSjJQkooDgO+OHvUHauO8QwwNlWuW7YLghw1Tvqsls5pfBiooP5qy2cuwKWTZ+NfT8tRW+VqhKcedUwlMbhl6jdLYO55Q6jSMEOtpmx+fcxgX7MRZ6/1TC93Qdg0c+/RYFGh4je4OBkRaEjEu6bD17N6loavpEpsHoVAtPlZkQsg40oUtkEYvTzzgaaP7PprTcP+RVw+gdsgjVyzL6M6XtqSimIj5UN0R50T1/0mvGgN/K5ciC4MG6PV2wENT8ObYBsR70+dQl7qCKgmTC1E2bwmZVgAYYT3ZhLWc7bnLU9DfjEFLVwaVmdJHP08IaJcDcPDrRia5nuA== 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=HBHoEJOnlBjuE4gcTK0OafV83BEbtV7ZL55YAo/+bwA=; b=Hwrr5wwAxYF/kgE+qx7JCiCnZZwI96F8onLSJmTv1+caSSLZVnd9yOY/gbBtO2oLL61nlNh8RuSRZFhALUAfCKQX1LcwuZnv9o8xY04emfCM0p7kx+eNBJt8HDLtdayCGOeeCu7bf7dyAAmx2u2QM8ZebJs1Ok0OnkVgEuMu41vdLPmxrJxruxWtBJ4XNJ1irM0KrkAK35wnyxgw8wVM6k8bYTPWITGVd3VOGlpUGkbTOsxrOr06qg4C63RwMXZX1QCNdo45wKhswKdQfKD23Nh2l9x8DJ3RlwAgBdQl0j5l4R2bx+UnmPY79eN+kAisYhIWopZVILkVDgQf7ovPZQ== 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=HBHoEJOnlBjuE4gcTK0OafV83BEbtV7ZL55YAo/+bwA=; b=U36KR0DI+1mXAi/5xDQkjMvjRDTo3S2FRW4BF5+2HRV+nQJlBorbRm/POpxQQhqifoWpqRNqbP9wmc1WJiq4kA3lzAM+yaHwGQtOoqmgqU7V4uGJ7uTd5+hJ2XfnlKJk4MOF/PDmOjWiLP3MEwOtXrmQpO8ae+J4yGpk2O9W9Ld6iisnp7bVv0uObflraw1dMQcTvYmDgMM0RTDpk2gC2iwC53LnulJ/0FgEQfmw9UwRQj0uV8lv3tjN4oMSyjgLvt1bmGaoxmWW/JbUsUkrKIaPAhdxH34lHIhC74c7xvo0mYrSS7vO2kxj2cvh52OSdL74MJJso47G+fQO9b/3pA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB9052.eurprd01.prod.exchangelabs.com (2603:10a6:102:2b2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.25; Sun, 10 Jul 2022 13:48:01 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.025; Sun, 10 Jul 2022 13:48:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Jul 2022 15:45:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RaPtbIR5v0SmcMBBm8KTDq80Hbacxd3/] X-ClientProxiedBy: AM5PR0601CA0035.eurprd06.prod.outlook.com (2603:10a6:203:68::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220710134557.2677483-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b27a0aa0-8521-4dbc-fa60-08da627ace5d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQpgUKb+VO8j2oHRb5MJUwAjPmhuXvqxrSEMHIxVWfDgmOBwdgEm7nJpAc+KxRzr0PMaptMy9OG+n9/oD5Ld+EoV9rnUwma4PzRbop/3VsdTQJkvOc12RlwDX6V0S1b1kdBavZkNmHiP/ZCejuQaJ4vhvndZjW9Z1xe9AsV7rOzyWaC37g6kHDVFlRHlPTLQnREHCcDypIYsAjmZ+M5ZxjXzlNe3yWccjkn8PDRn5c+uOtsSRuF0tzQdbUvXkAxlsM5/LZYoh7mAyenoG+VXTX8y+FXNjVjUOSlVe7MUtNZwpaNgQo+ioGp2gkgWky0D5C0B+c98SBzLJ6hWvXdedrDscjqAtO5nOX7Y6s2a4MBCotJQ9LTfRxgam7antNJJgZIZFKVNGCUbtily3i0sAaojvabi/nuB+VqPVXom4f4qsCW5b/lbz6mrxUxty97JRB0e38QSkbF7x7Nbkzb42OjYkCu+8uV2dV/yffX0u//kfTJweD9ebYMvTggzBpKxsx9fb5BLLhkP5VZ+qE8mfGH44rNBZPHQ3MSVrRI3lPEVShZDNcPaeUysmrTbYjpsJ2V3CX9KZglQdaEdsOoSqXdEDfUJ1BH59cZVqpVg1yE6063GPnrHlIeV0o1pz2bvlm8dLGrQPVVyET1kxOD9klYGj/eSManUG0mulqjS/zOSUWOfh3nZQAbc2BpE2UtcRQVUvuJo5ThhEgWuOrjTyaxD7MFiztHWGfFoip81HLQPB19wSiT2palCHWP0a9AGFY= X-MS-TrafficTypeDiagnostic: PAXPR01MB9052:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QiSIppUDvfoSgpRj3+g84wzChhVnKstweaRfcgcC6ITqSjRBiT0lMsikvxqQQkO+9c/O0PPR+bKfT1d1XqDbTW9F5iU9VhH1N/WkJROFVdx9CA7W4Em0WkDciaKBDTitwc88QD94QOfLMcF/IYvoeK0Sp24ICZXP89UyXEbmOXU6LR2czJEnZM8DySkcHoL94R6Qe4XNGh+kaaH9o5TKoQs9JuBi7A/VlgYumL0Es61CM8OUjmRw3HreRazlwhThz/1a26AlpiHwwmJ42s/bTr08Vao5uzGu8ZXCgypCA2XM91uHtffR2WvTviw9+NMudw5Tcd8o937vkPPdLnsmWcMpbkBG01m/KZge2mvkxURt0xj6N+pHZ4W1m9HNjLl/BGs/okJIQ64z8Yc8b8gID77EP3RVsJay20SIZY9GAIRqhO2yO3JZKurqGFnUvjw6DPtoqzG48V7DdQBT1ZF425oGlnYh9nsLTPeWeZys+pqyWsb04ncnbo3XyAbBayI63M/m5LqAU7lNNjgoe+u0YLMAZ+U6Ebu6Vbcg7ahvSdJmrm37ukfFztnVe32KKjDTN+Ze3fZ6wZeLeGfWJQNZt84RpVyz2LcqXuK9K+Fg9rry4cBn/zR2W+qnezSQverBI0rJ+KddSow5KqVPAzbT2BZYe3qSPx+eIdAXqCv2A+dwJpLakYy0O2NId/yJw2K/Qm+xBBnH8mvANum/ulP3tQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DY1rXaKECgWuOMP3ijMfDZn8vGkVgH4lJ5jjXOC5fXRgK3Tx/VKJZ1X4Y0sbyLif3j8T0MyTcVqganzPYR9yxk6UWw8o42TBs85xARp7k5+DvuDQXVKbAg5+9BztyPshcca2VItuJSLKjg1OXfT13sddIMWiL0q0tjBggWrRSPEAKw10lXZv0XDdt/00RgmhCpsszLE74V6ICtEzaBz794CbbUyZlgGKpzdhD09BCdKyqY3WPSJ7FZUS9kGpJYsuTXdzbIQs+J92q5juMGDatr6UDpyxxa5PdrFlMCZnKvjiVxrOx5nYlV5DU/3Ui11BMK3mRIv0w09+K0fapqQ1tLM6+KULV2igd+iIzDDjSgPIvg1QqqtMDt4jn957wzDH7kS4HOrTYPAj01P63LfFqgn8xDagibjRinGI4b8YPjBlSj1RWy4znrTXkoxx32BOxjjm6QF597BUzJBSMXczPr0sg3iETi4CNRf+UBo//pTAetaubPqym4GmPjUejdCN9ATVwcuEuygVSmpkPSt4fkRD7c6yxL12oa35aeyO8lKbce+bbEUi3uASOIDx0WsQmd7jGKlCdD8ozI7mfNVCYKmuS2+Ob9GxepjeLBbjXDgup78F0+J7pfV5oXRWAziI4xd4ZHF6E5RLb0SrT6vsyT0n+tUPC15irkK3fVg0vTZ2SUD/NuioZ/bISolgNjdfluf+IWrpqVqS/PjIhLYaFmsdVSz/lsiYzKPnoUP7Yq3nc420JC5YG0vJqEqNc8IQODp9KXX+NsC+kcyYHT3Cx99hNfemCAQIH8fa+V+dHA/N48vPCnhHlxmDP6wW3BwLEb6QsdMTUZiO3av0FDeS+b4dYpVlM38Bh6xulFrY5US4SJhrhvMOb1cbfai101ar6obrDc0yLRzBylV7QNFL+0zktjjB0a5juruRabt8n1oAjweN3zx9fCeWukCPc9PS/AVwlIZNgF+jexGQCEp/YOjqtQNMi83VM64o3I3yUcpJVPAxNwj60z3q52BYyLHsW70L+ZWvsx8ZDdHhH+h8EcDEHIDl6j8nglDws8iMW8FQsTUaWDjSX0ylVQCqjT9pQHTE0EdExamv9i/luGFwVeH99E2APK05vTuvOIy+mbPHbwWwkLdDayqNZ0QRM5/riNSi0blO5wRwOD8bJ+uXlAHljnkl/AKw0hMuPs1ANtcuZryaPIIjCG0srQ8xYy+7l6T82hLx9jGHMOJ4YTvCMWCz/E/4cxpFlpNljrifYQQbkixI4an2p2uEK2b0n1NcLxcHb36AugNCTUngxR2FdX3faqGMVzgrnOb1HDgdBwU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b27a0aa0-8521-4dbc-fa60-08da627ace5d X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2022 13:48:01.7112 (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: PAXPR01MB9052 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/pcm-dvdenc: Fix encoding 24bit samples 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: QHlkzOjK6Ol9 The earlier code ignored the lower 16 bits and instead used the highest 8 bits twice. Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm-dvdenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index c7f1d46ba3..0881697c17 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -146,8 +146,8 @@ static int pcm_dvd_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, for (int i = 2; i; i--) { bytestream2_put_be16(&pb, src32[0] >> 16); bytestream2_put_be16(&pb, src32[1] >> 16); - bytestream2_put_byte(&pb, (*src32++) >> 24); - bytestream2_put_byte(&pb, (*src32++) >> 24); + bytestream2_put_byte(&pb, (uint8_t)((*src32++) >> 8)); + bytestream2_put_byte(&pb, (uint8_t)((*src32++) >> 8)); } } while (--blocks); } else { @@ -157,10 +157,10 @@ static int pcm_dvd_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, bytestream2_put_be16(&pb, src32[1] >> 16); bytestream2_put_be16(&pb, src32[2] >> 16); bytestream2_put_be16(&pb, src32[3] >> 16); - bytestream2_put_byte(&pb, (*src32++) >> 24); - bytestream2_put_byte(&pb, (*src32++) >> 24); - bytestream2_put_byte(&pb, (*src32++) >> 24); - bytestream2_put_byte(&pb, (*src32++) >> 24); + bytestream2_put_byte(&pb, (uint8_t)((*src32++) >> 8)); + bytestream2_put_byte(&pb, (uint8_t)((*src32++) >> 8)); + bytestream2_put_byte(&pb, (uint8_t)((*src32++) >> 8)); + bytestream2_put_byte(&pb, (uint8_t)((*src32++) >> 8)); } } while (--blocks); } From patchwork Sun Jul 10 13:45:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp807175pzb; Sun, 10 Jul 2022 06:48:23 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tOL9fuLvCXjpm+rIVU8TnFDm0HM+rTR4iGjx8el72/P0ACmTaDwgHQH94SuTsIX6sASdCM X-Received: by 2002:a05:6402:7da:b0:43a:6fe3:b7a9 with SMTP id u26-20020a05640207da00b0043a6fe3b7a9mr18221272edy.410.1657460903294; Sun, 10 Jul 2022 06:48:23 -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 ee43-20020a056402292b00b0043a71bf3999si5718742edb.57.2022.07.10.06.48.22; Sun, 10 Jul 2022 06:48:23 -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=uZqpmHSS; 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 E724A68B990; Sun, 10 Jul 2022 16:48:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073017.outbound.protection.outlook.com [40.92.73.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C32EC68B6E1 for ; Sun, 10 Jul 2022 16:48:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P14Lhj0FdGv36Utwpyk52njD9Ir0iu4PVJEBl76++/U9NfU6amyhU1PBc9QeE0j1UNb2ZPe0n2VBXQZJ8AYPCb3M2nUmjVD7tKo6nHY+sEADnBgW1wlumaYgnWI8YneZPiN5saTM7ZS6wJlJyKnnjp7iXGQv4hAN88qMT5rxA5bL/5QShgm7DRso8GhN80QD19caX0fLt7inRPIZYxexSBwnqyizU0Qbp3EZyPrD5PxhfzxZzMna73Y+dQnNhramGAh5WXuKIlXbc3uBfbTxrjGVN+z9HcfRcr0rurdmuqVkZX13GxTBJy3XGgmlpgZgtFC1nnu0C4RI/uxq6Zfq8A== 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=+jqSqwado4KWVVdNLCm/iYBlWW5obHyWsHhKScTgBF4=; b=RNdZfzXIUDcCTrizKl84qpyjsBL6VttvTn47izc3CMyCV+RRTHLNzHeE/+7JwvXN6OBhpzEwbybl/u1ALFj1Hnb9r6GY5CcadhxSIltX9uDmVjZEbZLERSsosdGvxo57IvPyXX/NzgI01IjreJKRucxX/Tkdz/Yqf/RrM8jY0TkUVv5PFkkKc3N+q7GZqoYLpKKP7dkZxsUxgG0f/AkQxSJqtgjz4Xk/q+2hWLsTDKlKG4Cqpt0yBqDfks07dyhOiBQjRi0NyevrP78iJ+9ddNzQTmcljqr5CUBnTQskEP/JsTlTRb77xmTM1EF/DRswqejYt1KQYKLS1GbrkqCpbw== 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=+jqSqwado4KWVVdNLCm/iYBlWW5obHyWsHhKScTgBF4=; b=uZqpmHSSkHx3WX6V9MEe+wkqn57WPJiXeRcjnwUm0GNBVvx/TdQqOQNyFlOAyLp5747LagU+rAwH0Ewk4ZoQFwS2eW0qERkFNeO4+uf6Wpr3pPNXNnTf3xQDpVCVEPeCjIyHKHLTvQu677KWWr3zu3c+3BUeSpE9MGX1ECzYoH5wAbeey94GupjrsXgPvLiNfeQ3MXOe5MlAE040+f1Gx2eraklas34Knp1xH9tULbHDwQx03U5VbOeubAUFEw36Kmn16vkzMKJhtkTmOKHqNnxZn+L78tppcnDhuv6l5uLhWjRKEaf/YVLHQ9iHEkPW4VqkYqxkLwOSDDRYuNHh8g== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB9052.eurprd01.prod.exchangelabs.com (2603:10a6:102:2b2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.25; Sun, 10 Jul 2022 13:48:04 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.025; Sun, 10 Jul 2022 13:48:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Jul 2022 15:45:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [47U2xe1W2S7pYAhLiV63Db+RneupDpg6] X-ClientProxiedBy: AM5PR0601CA0035.eurprd06.prod.outlook.com (2603:10a6:203:68::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220710134557.2677483-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5688a7e-2f6c-459d-0960-08da627acfd9 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd/SexwgAHrvehsouJn90RbVYbbEnQ/NTWXY8NRhbt/RrB9JlZr4GW8Cc0nmc4BAzinAv/om4PdK/nb0MYX6P1nWFHjnNBCp6hOy45aoyJ0Iwslpuhr3j40q2hDQh+tR832bQTJAApntHLVhVPDjFAkl7IxE+iuLgFcxUGl500LAD4DIDjYMpiyMcrMi6q9htKDk8bIelaZwVIYvaqOyo2XAn9Yu9UNDWlKg8EbWCciG46EJlFHz3egGUjt6H0S1WfUqc2gfxVkBcPFITtNwGLKmbla/XN/hWVYQPvnkWxbMcYuATyqA2btswPIPe3f2n3h4tCUkI3+Z9dUbHnOpc2pgpPKySpe5/FsP82xnBMyGaUkNaP4YowVTMCqlM9aIqEwXBWWm2NkdjhYshSlpNfBf4uWr1cuA0q2ui6MtvzGe6DV5dP+Cs+Q6MBgCrxuqeT+1+ZIWrMOrmN1IsDAawih9VTRUK1Zavj2EblrvsbUh9dsm5uXp12wigTRP61+/mKAzNewdDjg/yQJ/150gZPVJ/mgEiO0Ihhs+YCrEgbqg238YMAt929JBZU561fIT5HJYfSA9Sn2m6OepmCjRRAzoiSNUsPSDmWnnpNlGvYD9glNzJGbXPRmea6jtPvxdAsOZw788W9Ek1HVqLYVcq+1k8CuZXJ1DgsFGHukDPpqtTvaSWvJmMhrGgiyTbOhcEluISRw96CHtF9Re0NauhLorI3C0hE4fRPgGRpOrRHUXzLhIlTuMCcBS9U8GyDnUNEh3JgYdjE4M1JaeeILA3ZvLHoUVeuvoV9H3SfMG8psb0TdADgQZ833L X-MS-TrafficTypeDiagnostic: PAXPR01MB9052:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OXe4tHVAie/JZEdSkfkJyZW4ias1EvVsIqnalzxE8OK/3+RLl6CONRn8c2yK/l1jMATEObEkq7BiwI940BcrSWYNC7KqQFfeOvQ/616zvSC9Ue6fDJa2xKjlcL5Xivbt7X3Avp1/4x0/yZIdlxC/m8CdTIcKRgojxxClQZZbOfJAiRIfXrDWHOUlhQ5KiySIokT6/NU8OSKUpXx/e6QCtnj0Gqedn6XM30AsXWB7EeMeXkrwgZcR2dok4KUIn8znjU5qcsglp7CKHJKL+3MW4q/+0lN8yAG081Aw3aj4fk886l0sMSeHpwiIuM9R7yWs8xtYf9kngEKFn/cCUZCFnOuB/4nj17hL5F9WMDNtIPms7n//2RtQ6OJ+/0HDOc71f1+HihdrKHvPZaRjP1c9Bj4r00b3pT4kwS7NDciP1udBq5GUbXyex7a1LENeULG4138Q9tHARjkyV8/aHC9vXmD0CoMf0Wuy/lYRKAxi6DB6Jm5eDq7OR1Tn6PguyAoW80tJTO8yKBO2Q4GLFdlBsIVcjbXcJSojEVCrgiP2TALejF7t8GZZWpP/G/wxWILBb3/6QReWbEZxZpDTuMM4n7uPsSaQWNYUoT6VIpt9bFFJBCgLU/mOmapGpsRiMIodobyUz0TgyDqLoNuHBMIf11w+aNvIQU/TcvQDshfTgx+NYvNJ2sIJxn/dEGFKy22XljRbnmLfOAoM7whUJLCzDw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: v2XPkn07AOc8QgoSpS8+SO89jdSMUXeBecqhkFo0R69929wBeUNDI9LO8Zse/yCPbAs5JsyDVOSt+4YyRT+evTn1z/wFVa5weAmcLJSFKpt0Pjw4db6cPkngn9KNcmp2S/BzKQq/Ps25uqqwS3sa5wVcRvEeBnYU8Fw5i0a3qAqVt7ehklxNL13woDG1nC02ZRT4M99QLc9v499NaArKw2ugcrX+S+JS2lSqjOV/tHLx+PPfEGl7wJXHpfZ1rPNKpZ0A0ks5UrrqRSgQrXP0b7p2KOlpVOaQlcGkwbUQ9QzmhCiyACaEOgeXBNlaLDWJthRqR9wp4IAWjsTcFMzlbQMxt3QKmb5MAF9vj/y3qFpRLCk5L7B/nVZSTlEffCqDIxxiGxgKkMQAPawJFT6P359UR8E6Dtbo0toB6GimwgSRvLUsOo2L9Itld7EXZvOW8bS5UQ+6HaJhuCZZiep1yvG3Yj9+eO2RBemS7G/0aWzgIexQsK5G9sa5hqOLy/PBCxsQ/oe/RDMRnnfDr3F3eQxQPnWNgx6qvIqF/7kSlBH2JeDzqK39CzlrmklfTipWEpGEpwR8vevKxnMQDn3SWwcvErzmrp5lzmWgjj4XpiRYrjGY9nVLtKRTJWEhueuGE3byrL/vYl0JdNsYPH8BmsW19ACjHVkC/6GhgGYNNFCcVeA6MhWF9rE3TBFpBqGEZI6jXX0I+UM+JoMjHpLq4yYMDThkMfXY1Us7NjIkER3IBl6gCY/6ZcKCiGqppRPYY7iG8WrGFcpC8wpQ+4T3KUCYftVmphkLqY1g7MncM6oyIDTBdjXuDiJQ4EWrdj5CIAw2DVOPbwLTOJZpMv320uI4dmF1G7vKsAFe9qn46VElF6BGQwNPhgr1BHD8/tdovjgMDARG0OgILeA8aPMmWvL0LxznMRS6Ll7qNvOsE3Lo7AvsDtN9a+IxgxVvHa5rcvOtbOzAqlb1PfAsXBDeBY92Pfhe11Mr4aFwcAFh4TwBE1oEw7CGvZlUBCuYx45W1o0XnFHdpUPv5YL9KGfOSNn/Fd9bKD0Ucl0c/hsinZnOtAZI7jc4Dr0Y0w/P+BSz7YWGAccNklqvBDubHaNn3qwB2lyWcSo/A7LKfSLOA310toux06FQUo3js6XFXbl/VTorr7zndBf8sSS7yuRL9hJ+hqB8s/4YhQAYDZbbQgkyzY14zv2zkAana3NNzloCmSpqdbLPHkcWj5YoHrRIOK/3f7t1bdvNPWoGHzXKTwh+pGn7xqPMXQLRX9g+SkY2Zc56O/1bQgB5zoToqLlL8RKNRjhfvkPxac1PX4j5yV8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5688a7e-2f6c-459d-0960-08da627acfd9 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2022 13:48:04.2267 (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: PAXPR01MB9052 Subject: [FFmpeg-devel] [PATCH 3/3] fate/pcm: Add pcm_dvd transcode 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: ZbVl4Ee4mEwC Signed-off-by: Andreas Rheinhardt --- I could also move these tests to a file of their own if desired. tests/fate/pcm.mak | 31 ++++++++++ tests/ref/fate/pcm_dvd-16-1-48000 | 11 ++++ tests/ref/fate/pcm_dvd-16-1-96000 | 26 ++++++++ tests/ref/fate/pcm_dvd-16-2-48000 | 26 ++++++++ tests/ref/fate/pcm_dvd-16-5.1-48000 | 65 ++++++++++++++++++++ tests/ref/fate/pcm_dvd-16-5.1-96000 | 51 ++++++++++++++++ tests/ref/fate/pcm_dvd-16-7.1-48000 | 69 +++++++++++++++++++++ tests/ref/fate/pcm_dvd-24-1-48000 | 59 ++++++++++++++++++ tests/ref/fate/pcm_dvd-24-2-48000 | 36 +++++++++++ tests/ref/fate/pcm_dvd-24-5.1-48000 | 94 +++++++++++++++++++++++++++++ tests/ref/fate/pcm_dvd-24-7.1-48000 | 69 +++++++++++++++++++++ 11 files changed, 537 insertions(+) create mode 100644 tests/ref/fate/pcm_dvd-16-1-48000 create mode 100644 tests/ref/fate/pcm_dvd-16-1-96000 create mode 100644 tests/ref/fate/pcm_dvd-16-2-48000 create mode 100644 tests/ref/fate/pcm_dvd-16-5.1-48000 create mode 100644 tests/ref/fate/pcm_dvd-16-5.1-96000 create mode 100644 tests/ref/fate/pcm_dvd-16-7.1-48000 create mode 100644 tests/ref/fate/pcm_dvd-24-1-48000 create mode 100644 tests/ref/fate/pcm_dvd-24-2-48000 create mode 100644 tests/ref/fate/pcm_dvd-24-5.1-48000 create mode 100644 tests/ref/fate/pcm_dvd-24-7.1-48000 diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index e3e2674034..4e79fc7c41 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -27,6 +27,37 @@ fate-dcinema-encode: tests/data/asynth-96000-6.wav fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav fate-dcinema-encode: CMD = enc_dec_pcm daud framemd5 s16le $(SRC) -c:a pcm_s24daud -frames:a 20 +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, TRUEHD_DEMUXER TRUEHD_DECODER PCM_S24LE_ENCODER) += fate-pcm_dvd-24-7.1-48000 +fate-pcm_dvd-24-7.1-48000: CMD = transcode truehd $(TARGET_SAMPLES)/truehd/atmos.thd vob "-c:a pcm_dvd" "-c:a pcm_s24le" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, MXF_DEMUXER PCM_S16LE_DECODER) += fate-pcm_dvd-16-7.1-48000 +fate-pcm_dvd-16-7.1-48000: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Sony-00001.mxf vob "-map 0:a -c:a pcm_dvd" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, DAUD_DEMUXER PCM_S24DAUD_DECODER) += fate-pcm_dvd-16-5.1-96000 +fate-pcm_dvd-16-5.1-96000: CMD = transcode daud $(TARGET_SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 vob "-c:a pcm_dvd" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, TRUEHD_DEMUXER TRUEHD_DECODER PCM_S24LE_ENCODER) += fate-pcm_dvd-24-5.1-48000 +fate-pcm_dvd-24-5.1-48000: CMD = transcode truehd $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw vob "-c:a pcm_dvd" "-c:a pcm_s24le -t 0.2" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, MATROSKA_DEMUXER FLAC_DECODER) += fate-pcm_dvd-16-5.1-48000 +fate-pcm_dvd-16-5.1-48000: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/flac_channel_layouts.mka vob "-map 0:a:1 -c:a pcm_dvd" "-t 0.2" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, FLAC_DEMUXER FLAC_PARSER FLAC_DECODER PCM_S24LE_ENCODER) += fate-pcm_dvd-24-2-48000 +fate-pcm_dvd-24-2-48000: CMD = transcode flac $(TARGET_SAMPLES)/filter/seq-3341-7_seq-3342-5-24bit.flac vob "-c:a pcm_dvd" "-c:a pcm_s24le -t 0.2" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, WAV_DEMUXER PCM_S16LE_DECODER) += fate-pcm_dvd-16-2-48000 +fate-pcm_dvd-16-2-48000: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav vob "-c:a pcm_dvd" "-t 0.2" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, MXF_DEMUXER PCM_S24LE_DECODER PCM_S24LE_ENCODER) += fate-pcm_dvd-24-1-48000 +fate-pcm_dvd-24-1-48000: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/omneon_8.3.0.0_xdcam_startc_footer.mxf vob "-map 0:a:0 -c:a pcm_dvd" "-c:a pcm_s24le" + +FATE_SAMPLES_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, MXF_DEMUXER PCM_S16LE_DECODER) += fate-pcm_dvd-16-1-48000 +fate-pcm_dvd-16-1-48000: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/opatom_missing_index.mxf vob "-c:a pcm_dvd" + +FATE_PCM-$(call TRANSCODE, PCM_DVD, MPEG2VOB MPEGPS, WAV_DEMUXER PCM_S16LE_DECODER) += fate-pcm_dvd-16-1-96000 +fate-pcm_dvd-16-1-96000: tests/data/asynth-96000-1.wav +fate-pcm_dvd-16-1-96000: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-96000-1.wav vob "-c:a pcm_dvd" "-t 0.2" + FATE_FFMPEG += $(FATE_PCM-yes) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes) fate-pcm: $(FATE_PCM-yes) $(FATE_SAMPLES_PCM-yes) diff --git a/tests/ref/fate/pcm_dvd-16-1-48000 b/tests/ref/fate/pcm_dvd-16-1-48000 new file mode 100644 index 0000000000..29f4e84d50 --- /dev/null +++ b/tests/ref/fate/pcm_dvd-16-1-48000 @@ -0,0 +1,11 @@ +af7b5ae365019ec64a9397bc6b33e18c *tests/data/fate/pcm_dvd-16-1-48000.vob +8192 tests/data/fate/pcm_dvd-16-1-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 48000 +#channel_layout_name 0: mono +0, 0, 0, 997, 1994, 0xd416def5 +0, 1004, 1004, 1006, 2012, 0xb492d66d +0, 2008, 2008, 1006, 2012, 0x52d3f72e +0, 3012, 3012, 995, 1990, 0xa23de22f diff --git a/tests/ref/fate/pcm_dvd-16-1-96000 b/tests/ref/fate/pcm_dvd-16-1-96000 new file mode 100644 index 0000000000..56f3ae7032 --- /dev/null +++ b/tests/ref/fate/pcm_dvd-16-1-96000 @@ -0,0 +1,26 @@ +2807776bfcb2eddd315d2b0675afc445 *tests/data/fate/pcm_dvd-16-1-96000.vob +1173504 tests/data/fate/pcm_dvd-16-1-96000.vob +#tb 0: 1/96000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 96000 +#channel_layout_name 0: mono +0, 0, 0, 997, 1994, 0xa58fdef0 +0, 1004, 1004, 1006, 2012, 0xb634eec3 +0, 2010, 2010, 1006, 2012, 0x8371e23d +0, 3012, 3012, 1006, 2012, 0x8cecf569 +0, 4017, 4017, 1006, 2012, 0xc990d62c +0, 6025, 6025, 1006, 2012, 0xf678fc74 +0, 7029, 7029, 1006, 2012, 0x78f8dde4 +0, 8033, 8033, 1006, 2012, 0x1d67ecc0 +0, 9037, 9037, 1006, 2012, 0xa520e618 +0, 10042, 10042, 1006, 2012, 0x83f2f584 +0, 11044, 11044, 1006, 2012, 0x08e6dee5 +0, 12049, 12049, 1006, 2012, 0x28d8f24f +0, 13053, 13053, 1006, 2012, 0x68b2ed35 +0, 14058, 14058, 1006, 2012, 0x3aeee8f8 +0, 15060, 15060, 1006, 2012, 0x76a2eb0a +0, 16065, 16065, 1006, 2012, 0x713eea12 +0, 17069, 17069, 1006, 2012, 0x9992ebc8 +0, 18074, 18074, 1006, 2012, 0x847fe12e +0, 19076, 19076, 124, 248, 0x2c4b88bc diff --git a/tests/ref/fate/pcm_dvd-16-2-48000 b/tests/ref/fate/pcm_dvd-16-2-48000 new file mode 100644 index 0000000000..7629973ef4 --- /dev/null +++ b/tests/ref/fate/pcm_dvd-16-2-48000 @@ -0,0 +1,26 @@ +42ba1c4170f9fd6e98af29151f4cedb0 *tests/data/fate/pcm_dvd-16-2-48000.vob +2502656 tests/data/fate/pcm_dvd-16-2-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 48000 +#channel_layout_name 0: stereo +0, 0, 0, 498, 1992, 0x60a8f5dd +0, 502, 502, 503, 2012, 0x685028f8 +0, 1004, 1004, 503, 2012, 0x567d0e82 +0, 1506, 1506, 503, 2012, 0x0f7240cd +0, 2008, 2008, 503, 2012, 0x61a87973 +0, 2510, 2510, 503, 2012, 0x9cdc5ce4 +0, 3514, 3514, 503, 2012, 0x6772d774 +0, 4016, 4016, 503, 2012, 0x56b0d501 +0, 4518, 4518, 503, 2012, 0xb98154d3 +0, 5020, 5020, 503, 2012, 0xc4d8035c +0, 5522, 5522, 503, 2012, 0x6af47ddd +0, 6024, 6024, 503, 2012, 0xb3dddfd4 +0, 6526, 6526, 503, 2012, 0x33354177 +0, 7028, 7028, 503, 2012, 0x6eabf85f +0, 7530, 7530, 503, 2012, 0x22e78b8d +0, 8032, 8032, 503, 2012, 0x64011afb +0, 8534, 8534, 503, 2012, 0x96e079c7 +0, 9036, 9036, 503, 2012, 0x68419738 +0, 9538, 9538, 62, 248, 0x6401374a diff --git a/tests/ref/fate/pcm_dvd-16-5.1-48000 b/tests/ref/fate/pcm_dvd-16-5.1-48000 new file mode 100644 index 0000000000..47d098b48e --- /dev/null +++ b/tests/ref/fate/pcm_dvd-16-5.1-48000 @@ -0,0 +1,65 @@ +76b784964f1f13e34ff9288e327f1327 *tests/data/fate/pcm_dvd-16-5.1-48000.vob +591872 tests/data/fate/pcm_dvd-16-5.1-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 48000 +#channel_layout_name 0: 5.1 +0, 0, 0, 166, 1992, 0x00000000 +0, 167, 167, 167, 2004, 0x00000000 +0, 334, 334, 167, 2004, 0x00000000 +0, 501, 501, 167, 2004, 0x00000000 +0, 668, 668, 167, 2004, 0x00000000 +0, 835, 835, 167, 2004, 0x00000000 +0, 1002, 1002, 167, 2004, 0x00000000 +0, 1169, 1169, 167, 2004, 0x00000000 +0, 1336, 1336, 167, 2004, 0x00000000 +0, 1503, 1503, 167, 2004, 0x00000000 +0, 1670, 1670, 167, 2004, 0x00000000 +0, 1837, 1837, 167, 2004, 0x00000000 +0, 2004, 2004, 167, 2004, 0x00000000 +0, 2171, 2171, 167, 2004, 0x00000000 +0, 2338, 2338, 167, 2004, 0x00000000 +0, 2505, 2505, 167, 2004, 0x00000000 +0, 2672, 2672, 167, 2004, 0x00000000 +0, 2839, 2839, 167, 2004, 0x00000000 +0, 3006, 3006, 167, 2004, 0x00000000 +0, 3173, 3173, 167, 2004, 0x00000000 +0, 3340, 3340, 167, 2004, 0x00000000 +0, 3507, 3507, 167, 2004, 0x00000000 +0, 3674, 3674, 167, 2004, 0x00000000 +0, 3841, 3841, 167, 2004, 0x00000000 +0, 4008, 4008, 167, 2004, 0x00000000 +0, 4175, 4175, 167, 2004, 0x00000000 +0, 4342, 4342, 167, 2004, 0x00000000 +0, 4509, 4509, 167, 2004, 0x00000000 +0, 4676, 4676, 167, 2004, 0x00000000 +0, 4843, 4843, 167, 2004, 0x00000000 +0, 5010, 5010, 167, 2004, 0x00000000 +0, 5177, 5177, 167, 2004, 0x00000000 +0, 5344, 5344, 167, 2004, 0x00000000 +0, 5511, 5511, 167, 2004, 0x00000000 +0, 5678, 5678, 167, 2004, 0x00000000 +0, 5845, 5845, 167, 2004, 0x00000000 +0, 6012, 6012, 167, 2004, 0x00000000 +0, 6179, 6179, 167, 2004, 0x00000000 +0, 6346, 6346, 167, 2004, 0x00000000 +0, 6513, 6513, 167, 2004, 0x00000000 +0, 6680, 6680, 166, 1992, 0x00000000 +0, 6847, 6847, 167, 2004, 0x00000000 +0, 7014, 7014, 167, 2004, 0x00000000 +0, 7181, 7181, 167, 2004, 0x00000000 +0, 7348, 7348, 167, 2004, 0x00000000 +0, 7515, 7515, 167, 2004, 0x00000000 +0, 7682, 7682, 167, 2004, 0x00000000 +0, 7849, 7849, 167, 2004, 0x00000000 +0, 8016, 8016, 167, 2004, 0x00000000 +0, 8183, 8183, 167, 2004, 0x00000000 +0, 8349, 8349, 167, 2004, 0x00000000 +0, 8516, 8516, 167, 2004, 0x00000000 +0, 8683, 8683, 167, 2004, 0x00000000 +0, 8850, 8850, 167, 2004, 0x00000000 +0, 9017, 9017, 167, 2004, 0x00000000 +0, 9184, 9184, 167, 2004, 0x00000000 +0, 9351, 9351, 167, 2004, 0x00000000 +0, 9518, 9518, 82, 984, 0x00000000 diff --git a/tests/ref/fate/pcm_dvd-16-5.1-96000 b/tests/ref/fate/pcm_dvd-16-5.1-96000 new file mode 100644 index 0000000000..64447a9aa5 --- /dev/null +++ b/tests/ref/fate/pcm_dvd-16-5.1-96000 @@ -0,0 +1,51 @@ +d8e182dfa46524c28d1f78a4cc1f2719 *tests/data/fate/pcm_dvd-16-5.1-96000.vob +90112 tests/data/fate/pcm_dvd-16-5.1-96000.vob +#tb 0: 1/96000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 96000 +#channel_layout_name 0: 5.1 +0, 0, 0, 166, 1992, 0x00000000 +0, 167, 167, 167, 2004, 0x00000000 +0, 334, 334, 167, 2004, 0x00000000 +0, 501, 501, 167, 2004, 0x00000000 +0, 668, 668, 167, 2004, 0x00000000 +0, 835, 835, 167, 2004, 0x00000000 +0, 1002, 1002, 167, 2004, 0x00000000 +0, 1169, 1169, 167, 2004, 0x00000000 +0, 1337, 1337, 167, 2004, 0x00000000 +0, 1503, 1503, 167, 2004, 0x00000000 +0, 1670, 1670, 167, 2004, 0x00000000 +0, 1837, 1837, 167, 2004, 0x00000000 +0, 2004, 2004, 167, 2004, 0x00000000 +0, 2171, 2171, 167, 2004, 0x00000000 +0, 2338, 2338, 167, 2004, 0x00000000 +0, 2505, 2505, 167, 2004, 0x00000000 +0, 2672, 2672, 167, 2004, 0x00000000 +0, 2839, 2839, 167, 2004, 0x00000000 +0, 3006, 3006, 167, 2004, 0x00000000 +0, 3173, 3173, 167, 2004, 0x00000000 +0, 3340, 3340, 167, 2004, 0x00000000 +0, 3507, 3507, 167, 2004, 0x00000000 +0, 3674, 3674, 167, 2004, 0x00000000 +0, 3841, 3841, 167, 2004, 0x00000000 +0, 4009, 4009, 167, 2004, 0x00000000 +0, 4175, 4175, 167, 2004, 0x00000000 +0, 4342, 4342, 167, 2004, 0x00000000 +0, 4509, 4509, 167, 2004, 0x00000000 +0, 4676, 4676, 167, 2004, 0x00000000 +0, 4843, 4843, 167, 2004, 0x00000000 +0, 5010, 5010, 167, 2004, 0x00000000 +0, 5177, 5177, 167, 2004, 0x00000000 +0, 5344, 5344, 167, 2004, 0x00000000 +0, 5511, 5511, 167, 2004, 0x00000000 +0, 5678, 5678, 167, 2004, 0x00000000 +0, 5845, 5845, 167, 2004, 0x00000000 +0, 6012, 6012, 167, 2004, 0x00000000 +0, 6179, 6179, 167, 2004, 0x00000000 +0, 6346, 6346, 167, 2004, 0x00000000 +0, 6513, 6513, 167, 2004, 0x00000000 +0, 6681, 6681, 166, 1992, 0x00000000 +0, 6847, 6847, 167, 2004, 0x00000000 +0, 7014, 7014, 167, 2004, 0x00000000 +0, 7181, 7181, 101, 1212, 0x00000000 diff --git a/tests/ref/fate/pcm_dvd-16-7.1-48000 b/tests/ref/fate/pcm_dvd-16-7.1-48000 new file mode 100644 index 0000000000..dc7ff3e6e4 --- /dev/null +++ b/tests/ref/fate/pcm_dvd-16-7.1-48000 @@ -0,0 +1,69 @@ +2644ceac530c074d638cc087f2045251 *tests/data/fate/pcm_dvd-16-7.1-48000.vob +126976 tests/data/fate/pcm_dvd-16-7.1-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 48000 +#channel_layout_name 0: 7.1 +0, 0, 0, 124, 1984, 0x9d57fb8d +0, 125, 125, 125, 2000, 0x5d98ca5b +0, 250, 250, 125, 2000, 0xcf47f872 +0, 375, 375, 125, 2000, 0xd0b9c223 +0, 500, 500, 125, 2000, 0xf929e0e2 +0, 625, 625, 125, 2000, 0xc893f22c +0, 750, 750, 125, 2000, 0x8843fafa +0, 875, 875, 125, 2000, 0xb7e30a8e +0, 1000, 1000, 125, 2000, 0xe4fddc6b +0, 1125, 1125, 125, 2000, 0x5bd70b66 +0, 1250, 1250, 125, 2000, 0x9252e2e8 +0, 1375, 1375, 125, 2000, 0x1baaff6a +0, 1500, 1500, 125, 2000, 0xd363b522 +0, 1625, 1625, 125, 2000, 0xfafe00a4 +0, 1750, 1750, 125, 2000, 0x0980dc2c +0, 1875, 1875, 125, 2000, 0xb0e5128c +0, 2000, 2000, 125, 2000, 0xd8a0ddc5 +0, 2125, 2125, 125, 2000, 0xffb8e1b4 +0, 2250, 2250, 125, 2000, 0x1842ea9a +0, 2375, 2375, 125, 2000, 0x35c6e4d3 +0, 2500, 2500, 125, 2000, 0xa245009c +0, 2625, 2625, 125, 2000, 0x7daef475 +0, 2750, 2750, 125, 2000, 0x85d4fe0b +0, 2875, 2875, 125, 2000, 0x2000ec85 +0, 3000, 3000, 125, 2000, 0x56c9d7a0 +0, 3125, 3125, 125, 2000, 0x8edae018 +0, 3250, 3250, 125, 2000, 0x5345ec09 +0, 3375, 3375, 125, 2000, 0xe888ee0d +0, 3500, 3500, 125, 2000, 0xa8c10d13 +0, 3625, 3625, 125, 2000, 0x4089fd76 +0, 3750, 3750, 125, 2000, 0xf3371321 +0, 3875, 3875, 125, 2000, 0x50450212 +0, 4000, 4000, 125, 2000, 0x75eef816 +0, 4125, 4125, 125, 2000, 0xfd94ea7b +0, 4250, 4250, 125, 2000, 0xd20ec50a +0, 4375, 4375, 125, 2000, 0x4f2c0871 +0, 4500, 4500, 125, 2000, 0x441deee4 +0, 4625, 4625, 125, 2000, 0xd94d0924 +0, 4750, 4750, 125, 2000, 0xe5d0c8e6 +0, 4875, 4875, 125, 2000, 0x0166dd90 +0, 5000, 5000, 124, 1984, 0x8d0ede76 +0, 5125, 5125, 125, 2000, 0xdf0edb96 +0, 5250, 5250, 125, 2000, 0xf53bf7db +0, 5375, 5375, 125, 2000, 0x8895ee37 +0, 5500, 5500, 125, 2000, 0xaac3f939 +0, 5625, 5625, 125, 2000, 0x6ca311ed +0, 5750, 5750, 125, 2000, 0x7311d6c3 +0, 5875, 5875, 125, 2000, 0x3facdca1 +0, 6000, 6000, 125, 2000, 0xbfa9f8cb +0, 6125, 6125, 125, 2000, 0x1ef8cbd5 +0, 6250, 6250, 125, 2000, 0x835ff155 +0, 6375, 6375, 125, 2000, 0x76bd08d9 +0, 6500, 6500, 125, 2000, 0xe363d4b1 +0, 6625, 6625, 125, 2000, 0x7d22efc6 +0, 6750, 6750, 125, 2000, 0x6796cd13 +0, 6875, 6875, 125, 2000, 0x7255e228 +0, 7000, 7000, 125, 2000, 0x68fbe3f5 +0, 7125, 7125, 125, 2000, 0x901ffed7 +0, 7250, 7250, 125, 2000, 0xe9bbe07e +0, 7375, 7375, 125, 2000, 0xe4850e2b +0, 7500, 7500, 125, 2000, 0xca99f73a +0, 7625, 7625, 57, 912, 0x82c3c85e diff --git a/tests/ref/fate/pcm_dvd-24-1-48000 b/tests/ref/fate/pcm_dvd-24-1-48000 new file mode 100644 index 0000000000..98f4dbcd9d --- /dev/null +++ b/tests/ref/fate/pcm_dvd-24-1-48000 @@ -0,0 +1,59 @@ +95a5e963bb6b654603089f3e17718b16 *tests/data/fate/pcm_dvd-24-1-48000.vob +106496 tests/data/fate/pcm_dvd-24-1-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s24le +#sample_rate 0: 48000 +#channel_layout_name 0: mono +0, 0, 0, 664, 1992, 0x722ccac0 +0, 672, 672, 668, 2004, 0x7a82f0db +0, 1344, 1344, 672, 2016, 0xe91cd0d1 +0, 2016, 2016, 668, 2004, 0x76fbb193 +0, 2688, 2688, 672, 2016, 0xc85bd904 +0, 3360, 3360, 668, 2004, 0x698219fa +0, 4032, 4032, 672, 2016, 0xe74cd175 +0, 4704, 4704, 668, 2004, 0x684bd409 +0, 5376, 5376, 672, 2016, 0xf497da15 +0, 6048, 6048, 668, 2004, 0x6166e1ea +0, 6720, 6720, 672, 2016, 0x3836159e +0, 7392, 7392, 668, 2004, 0x0827cfe5 +0, 8064, 8064, 672, 2016, 0x78150039 +0, 8736, 8736, 668, 2004, 0x28bcc323 +0, 9408, 9408, 672, 2016, 0x7123c17d +0, 10080, 10080, 668, 2004, 0xcbfeed6f +0, 10752, 10752, 672, 2016, 0x05d6128d +0, 11424, 11424, 668, 2004, 0xb4f1e9b9 +0, 12096, 12096, 672, 2016, 0xf83b0966 +0, 12768, 12768, 668, 2004, 0x71a9f220 +0, 13440, 13440, 672, 2016, 0x97b5fc85 +0, 14112, 14112, 668, 2004, 0xda97b165 +0, 14784, 14784, 672, 2016, 0x43c9cfcf +0, 15456, 15456, 668, 2004, 0x5d83e552 +0, 16128, 16128, 672, 2016, 0xe1bbc192 +0, 16800, 16800, 668, 2004, 0xdec9a0ba +0, 17472, 17472, 672, 2016, 0xcc01cd21 +0, 18144, 18144, 668, 2004, 0x73f99e51 +0, 18816, 18816, 672, 2016, 0x023ec896 +0, 19488, 19488, 668, 2004, 0x4d5cd720 +0, 20160, 20160, 672, 2016, 0x9af2bb31 +0, 20832, 20832, 668, 2004, 0xd2a3dac6 +0, 21504, 21504, 672, 2016, 0x02dbce4f +0, 22176, 22176, 668, 2004, 0xbba5f7e6 +0, 22848, 22848, 672, 2016, 0xfb5501c1 +0, 23520, 23520, 668, 2004, 0xe953ed65 +0, 24192, 24192, 672, 2016, 0x5c83d800 +0, 24864, 24864, 668, 2004, 0xabc0e62c +0, 25536, 25536, 672, 2016, 0xda8be7e0 +0, 26208, 26208, 668, 2004, 0x0acbc166 +0, 26880, 26880, 664, 1992, 0x46dddfa4 +0, 27552, 27552, 672, 2016, 0x9a33b4cc +0, 28224, 28224, 668, 2004, 0xda13d604 +0, 28896, 28896, 672, 2016, 0xe92dd4fb +0, 29568, 29568, 668, 2004, 0xedd2bcec +0, 30240, 30240, 672, 2016, 0x73afe253 +0, 30912, 30912, 668, 2004, 0x17eae64a +0, 31584, 31584, 672, 2016, 0x48b0f6c2 +0, 32256, 32256, 668, 2004, 0x4f72fb8d +0, 32928, 32928, 672, 2016, 0x3ad7dfdd +0, 33600, 33600, 668, 2004, 0x3e72ee51 +0, 34272, 34272, 404, 1212, 0x416c4aef diff --git a/tests/ref/fate/pcm_dvd-24-2-48000 b/tests/ref/fate/pcm_dvd-24-2-48000 new file mode 100644 index 0000000000..817cd934a5 --- /dev/null +++ b/tests/ref/fate/pcm_dvd-24-2-48000 @@ -0,0 +1,36 @@ +6fcd235f0c165f2c5f4431f9e0d60d28 *tests/data/fate/pcm_dvd-24-2-48000.vob +8218624 tests/data/fate/pcm_dvd-24-2-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s24le +#sample_rate 0: 48000 +#channel_layout_name 0: stereo +0, 0, 0, 332, 1992, 0x13af13b9 +0, 336, 336, 334, 2004, 0x178ac9be +0, 672, 672, 336, 2016, 0xc0c9266b +0, 1008, 1008, 334, 2004, 0x0266b229 +0, 1344, 1344, 336, 2016, 0xe821e124 +0, 1680, 1680, 334, 2004, 0xd7cedefd +0, 2016, 2016, 336, 2016, 0xb817b01c +0, 2352, 2352, 334, 2004, 0xd7a8e953 +0, 2688, 2688, 336, 2016, 0xc20cf5fa +0, 3024, 3024, 334, 2004, 0xe5ee903e +0, 3360, 3360, 336, 2016, 0xbe20ec1d +0, 3696, 3696, 334, 2004, 0x9708d462 +0, 4032, 4032, 336, 2016, 0x9e82f06c +0, 4368, 4368, 334, 2004, 0x5069d037 +0, 4704, 4704, 336, 2016, 0xcfb6effe +0, 5040, 5040, 334, 2004, 0xe13c128a +0, 5376, 5376, 336, 2016, 0x8564d28e +0, 5712, 5712, 334, 2004, 0x116dc5c0 +0, 6048, 6048, 336, 2016, 0xf0ca183b +0, 6384, 6384, 334, 2004, 0x39e5d580 +0, 6720, 6720, 336, 2016, 0xaacbf84e +0, 7056, 7056, 334, 2004, 0x50b7ed68 +0, 7392, 7392, 336, 2016, 0x83451550 +0, 7728, 7728, 334, 2004, 0x4523eebf +0, 8064, 8064, 336, 2016, 0x5781de58 +0, 8400, 8400, 334, 2004, 0x66f2e12a +0, 8736, 8736, 336, 2016, 0xdaebe5e0 +0, 9072, 9072, 334, 2004, 0x9b83d9df +0, 9408, 9408, 192, 1152, 0xdaf44e66 diff --git a/tests/ref/fate/pcm_dvd-24-5.1-48000 b/tests/ref/fate/pcm_dvd-24-5.1-48000 new file mode 100644 index 0000000000..361a2e5ec5 --- /dev/null +++ b/tests/ref/fate/pcm_dvd-24-5.1-48000 @@ -0,0 +1,94 @@ +131d92cc9349ab808cf60dd0c9ed8df6 *tests/data/fate/pcm_dvd-24-5.1-48000.vob +2519040 tests/data/fate/pcm_dvd-24-5.1-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s24le +#sample_rate 0: 48000 +#channel_layout_name 0: 5.1 +0, 0, 0, 108, 1944, 0xd474b1dc +0, 112, 112, 112, 2016, 0x7b1a40cc +0, 224, 224, 112, 2016, 0xa5be1eff +0, 336, 336, 108, 1944, 0x8e889bbf +0, 448, 448, 112, 2016, 0x64de154d +0, 560, 560, 112, 2016, 0xd0d98f35 +0, 672, 672, 112, 2016, 0xa607ff3b +0, 784, 784, 108, 1944, 0x3e32521e +0, 896, 896, 112, 2016, 0xc278e708 +0, 1008, 1008, 112, 2016, 0x6228e57a +0, 1120, 1120, 112, 2016, 0xa0fbd56d +0, 1232, 1232, 108, 1944, 0xefa5d55c +0, 1344, 1344, 112, 2016, 0x309900c8 +0, 1456, 1456, 112, 2016, 0x65d5154a +0, 1568, 1568, 112, 2016, 0x7a6777fd +0, 1680, 1680, 108, 1944, 0xeef5828c +0, 1792, 1792, 112, 2016, 0x05e2fe81 +0, 1904, 1904, 112, 2016, 0xaf4a5c67 +0, 2016, 2016, 112, 2016, 0xd881cccd +0, 2128, 2128, 108, 1944, 0xba7358a5 +0, 2240, 2240, 112, 2016, 0x0341f0d2 +0, 2352, 2352, 112, 2016, 0x0d5e2642 +0, 2464, 2464, 112, 2016, 0xc3442415 +0, 2576, 2576, 108, 1944, 0x04e23fa2 +0, 2688, 2688, 112, 2016, 0xbe5d297d +0, 2800, 2800, 112, 2016, 0x36bee2ef +0, 2912, 2912, 112, 2016, 0x5b1fa6bf +0, 2996, 2996, 108, 1944, 0x842993a2 +0, 3108, 3108, 112, 2016, 0xad60830b +0, 3220, 3220, 112, 2016, 0x59de6600 +0, 3332, 3332, 112, 2016, 0xbf6f32f0 +0, 3444, 3444, 108, 1944, 0x7a2d1b23 +0, 3556, 3556, 112, 2016, 0x05755245 +0, 3668, 3668, 112, 2016, 0x6f048e4b +0, 3780, 3780, 112, 2016, 0xbddb7141 +0, 3892, 3892, 108, 1944, 0x27f927c3 +0, 4004, 4004, 112, 2016, 0x1b72043a +0, 4116, 4116, 112, 2016, 0x8196613d +0, 4228, 4228, 112, 2016, 0x582803ae +0, 4340, 4340, 108, 1944, 0xe61b8fef +0, 4452, 4452, 112, 2016, 0xd6c793ac +0, 4564, 4564, 112, 2016, 0x9cd216a8 +0, 4676, 4676, 108, 1944, 0x0329923f +0, 4788, 4788, 112, 2016, 0x389e4741 +0, 4900, 4900, 112, 2016, 0x257b7c1c +0, 5012, 5012, 112, 2016, 0xbd6af710 +0, 5124, 5124, 108, 1944, 0x1b1a08cd +0, 5236, 5236, 112, 2016, 0x7c1c56ab +0, 5348, 5348, 112, 2016, 0x8dd343a2 +0, 5460, 5460, 112, 2016, 0xedef5b90 +0, 5572, 5572, 108, 1944, 0x1cb19fa5 +0, 5684, 5684, 112, 2016, 0x7262409f +0, 5796, 5796, 112, 2016, 0x39fb2f0c +0, 5908, 5908, 112, 2016, 0xfc2e6c94 +0, 5992, 5992, 108, 1944, 0x5ebd2dc3 +0, 6104, 6104, 112, 2016, 0x545aa3cf +0, 6216, 6216, 112, 2016, 0x2ccdb39d +0, 6328, 6328, 112, 2016, 0x1fd639a5 +0, 6440, 6440, 108, 1944, 0x0788a815 +0, 6552, 6552, 112, 2016, 0xe904c713 +0, 6664, 6664, 112, 2016, 0x2451eb77 +0, 6776, 6776, 112, 2016, 0x9cf3d1bf +0, 6888, 6888, 108, 1944, 0x25983223 +0, 7000, 7000, 112, 2016, 0x4e426817 +0, 7112, 7112, 112, 2016, 0x386fe97d +0, 7224, 7224, 112, 2016, 0x20ed0d8d +0, 7336, 7336, 108, 1944, 0xbc097653 +0, 7448, 7448, 112, 2016, 0x6211057e +0, 7560, 7560, 112, 2016, 0x0a0825f3 +0, 7672, 7672, 112, 2016, 0x377e6144 +0, 7784, 7784, 108, 1944, 0xd163ff87 +0, 7896, 7896, 112, 2016, 0xde483afa +0, 8008, 8008, 112, 2016, 0x8b80471f +0, 8120, 8120, 112, 2016, 0x35f27a6d +0, 8232, 8232, 108, 1944, 0xaa224460 +0, 8344, 8344, 112, 2016, 0xda986b7e +0, 8456, 8456, 112, 2016, 0xea5058a6 +0, 8568, 8568, 112, 2016, 0x74be6ed0 +0, 8680, 8680, 108, 1944, 0x0526c60e +0, 8792, 8792, 112, 2016, 0x953f6390 +0, 8904, 8904, 112, 2016, 0xc9cc0d3a +0, 8988, 8988, 108, 1944, 0xef0bc41e +0, 9100, 9100, 112, 2016, 0x2bcb9fff +0, 9212, 9212, 112, 2016, 0x21a51ee9 +0, 9324, 9324, 112, 2016, 0x6cd1f18b +0, 9436, 9436, 108, 1944, 0x40e849a9 +0, 9548, 9548, 52, 936, 0xd668ccc3 diff --git a/tests/ref/fate/pcm_dvd-24-7.1-48000 b/tests/ref/fate/pcm_dvd-24-7.1-48000 new file mode 100644 index 0000000000..89c9b43a5b --- /dev/null +++ b/tests/ref/fate/pcm_dvd-24-7.1-48000 @@ -0,0 +1,69 @@ +f3581bf0b1cf291662fc4e087b930c84 *tests/data/fate/pcm_dvd-24-7.1-48000.vob +126976 tests/data/fate/pcm_dvd-24-7.1-48000.vob +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s24le +#sample_rate 0: 48000 +#channel_layout_name 0: 7.1 +0, 0, 0, 83, 1992, 0x07f25ccf +0, 83, 83, 83, 1992, 0x820309d5 +0, 166, 166, 83, 1992, 0x4f0b1c4f +0, 249, 249, 83, 1992, 0xe6791628 +0, 332, 332, 83, 1992, 0xb498e297 +0, 415, 415, 83, 1992, 0xecb54408 +0, 498, 498, 83, 1992, 0xc9715746 +0, 581, 581, 83, 1992, 0x945481b0 +0, 664, 664, 83, 1992, 0xc3c9a8aa +0, 747, 747, 83, 1992, 0xd2f47523 +0, 830, 830, 83, 1992, 0x2814f450 +0, 913, 913, 83, 1992, 0x6085a1cb +0, 996, 996, 83, 1992, 0x625b2279 +0, 1079, 1079, 83, 1992, 0xc094f133 +0, 1162, 1162, 83, 1992, 0x14a3d1ec +0, 1245, 1245, 83, 1992, 0xfe5fb1c1 +0, 1328, 1328, 83, 1992, 0x84414c88 +0, 1411, 1411, 83, 1992, 0x2e054afe +0, 1494, 1494, 83, 1992, 0xae901ffe +0, 1577, 1577, 83, 1992, 0x2657fa0a +0, 1660, 1660, 83, 1992, 0x09504b60 +0, 1743, 1743, 83, 1992, 0xbae28d8d +0, 1826, 1826, 83, 1992, 0x51a2d108 +0, 1909, 1909, 83, 1992, 0x0d715388 +0, 1992, 1992, 83, 1992, 0x15ee40e6 +0, 2075, 2075, 83, 1992, 0xf9944d76 +0, 2158, 2158, 83, 1992, 0xf018f40e +0, 2241, 2241, 83, 1992, 0xc975e78d +0, 2324, 2324, 83, 1992, 0xf86b634d +0, 2407, 2407, 83, 1992, 0xd3ace8f0 +0, 2490, 2490, 83, 1992, 0xb7b3783d +0, 2573, 2573, 83, 1992, 0x31b996ae +0, 2656, 2656, 83, 1992, 0xcaa8b1d1 +0, 2739, 2739, 83, 1992, 0x9f7d068e +0, 2822, 2822, 83, 1992, 0x3d52215a +0, 2905, 2905, 83, 1992, 0xd9445472 +0, 2988, 2988, 83, 1992, 0xe20bf044 +0, 3071, 3071, 83, 1992, 0xf6d9a9ab +0, 3154, 3154, 83, 1992, 0xe9b1ca93 +0, 3237, 3237, 83, 1992, 0xf704e3ae +0, 3320, 3320, 83, 1992, 0xc765ad45 +0, 3403, 3403, 83, 1992, 0x2408aeb8 +0, 3486, 3486, 83, 1992, 0x7f151863 +0, 3569, 3569, 83, 1992, 0xd3c51b0a +0, 3652, 3652, 83, 1992, 0x2525f59a +0, 3735, 3735, 83, 1992, 0x2e5483a0 +0, 3818, 3818, 83, 1992, 0x20fba8da +0, 3901, 3901, 83, 1992, 0xc58094a4 +0, 3984, 3984, 83, 1992, 0xfc4c12d1 +0, 4067, 4067, 83, 1992, 0x8e9f4033 +0, 4150, 4150, 83, 1992, 0xd71ae1b1 +0, 4233, 4233, 83, 1992, 0x2b2c185d +0, 4316, 4316, 83, 1992, 0x1ae9c95c +0, 4399, 4399, 83, 1992, 0x1cca11d1 +0, 4482, 4482, 83, 1992, 0x4f5a930f +0, 4565, 4565, 83, 1992, 0xb1944352 +0, 4648, 4648, 83, 1992, 0x027ff599 +0, 4731, 4731, 83, 1992, 0x024a65de +0, 4814, 4814, 83, 1992, 0x06559979 +0, 4897, 4897, 83, 1992, 0x335591ad +0, 4980, 4980, 83, 1992, 0x29e3dfd2 +0, 5063, 5063, 57, 1368, 0xd8c3d35e