From patchwork Sat Apr 24 21:54:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2661528iob; Sat, 24 Apr 2021 14:55:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtHnsObbOSLuftT3e3M1NAEm+wgNHVNLdnYjubWRueBZLxm60TZRAqFDnbKimY3tDQ5kqJ X-Received: by 2002:a17:906:cb11:: with SMTP id lk17mr10774400ejb.517.1619301328818; Sat, 24 Apr 2021 14:55:28 -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 s23si9233991edc.25.2021.04.24.14.55.28; Sat, 24 Apr 2021 14:55:28 -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; 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=NONE dis=NONE) header.from=hotmail.co.uk Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A071F680BD5; Sun, 25 Apr 2021 00:55:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2056.outbound.protection.outlook.com [40.92.90.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6951B680825 for ; Sun, 25 Apr 2021 00:55:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g9YCVOvvOXXZHYKYHZzEroQyb7RwLK575Rv1Y4zmqJM5LH7Aqlc2XcEYWoC03xGPFI59Qi3uJq0tHg3p3fAU6NGkjkccxQgtIqTqvPoFdXvwQtK9cSR1aAeI0EctQuvJwrHIiSdQhCXFtwv59F5Bi+YJ/m7nXSCZMsr4HVPavziqeLxHQrh3wPKDNyJw1+D+gca+wTUDtfK5ZfiuXSAluC7TJfaa/30FTy/sISjG9CHC1FLD4HtHgZOtdpjfL4OoRv+bCJvP+4yiD1e0BCcbhIrMczy7QwPZxKLcZ78vlg/MhHyoghzVRjCqeUT5of4lmXUuGwFvwomdEB0PEAbbcw== 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-SenderADCheck; bh=v6pUr6Ue6u16bKX1j2AXAABRQAvHMhnkirAcmR5/iOM=; b=kgfrFptZ/YNM3uFAmROCaHxqsoScKDrhvyx8+iVxlAPLbIJvd7SvPs7LkAtd1gKToKw0T31uFvkaJ5G+zinG0qZmxZcFSpkJWkWrW8uxBw/FZxo8QsCPIFVuLToZ3cbYCqKrmsqE9T8dKTO1tIcAMScDJFf+1pJdOW8ZPwGzK1hooQ8GJTpbVzZPNM2UghYNpW9l3PLv2gtvJAPBzgenh+PisTWm6gNNGhC2F6EOe1H+RhsFcbL6yLwEyPLZDBZ1O1sg/D2entIgSLNQd70OcHZiEhu+YFnTwgYxt/LKBfx3EcMCOE5ZVIQvVxz8VKBwcH7MbJ/CnlH/r2Nd9NEYyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VI1EUR05FT059.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::46) by VI1EUR05HT109.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 21:55:16 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc12::40) by VI1EUR05FT059.mail.protection.outlook.com (2a01:111:e400:fc12::335) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 21:55:16 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3EF9CE025E91DEF3455A535323D729D1B0FF34149D0A5F622281E32EB93DAD52; UpperCasedChecksum:AB2F688C2DD47C388EA47A89D574D3CA4619F9D0CD989C13A4F7997B62818D41; SizeAsReceived:7276; Count:44 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436]) by AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436%3]) with mapi id 15.20.4065.025; Sat, 24 Apr 2021 21:55:16 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 22:54:54 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 X-TMN: [UB6TGD7wVJh6VE1bLz0ECJDqgW/gVHJj] X-ClientProxiedBy: LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424215456.39000-1-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.25 via Frontend Transport; Sat, 24 Apr 2021 21:55:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2dff261d-b999-446e-8014-08d9076ba4fe X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuQ75gPcT42JL4CyEb3w00p+yWxFfZf3OOP6ZMNuz1N4OA4+xCBswksZiu2CjVp5hEe0P6JF7OeDPM04lVlnOXEzsFqHrWo2KYLHBsmCdazCl7phXNj4jrB0GIpZ6x0/7yAD8/bJC2WgKOmhbayQCP70EgUrgxZktCZA4Y57PH0GCcbEdR1WuDacT7eweA+DBgm3IeU7Ch6VzPVeVD6WJko/tAjwfg5NOtsaLdZ9O5Q2jrkevXW1LLiFrpxx/V+dzHWi9rvYM3DevSZC/W1YZgCvBcyTe2n2ZPTGXkjPpX+NhFi6maUcPLlz29UxdKtqSqt2JPPfSzOYaVEBCH9uAVsDRq1uGrda0nreayVSFssJW4XrAcioN1i72YbNG+jPVQMwn/4CSwyw0k9I8fwXEUqSo/B95tyU+6Wj+7YM3ATYIYr1bhmaQ6DscKP+0bhDl9pFPk8swS6s0gGF24r1VP3M6+kBsShuwz1Fsyn2LZyjJLTuHFm6cWCQ9kCd9r0L3tqEFasDFiwrxita4NGxiu3n70drWMIJfuYwD2VyQ7tCySSXyLbk3fZITTuoWUpwIseRqzn9cmmZl0WJOkU0KS9CBBWsGgPtJALQ2JmEA36z0VYaTurU5Oi017RcG2cVHB4ABS/erX/gt47U3b+WPpZh2ljiT5FdOLa8D2Env7GZGMueozJgo6soc6qtsghuCdi7Wwk9cltHvq5ED5NGYo26vauQGbp86gcCmBhheGCiviC9N6RJQyy1NdZD93jE9hTBT+ldsul3N86fd1nefh5 X-MS-TrafficTypeDiagnostic: VI1EUR05HT109: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OcqSXNDT1Mmw71s9eyK9QMHleDkC3wT/SLbzq3agRjwwQQjm4FUcm2WzXdPxZp6DIvf/88IqzG+ME50AhyWXQTsVyX/9BoLEADM8t4YMlqDEe+8M+sjPWDVj/ZdjEXGqVwOppJAcoLnhvc496gNpGV2lHw0dS79Wp+MHqa/61/NwPxYhFefqG8n9wKgKUf1kgOJM6OzRqACCHLnofXaUxmQTjJdLbOIqc5/R/C92D85Tr+cjDAvvkJtjq905+wa1ExjLfxbIqdnq70DNd4eXGMSdXnVv+UxEmAI1t1Imn/cizXheE3oDIhQ3yvHI84QlmyRaiILouhLJ9n65NA+6npJpEZ1Izo537iPBRRRwgaeKuwmCoOmBxMdkHd+7wzPnGKn9+/tzxcCeG5Ammy1y0A== X-MS-Exchange-AntiSpam-MessageData: cgJVzJaW2BHNnZTYPAjNjXWenNMjKdDdLLeUTHAG3Jw7zqnhr8ZLiczLARDDKCAclwAfgeVJ93xgblU66P4GGeEU7OeL+CQs5Y92ofwQLcxeyxaVrh52L3MqlIQWZr6rnFApYVMg25PLeHxjRsP2Ww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dff261d-b999-446e-8014-08d9076ba4fe X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 21:55:16.4038 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT059.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR05HT109 Subject: [FFmpeg-devel] [PATCH v3 1/3] avcodec/adpcmenc: Adds encoder for Westwood ADPCM. 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: Aidan Richmond Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TD5cKnA1P2A+ Signed-off-by: Aidan Richmond --- libavcodec/Makefile | 1 + libavcodec/adpcmenc.c | 32 ++++++++++++++++++++++++++++++-- libavcodec/allcodecs.c | 1 + 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4a597f727a..fcddde459d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -898,6 +898,7 @@ OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_MS_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_MS_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_MTAF_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 9dc77d519a..752cae5cf4 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -94,7 +94,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) if (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI || avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM || - avctx->codec->id == AV_CODEC_ID_ADPCM_ARGO) { + avctx->codec->id == AV_CODEC_ID_ADPCM_ARGO || + avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_WS) { /* * The current trellis implementation doesn't work for extended * runs of samples without periodic resets. Disallow it. @@ -192,6 +193,11 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->frame_size = 32; avctx->block_align = 17 * avctx->channels; break; + case AV_CODEC_ID_ADPCM_IMA_WS: + /* each 16 bits sample gives one nibble */ + avctx->frame_size = s->block_size * 2 / avctx->channels; + avctx->block_align = s->block_size; + break; default: return AVERROR(EINVAL); } @@ -594,7 +600,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI || avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_ALP || - avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM) + avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM || + avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_WS) pkt_size = (frame->nb_samples * avctx->channels) / 2; else pkt_size = avctx->block_align; @@ -929,6 +936,26 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, flush_put_bits(&pb); break; } + case AV_CODEC_ID_ADPCM_IMA_WS: + { + PutBitContext pb; + init_put_bits(&pb, dst, pkt_size); + + av_assert0(avctx->trellis == 0); + for (n = frame->nb_samples / 2; n > 0; n--) { + /* stereo: 1 byte (2 samples) for left, 1 byte for right */ + for (ch = 0; ch < avctx->channels; ch++) { + int t1, t2; + t1 = adpcm_ima_compress_sample(&c->status[ch], *samples++); + t2 = adpcm_ima_compress_sample(&c->status[ch], samples[st]); + put_bits(&pb, 4, t2); + put_bits(&pb, 4, t1); + } + samples += avctx->channels; + } + flush_put_bits(&pb); + break; + } default: return AVERROR(EINVAL); } @@ -990,6 +1017,7 @@ ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_ALP, adpcm_ima_alp, sample_fmts, AV_CODEC_ ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, 0, "ADPCM IMA QuickTime"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_SSI, adpcm_ima_ssi, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Simon & Schuster Interactive"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, sample_fmts_p, 0, "ADPCM IMA WAV"); +ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Westwood"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_MS, adpcm_ms, sample_fmts, 0, "ADPCM Microsoft"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_SWF, adpcm_swf, sample_fmts, 0, "ADPCM Shockwave Flash"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, sample_fmts, 0, "ADPCM Yamaha"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 2e9a3581de..b748c9718e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -645,6 +645,7 @@ extern AVCodec ff_adpcm_ima_ssi_encoder; extern AVCodec ff_adpcm_ima_smjpeg_decoder; extern AVCodec ff_adpcm_ima_wav_encoder; extern AVCodec ff_adpcm_ima_wav_decoder; +extern AVCodec ff_adpcm_ima_ws_encoder; extern AVCodec ff_adpcm_ima_ws_decoder; extern AVCodec ff_adpcm_ms_encoder; extern AVCodec ff_adpcm_ms_decoder; From patchwork Sat Apr 24 21:54:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27329 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2661583iob; Sat, 24 Apr 2021 14:55:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxO204Eeg9/SFpmihBlGoMg/J8L2c3YjjfoU3HvXursYkPrLgU6iqhMPNhiCJjnIk+JUsYR X-Received: by 2002:a17:906:584b:: with SMTP id h11mr10685156ejs.463.1619301338427; Sat, 24 Apr 2021 14:55:38 -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 z11si8682491edp.458.2021.04.24.14.55.37; Sat, 24 Apr 2021 14:55:38 -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; 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=NONE dis=NONE) header.from=hotmail.co.uk Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8495680C2D; Sun, 25 Apr 2021 00:55:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2074.outbound.protection.outlook.com [40.92.90.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBD9D680BE0 for ; Sun, 25 Apr 2021 00:55:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ESDRVYVIuzfEstxH/KUFl5QOcjb7YwfO7dNNOb+u3HmubtRygT4vTXgzAWEHnQXshaiKgJqhbFmCjGUGLizfHZ9pjKITI7ZNgpijBfk5yih9m/KUsVWitYkomNa/1vwiXH3ijH9ZEPQuLI8lh8jmQ71Kt8Kj361yNw6JvLRJRr0MwNtDXCx34+x0wDvrpA0pkScdT3TsoRuAsjd8vpb5G8vHxqv41gklqmLcSzhZiOm1DglyhEG+u5LGRrlp5oYfS6i/Q+aPk948Zq27xHAGwdN1QccqkgGOqSkVZuBPsptoR+t+cVp7S6Ty0/0WNqWZ0+P6aXpqTKLQAJm1DKeptg== 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-SenderADCheck; bh=UHwpVJ9zsruemPYuny4ZLTyFDt6Jo9b8eWxVqLRuAek=; b=Lo6pC55Qcrzvm2emTWlE5q3urA5F3APgTdvLEKNthxcxHDRA4Lx3R6ycCdiE1IV8q3CQXaF1eBTLL5MHvHmjylFxCE5xJGLM5CrA0yMYcprvYG63fV6ElsZC4EIbVaeTlSzG3Uzb/ojmXW6ze4AZPA3Ak6+47SXs96LkkGJaiSMTA8KpqakLGp85I6GN6hWT2ZfmA9ogZ0mc15NpHwBIGNNOZUxf9iVQ3qxURsFcSLXmPsi4UHh1yhH+mmk1Y5OwYHASrvCdwLCQdvZQ+j+md+IYiDpZrsEshCdkXGfFQ7K+Oz4tEJXAVCNAcwhJzZsqGl898jaykOv2LrZgigheZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VI1EUR05FT059.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::51) by VI1EUR05HT144.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::355) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 21:55:18 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc12::40) by VI1EUR05FT059.mail.protection.outlook.com (2a01:111:e400:fc12::335) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 21:55:18 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F3CF7B013C2F8A26D9CEF72E2847830AE205C81D882E4E73B8A6AA9D156DF512; UpperCasedChecksum:F624ED8E9F576557AFA4098C60DBF71D3894B272D3F872B4EDE185B589732BBF; SizeAsReceived:7418; Count:46 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436]) by AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436%3]) with mapi id 15.20.4065.025; Sat, 24 Apr 2021 21:55:18 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 22:54:55 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20210424215456.39000-1-aidan.is@hotmail.co.uk> References: <20210424215456.39000-1-aidan.is@hotmail.co.uk> X-TMN: [Zsc2VYSmiB9vZ8lzXG4wEEv6mwFiL+tJ] X-ClientProxiedBy: LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424215456.39000-2-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.25 via Frontend Transport; Sat, 24 Apr 2021 21:55:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 95d29355-9bda-4763-4e55-08d9076ba643 X-MS-Exchange-SLBlob-MailProps: pt8ZUcDWjMXYtuTamvlHMP9Mjv7DCcg7qDz32xVTyJm7srUA9qT122RWAfA9B9GoWBX7RIkZ8U+NRrdbDgpS3//UUM8qgexBBCAl7uZoLD7B28a+EuvyVGaPPX3eaobazq0jJQEnduRNZWwzYpau+/RVmKBhZJ6JouZDfASUxIWc1pKX79tTQ3o0eGTIKXq9zQ98sMnv3JFKMb08qzh+pjSz7HEPN3xYF95/d8ak6Au45oXPiG/V+MDmYitCpP5MbbLz/bwbnIK282RcQ48+G8WiYMey1AhcusMBFiXI1LmptpkkSZjWOUYXMCeEDRUIdgB7VL4p2t/ZdE3LJG/Q8bDjn4B9T++imNEYlk5MiwCrFWQoF7r+p0k9JahYuRZivlRzdZxaKR2ieXRXsdlHit15GYT3sdDta3GXXBbD8rPA7cylNE20HNpf8NYgL+esg+wUjju513wgrszBdkit7GmyG0zvS6zLMXPUfoXlxqkulNdhfwE6Uk3tmzJ10E+aSgdsC81C/f9YuHJdsUEEKWX81ylEDaexEIS+NdVloOIfNHaXRN5Bo/pmUJtBlwy4v3qLc0HfeRVFfbsXbCM23yAajUfkg61EzdbBB/E1xKSKkW3+sMWh0B52qZv3/nv/LCnwdjqjxJjznmq4tk8faMWnMSGfZMN18CBeNNwPwqjPdUs2fOkOHjdOdaI4LcjulAGIb8sO4yU/qHcBRybto4J87qCcDUMJBBH0VtPhD8pya5BvIItXllzaaE/tERSYqtCMDq1J2OOx0/67PzyDvn5sIKrFdOYBdMyrE9lDWQlDSMqGzm5lEOTM2v5Uv9MwrU5P7MdU79xnh88ObxwSxCgflepJX9kOkrOh/hMaZbGCIpw26Yk31Y0c9To+LsKekvDNn+arK0rYA1FdM4jB/qkcSt4i7krmT/3ustwez8iIGvkUOpP0qwcI0dO6SfYc X-MS-TrafficTypeDiagnostic: VI1EUR05HT144: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SchCu/zVGZRgo1LeEiu8NQsFjceYCnnXUd4sBBkj7IQZiItMbpM5KFctKUSZdtWkWxRM/c0M1cJrGhTe7oIZoWGlFhPzF0eQEe3vV4CjN45xQgs5AoY6IqaYtSu3qQwVrysAX8V/hpp+DJaw3GjAgzi6U8DxFXQxm1iTrpXVuoklEF8GlOM3xNrna17n8cNtpDbbdqZ8tD8VJ/hqGvUZkSERMXT+BW15Nl0VKa/TQ97aK53rae5GyiYGu4Fh0ytAIJi/lRsMatvyfT70fIFwRm+tZaVkTVvmD+s/xFU1M5tUSnNptHC7SWzMjezfopHk/5sJKphubXRUmenshF07S3/4GGboaGGVIAErtpERnrQ8lvklXHsQ/uCqa5PjTlNT86Fb3iaE1x1eD9Bshg9o1cToUMIISbJKYAuHB67W5yA= X-MS-Exchange-AntiSpam-MessageData: Hfdp/hAKkPmaWUI0Bu6XFGJFZ71SAA0gms1g2ij1M6ydnuM6Kb9awkIJELhMRcBY+uu3eSO9YFlxlH9jO+I8XmKCXtk21LlsxzQb25mDBZZzHCqZlhIv2a0tLSjOkwOanL+NradF5f45hod7W1Mgww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95d29355-9bda-4763-4e55-08d9076ba643 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 21:55:18.3532 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT059.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR05HT144 Subject: [FFmpeg-devel] [PATCH v3 2/3] avformat/westwoodaudenc: Adds muxer for Westwood AUD format. 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: Aidan Richmond Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: q/+Ew6kzqnw4 Format is still used by modders of these old games. Signed-off-by: Aidan Richmond --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/westwood_audenc.c | 145 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 libavformat/westwood_audenc.c diff --git a/libavformat/Makefile b/libavformat/Makefile index bc1ddfa81c..85b5d8e7eb 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -581,6 +581,7 @@ OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o +OBJS-$(CONFIG_WSAUD_MUXER) += westwood_audenc.o OBJS-$(CONFIG_WSD_DEMUXER) += wsddec.o rawdec.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fa093c7ac2..fe70a1e9a2 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -478,6 +478,7 @@ extern AVOutputFormat ff_webp_muxer; extern AVInputFormat ff_webvtt_demuxer; extern AVOutputFormat ff_webvtt_muxer; extern AVInputFormat ff_wsaud_demuxer; +extern AVOutputFormat ff_wsaud_muxer; extern AVInputFormat ff_wsd_demuxer; extern AVInputFormat ff_wsvqa_demuxer; extern AVInputFormat ff_wtv_demuxer; diff --git a/libavformat/westwood_audenc.c b/libavformat/westwood_audenc.c new file mode 100644 index 0000000000..95bda57847 --- /dev/null +++ b/libavformat/westwood_audenc.c @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2021 Aidan Richmond + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Westwood Studios AUD file muxer + * by Aidan Richmond (aidan.is@hotmail.co.uk) + * + * This muxer supports IMA ADPCM packed in westwoods format. + * + * @see http://xhp.xwis.net/documents/aud3.txt + */ + +#include "libavutil/avassert.h" + +#include "avformat.h" +#include "avio_internal.h" +#include "internal.h" +#include + +#define AUD_CHUNK_SIGNATURE 0x0000DEAF + +typedef struct AUDMuxContext { + int uncomp_size; + int size; +} AUDMuxContext; + +static int wsaud_init(AVFormatContext *ctx) +{ + AVStream *st = ctx->streams[0]; + AVIOContext *pb = ctx->pb; + + /* Stream must be seekable to correctly write the file. */ + if(!(pb->seekable & AVIO_SEEKABLE_NORMAL)) { + av_log(ctx->streams[0], AV_LOG_ERROR, "Cannot write Westwood aud to" + " none seekable stream.\n"); + return AVERROR(EINVAL); + } + + if (st->codecpar->codec_id != AV_CODEC_ID_ADPCM_IMA_WS) { + av_log(st, AV_LOG_ERROR, "%s codec not supported for Westwood AUD.\n", + avcodec_get_name(st->codecpar->codec_id)); + return AVERROR(EINVAL); + } + + if (ctx->nb_streams != 1) { + av_log(st, AV_LOG_ERROR, "AUD files have exactly one stream\n"); + return AVERROR(EINVAL); + } + + return 0; +} + +static int wsaud_write_header(AVFormatContext *ctx) +{ + AVStream *st = ctx->streams[0]; + AVIOContext *pb = ctx->pb; + AUDMuxContext *a = ctx->priv_data; + int retval; + unsigned char flags = 0; + + ret = wsaud_init(ctx); + + if (ret) + return ret; + + a->uncomp_size = 0; + a->size = 0; + + /* Flag if we have stereo data. */ + if (st->codecpar->channels == 2) + flags |= 1; + + /* This flags that the file contains 16 bit samples rather than 8 bit + since the encoder only encodes 16 bit samples this should be set. */ + if (av_get_bits_per_sample(st->codecpar->codec_id) == 4) + flags |= 2; + + avio_wl16(pb, st->codecpar->sample_rate); + /* We don't know the file size yet, so just zero 8 bytes */ + ffio_fill(pb, 0, 8); + avio_w8(pb, flags); + /* 99 indicates the ADPCM format. Other formats not supported. */ + avio_w8(pb, 99); + + return 0; +} + +static int wsaud_write_packet(AVFormatContext *ctx, AVPacket *pkt) +{ + AVIOContext *pb = ctx->pb; + AUDMuxContext *a = ctx->priv_data; + + av_assert1(pkt->size < UINT16_MAX && (pkt->size * 4) < UINT16_MAX); + /* Assumes ADPCM since this muxer doesn't support SND1 or PCM format. */ + avio_wl16(pb, pkt->size); + avio_wl16(pb, pkt->size * 4); + avio_wl32(pb, AUD_CHUNK_SIGNATURE); + avio_write(pb, pkt->data, pkt->size); + a->size += pkt->size + 8; + a->uncomp_size += pkt->size * 4; + + return 0; +} + +static int wsaud_write_trailer(AVFormatContext *ctx) +{ + AVIOContext *pb = ctx->pb; + AUDMuxContext *a = ctx->priv_data; + + avio_seek(pb, 2, SEEK_SET); + avio_wl32(pb, a->size); + avio_wl32(pb, a->uncomp_size); + + return 0; +} + +AVOutputFormat ff_wsaud_muxer = { + .name = "wsaud", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio"), + .extensions = "aud", + .priv_data_size = sizeof(AUDMuxContext), + .audio_codec = AV_CODEC_ID_ADPCM_IMA_WS, + .video_codec = AV_CODEC_ID_NONE, + .write_header = wsaud_write_header, + .write_packet = wsaud_write_packet, + .write_trailer = wsaud_write_trailer, +}; From patchwork Sat Apr 24 21:54:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27328 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2661670iob; Sat, 24 Apr 2021 14:55:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrZ+Czfk83aDhfWpoxbgrTW3x71nC+L1vlW+B+OuRpKRRnWxUaOtxRnDtLF/39vpPOEhpe X-Received: by 2002:a17:907:9811:: with SMTP id ji17mr10965263ejc.188.1619301354536; Sat, 24 Apr 2021 14:55:54 -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 l21si9448650edw.602.2021.04.24.14.55.54; Sat, 24 Apr 2021 14:55:54 -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; 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=NONE dis=NONE) header.from=hotmail.co.uk Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC893680C7D; Sun, 25 Apr 2021 00:55:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2022.outbound.protection.outlook.com [40.92.90.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2E35680677 for ; Sun, 25 Apr 2021 00:55:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MvrmOi4M22p/VHK9YpD8O6mfma1Qym+iYx1uJyzbo06EptiRhXu2mrK6AFMttG7/F+Ap9RjZ1vZPcabmvcDMqEOQr+SFOz5TaO7Dn5+glSOTuOfEUBtZH7OLEczGD0o9jjM1VqdWgKb0QTRai6eGD9xfMJkiXEZZpKk+fK5Avec2PgaGnX5cj8S78A2XcvgHe5G1nouDKyLN3nsfuVvRPgVBZOHBFeoQ5k5KqhGNFgImYIzH/OF7vBOFeAlyUkvUPYQr5/4pojHtTidLd1TXZdZt4+6LINpgdIjpb/ii7SRgjOSs3IePkb7JPjxO+oRFp4Gdf5QP9oNEGM5Z+OvsTw== 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-SenderADCheck; bh=+0pS9n9VGBBq45z6ujxUt03lIfe/lfJb/0RfV29/Iho=; b=GsAJN39Y1uIv6dHhgnkgLbVwNnoXV5gV9vUlOirylisNjjwtDJbAx5LOe5OH2pFJ3jS1PaaoDLnDs9PdEozRyLMZYpgGhbd4sGeUegvIE0cVgn7nRBuq/X2Izm0yEpYnVRkbTkIO8mKNVeEnSvIfKf5LMBVekzMWokfmuUBI6XuU1phJkMtWcblZaahm/hZtOmytpv9g2+YSFh73JLt+dsAUbxMDAub/wgx1sOd1X0CQMe2AdsqFStjG/efQI/lxPyRVuatxdA635X4CXOu/Df7Ib4JM4afnFASHWyY1QQdrpBuI/kJNbbRoH5pWaMOH0k8VP9eRGCvLienrC0CwUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VI1EUR05FT059.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::4c) by VI1EUR05HT168.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 21:55:43 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc12::40) by VI1EUR05FT059.mail.protection.outlook.com (2a01:111:e400:fc12::335) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 21:55:43 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C5601C014FB64A4F5DF99E6B18B2E0A12B08AB77AF8F92F834F8E0FAEDA59C0B; UpperCasedChecksum:1FE0136D50EE96A20CBA28FE81146F0CD36F31A1F01914BE70D7D75F0902D9D9; SizeAsReceived:7405; Count:46 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436]) by AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436%3]) with mapi id 15.20.4065.025; Sat, 24 Apr 2021 21:55:43 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 22:54:56 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20210424215456.39000-1-aidan.is@hotmail.co.uk> References: <20210424215456.39000-1-aidan.is@hotmail.co.uk> X-TMN: [hjpm8IydOSF+EPrIXgAyRW/Zj6z+iGxm] X-ClientProxiedBy: LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424215456.39000-3-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.25 via Frontend Transport; Sat, 24 Apr 2021 21:55:43 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 5d446837-1667-411a-e089-08d9076bb571 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuQ75gPcT42JL4CyEb3w00pb2jWdZ2RaiFbcTFOXVH5wo1d97QkD9SF4iGi4l1YuI5mU4E8wD2fxXSJGgfhKalTy48OSkSQvdd/dOBKsJLW1+qr9iqVXvaPSEpcIJyzgENzeRpKgIjvGTdf8p5t+zizBcLnWMP6+OPd+msNnBYGDaqryAfFiztr0cNJxNxR3gwzN6/IgC+1dJYDBqPSmpFxHP5cgv8Unbzdbbd7/t7dGZOQxeAwA17dTpQjcXNsrj1keQnnGXWygYQcZORMYpLRRFwTU7+dhNTdlsHriEZxxuZP8KLkA65VjYqvRkuHCxhcHZyOrpP2ttlJRuO1KGieCuK8x4VEJXzFIfMSdgrK1WlrWQn3GkyPjq9RtUf1ZebUJZNfggJaN53NzCTYO8UAPZYz4T/S6HLoSGpkwurmHh3Mz8H35Uz/mmExzj07gHj/Pc+3UFTeyz1jGgWOlCPtkdZGqOou6HeHApiscqTkL5Bzp60/Za3LCfEMhOTM5e72SQL2022H18wkwYRWbE0aUbwpCmUc4rJxHzJA8sUSdPhtBvsGuTMoqlkzHmuEYG6A6Y0Q2fC4jRkUKQCJ1VImrdjl4fGn3Hhh5AU+ZfBtTK4AZcWobGVQlTWRvKH7mYWm1U5Vr005zzhA4+o1Rm/5FAqWEf1SGbnFEyTyO7FL9PyDvpMyO2bAX+eJJqE1Di9g1PCm4LwnqTCykdkGhq6tGnR5vNflP5bCt745LVr1SUYcxwRIRULL0RcXmQmXjZ+2FT6I7jxw75+EN/YOqYlx X-MS-TrafficTypeDiagnostic: VI1EUR05HT168: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7YKv19cDt/tOf5RAUws5BMD9DR6MYYFy9/b3tTdXfloQfiQJFb0/DGN1cHZQlrx28slHMUrnzNgtzR7E/X1Fmn2eTD/eQevHUHF/SWIWVNOh6dFCFuCvQhekSuNP3teRuVnYTonAKHJPGhjcVojM5w12ZbhTYmClty8cpLjwcaLhTWGe1Uh59G4irNHz4WgeryadvJejomoXp7LiuMvyRLfSosYgcKFOgi+u2y4n9AJhXoeomk1vrN6FPvJ3FGF8Bsc7Ow9josQaHOyiJWeFQ4XEAzy3JyebLvfXA/DQr2Skhbu5+tuyK16yxSTnuWOxFxQG7YAQOlvYNGvbB2iMK+etRZ17yRmiNtuoTO1KnZ2im3OwxESn6rTeHaZ6To4p+SsCUUKHubY20vYSx1Hczw== X-MS-Exchange-AntiSpam-MessageData: AzweDtiaM2IYFbQqzy0rfB7c72bKhVSQ3IdzSsmln6NtUuxcQhH4kjwkBPK4yHDXu1K8ganW9HZYaiz1FIR/Pv4ZZj9azqhPNJvvJahf4hDrnbdfZQ1jt9nTBnpCFIU9OGxBDjCL2w3Ihje4i9tshA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d446837-1667-411a-e089-08d9076bb571 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 21:55:43.8203 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT059.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR05HT168 Subject: [FFmpeg-devel] [PATCH v3 3/3] avcodec/adpcm: Fixes output from Westwood ADPCM. 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: Aidan Richmond Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4BKCmJYoNNQr Fixes bug #9198 Signed-off-by: Aidan Richmond --- libavcodec/adpcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index be14607eac..5ec9691001 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1400,16 +1400,16 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, for (n = nb_samples / 2; n > 0; n--) { int v = bytestream2_get_byteu(&gb); - *smp++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); *smp++ = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + *smp++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); } } } else { for (n = nb_samples / 2; n > 0; n--) { for (channel = 0; channel < avctx->channels; channel++) { int v = bytestream2_get_byteu(&gb); - *samples++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); - samples[st] = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + *samples++ = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + samples[st] = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); } samples += avctx->channels; }