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); }