From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5154D4DC95 for ; Sun, 4 Jan 2026 19:40:54 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'OU/9kYxgBWwaqssaV0Lj19PCpFM3PdWIolUCzCWXxhE=', expected b'YjXkQ+VF86OgYRV/AhnxYtKbiWkbHfd73Dt487iLt9o=')) header.d=gmail.com header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767555639; h=to : date : message-id : mime-version : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=HY3re/3IAPaoGS7P2fWkXIKPCvPYwim5aH1vomVa39g=; b=lgCHWtcS7uFW0VpxgzdBwxiGJ7vr1n7Ej1GKTYnWgSXl/XCdWlt5YjLZpiWjtXxQK2zoZ LUi9nvFneVXWoxWnL4WWuCjWEVG/S4eCCjdu/IAxCH3xz6+ae4WEIcY74ZHcDU4YIekarfA N+nnN/prS3mbaRJv4mGp+fWKE5Z+KVXPqroyV3RhuQG6m5vXuXBx62M0i3ELxikRRrgwA56 o2YPL3mhh5xKSdWNwvYk6qsgNOVLHgA2xnhnWhVcolZl6JDzsJ61EQg/BBt/MuZwT0T9g4h cCAgMvft7LRQQQ/C0W1Wj02EOhvKkGLySWiYmydHudNOBMGIg00fCya4rfug== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 46910690D57; Sun, 4 Jan 2026 21:40:39 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767555623; b=csHcHme2f+/mcc4FOMhZTJwKNeP/KJ6xFJRaFytOrCKeAwkZ9WGqJBhhEB598hSX34ucu /AbvPQ0mcFkKWasOJ5i/J3I6R9B+1KZjakQHy+tPfRqBV2o2a2smRqN5cRf/SZUFwPNb1Ct b8fcYmXaqDYMkqUQERwxyVIJgstXSVsUvVn22Scj5RtL9G7O0+oF98COAxH6a9WMkuii8hO jiNLCOfK6rhpwLxlYyG1FCdYDmkqpAqdJrmhFNpXQqQjqquYxp6ZMFeAT3629VTIsUaKf3U oNEgTm7g6fwIMAgiIGdQAuPwGY3nkYodPzylHHxNDZ2c3M79INfkyZDelA0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767555623; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=OU/9kYxgBWwaqssaV0Lj19PCpFM3PdWIolUCzCWXxhE=; b=s2imveqfa87zAWe4ECKf2QNLfA9ysYnUghO5/xc8JtWIw2FQYSA3lfGniAIRQavgcVykC n572uk88g43NhU2SMHXIYSq3DSOP1MIDjQYRL8XLoMnobnwISbV/ilYcCA1Ocpdn+OrMTVZ xgtxttluEv86XHoGZR6EZZ8WDkKOcZ3rx63ich/dzoybfQsuPyv99jqv4DbxbW1XN8iCcTh NZWgk30KRtI5ZLHYSo8MtGB04X83EFL9ybn16X8toyFtZ1rV7FPTc0P0nAPppwehAxR/Dks UBrZFWrLia8X2/kWdm8cAPAINIcLUQ5Ai2V95tpQAJCi6Sbwq/nGT/nVOw3Q== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=gmail.com; arc=none; dmarc=pass header.from=gmail.com policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=gmail.com; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=gmail.com policy.dmarc=quarantine Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4DA4C690C13 for ; Sun, 4 Jan 2026 21:40:09 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-598efcf3a89so13216744e87.1 for ; Sun, 04 Jan 2026 11:40:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767555608; x=1768160408; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YjXkQ+VF86OgYRV/AhnxYtKbiWkbHfd73Dt487iLt9o=; b=HzG0uKuyOiYK9OdqQOBOJhp/RgMxhl0uzvIk8AMj7K+VcXE2h5KYAPTlypruoibxID 5lYbkDxZ2WdijJxBGzYnAfKjcb1aEJJQMNxc5DwZWtW/V1GABc+cjMgTdBvxMI5VOhR4 bwlxap63Yhw7z+kn5SZtah3Eqyt7p1Jc1umqAShBj9lgrTx8xKw6ZKFOMgcalLELryq7 AIYS7T2KG5cbRHxop8legany47B1r9pfn6+xnvYQdugvNxwPb4K+PwLnCcL+msi8Te89 oFX1FnsTqB0JwBlsTcCnsWGT4Nq/BlX8DeLfLW1oKRSn1OwtwvlYT91/6S0/BhegrkhI NRjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767555608; x=1768160408; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YjXkQ+VF86OgYRV/AhnxYtKbiWkbHfd73Dt487iLt9o=; b=OUNoj8xmDgngUckUu+wOb/zXQU5WGq3UcJSTrZANRL3gJk2MQFBtLDFep+U7ZvFk2O xjJTQeWNvt8TM2u23ntyVCt04mFT4wXassPBaJthadhcA+TSPOq4OtdCiCib0FUzAJ5k onPp0F/M6TZawLjJO+neBkwrOv2Ake6dq7dphvdX7GzBpJTsZTzFfWjbUgHekd/R768X LQ87jnoFWHYlksEbEzUb+mzOyqoktqD/F+qa7rx1deTSzV5szIvWfdFGf/8YoiUflbRd tVevxzDsQHc+GdwQa78fiGEe9W5gKEQUnrKNXJpiWxkZIVIIWRVADgAwLaWOhY1bUt1K gXsg== X-Gm-Message-State: AOJu0YyEHioTD11fud6lbrHESahgt5A1M+XEbb50/k9w6PHGnDZPO7al HuwtDYxR2kN1W/t1fnDqh8B59JHH8sDj+XfuUMmERdgkIccd+usSAhYERJPEyA== X-Gm-Gg: AY/fxX6r00TzfeT3CXeuPAtKoJ72kkfWeQHOlxGIVq2MouGHotxFz6lEyqxx72A7PgW vLoguD4Ts79Fv611vlFiv1lIaOfYHpx+fOVyqnEPKCKO8INol9qmy5jgmhAKm0rQbOcIgPeIN50 n3ANlNvJ/E1xsK46xXCY19ZLDgXL40r504Ty4wMmvnk6e4K7XGX65HLNXulMe1mHrqLPyjmgpRa mwmA1t3VwlZCTM/H1BvVNO19xRzNB+yHInFOSds4/q3dfnpPyU5/j4Xr652dXxIbBBL8aDhsZ6u NcKhRa//YSfBHxdM3aio7Cxzh+ylNRrVRZxyVwsGYV12pzb6tFoxR3IWpuSoY3lnz7JdTZdXfmY ucr2oX3o+nXAs71MnrmhunxmqW49Xorx2m3le5JpVSj8p8Dccu7PZBuKKls4DCdNr4vOJ9wAGlD f71n6SY0dUFW9py428RxTx4q7z87SL1R2dCZsqlOZf/5UfHX4RxOJbrNLhS3aPO10iW4CLXm8= X-Google-Smtp-Source: AGHT+IGghXuavwrV8IkH43cDoSf+APDG+2KiZje7O8JHunugl2OTIu4e033dCPytdKwho7886Mx5nw== X-Received: by 2002:a05:6512:3da7:b0:594:341a:ab1e with SMTP id 2adb3069b0e04-59a17de2c77mr16334233e87.31.1767555607671; Sun, 04 Jan 2026 11:40:07 -0800 (PST) Received: from icewind.users-vpn.lfstrm.tv ([95.161.221.209]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-381224de67csm131698721fa.9.2026.01.04.11.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jan 2026 11:40:06 -0800 (PST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Jan 2026 22:39:56 +0300 Message-ID: <20260104193956.22783-1-azamat.hackimov@gmail.com> X-Mailer: git-send-email 2.51.2 MIME-Version: 1.0 Message-ID-Hash: P6PYFKB77FV2O4Q6FJUU4K4VD34DI3YK X-Message-ID-Hash: P6PYFKB77FV2O4Q6FJUU4K4VD34DI3YK X-MailFrom: SRS0=n3IO=7J=gmail.com=azamat.hackimov@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/adpcmenc: Add ADPCM IMA Xbox encoder List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: "Azamat H. Hackimov via ffmpeg-devel" Cc: "Azamat H. Hackimov" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: adpcm_ima_xbox is pretty similar to standard ADPCM IMA encoder, difference is only frame_size and block_align settings of ADPCM encoder. Signed-off-by: Azamat H. Hackimov --- Changelog | 1 + doc/general_contents.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/adpcmenc.c | 33 ++++++++++++++++++++------------- libavcodec/allcodecs.c | 1 + libavcodec/version.h | 2 +- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Changelog b/Changelog index 2f97b280cb..e1a628ffce 100644 --- a/Changelog +++ b/Changelog @@ -19,6 +19,7 @@ version : - JPEG-XS decoder and encoder through libsvtjpegxs - JPEG-XS raw bitstream muxer and demuxer - IAMF Projection mode Ambisonic Audio Elements muxing and demuxing +- ADPCM IMA Xbox encoder version 8.0: diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 47ac1989f2..f7b5d46738 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -1255,7 +1255,7 @@ following image formats are supported: @item ADPCM IMA Duck DK4 @tab @tab X @tab Used in some Sega Saturn console games. @item ADPCM IMA Radical @tab @tab X -@item ADPCM IMA Xbox @tab @tab X +@item ADPCM IMA Xbox @tab X @tab X @item ADPCM Microsoft @tab X @tab X @item ADPCM MS IMA @tab X @tab X @item ADPCM Nintendo Gamecube AFC @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3d60347a19..383fd2592c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1013,6 +1013,7 @@ 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_IMA_XBOX_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_IMA_XBOX_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 96a053351d..69d49f1c33 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -136,6 +136,10 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->block_align = s->block_size; avctx->bits_per_coded_sample = 4; ) /* End of CASE */ + CASE(ADPCM_IMA_XBOX, + avctx->frame_size = 65; + avctx->block_align = 36 * channels; + ) /* End of CASE */ CASE(ADPCM_IMA_QT, avctx->frame_size = 64; avctx->block_align = 34 * channels; @@ -623,7 +627,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, dst = avpkt->data; switch(avctx->codec->id) { - CASE(ADPCM_IMA_WAV, + case AV_CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_IMA_XBOX: { int blocks = (frame->nb_samples - 1) / 8; for (int ch = 0; ch < channels; ch++) { @@ -667,7 +672,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } } } - ) /* End of CASE */ + } + break; CASE(ADPCM_IMA_QT, PutBitContext pb; init_put_bits(&pb, dst, pkt_size); @@ -1021,14 +1027,15 @@ const FFCodec ff_ ## name_ ## _encoder = { \ ADPCM_ENCODER_3(CONFIG_ ## codec ## _ENCODER, AV_CODEC_ID_ ## codec, \ name, sample_fmts, capabilities, long_name) -ADPCM_ENCODER(ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games") -ADPCM_ENCODER(ADPCM_IMA_AMV, adpcm_ima_amv, sample_fmts, 0, "ADPCM IMA AMV") -ADPCM_ENCODER(ADPCM_IMA_APM, adpcm_ima_apm, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Ubisoft APM") -ADPCM_ENCODER(ADPCM_IMA_ALP, adpcm_ima_alp, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA High Voltage Software ALP") -ADPCM_ENCODER(ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, 0, "ADPCM IMA QuickTime") -ADPCM_ENCODER(ADPCM_IMA_SSI, adpcm_ima_ssi, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Simon & Schuster Interactive") -ADPCM_ENCODER(ADPCM_IMA_WAV, adpcm_ima_wav, sample_fmts_p, 0, "ADPCM IMA WAV") -ADPCM_ENCODER(ADPCM_IMA_WS, adpcm_ima_ws, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Westwood") -ADPCM_ENCODER(ADPCM_MS, adpcm_ms, sample_fmts, 0, "ADPCM Microsoft") -ADPCM_ENCODER(ADPCM_SWF, adpcm_swf, sample_fmts, 0, "ADPCM Shockwave Flash") -ADPCM_ENCODER(ADPCM_YAMAHA, adpcm_yamaha, sample_fmts, 0, "ADPCM Yamaha") +ADPCM_ENCODER(ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games") +ADPCM_ENCODER(ADPCM_IMA_AMV, adpcm_ima_amv, sample_fmts, 0, "ADPCM IMA AMV") +ADPCM_ENCODER(ADPCM_IMA_APM, adpcm_ima_apm, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Ubisoft APM") +ADPCM_ENCODER(ADPCM_IMA_ALP, adpcm_ima_alp, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA High Voltage Software ALP") +ADPCM_ENCODER(ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, 0, "ADPCM IMA QuickTime") +ADPCM_ENCODER(ADPCM_IMA_SSI, adpcm_ima_ssi, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Simon & Schuster Interactive") +ADPCM_ENCODER(ADPCM_IMA_WAV, adpcm_ima_wav, sample_fmts_p, 0, "ADPCM IMA WAV") +ADPCM_ENCODER(ADPCM_IMA_WS, adpcm_ima_ws, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Westwood") +ADPCM_ENCODER(ADPCM_IMA_XBOX, adpcm_ima_xbox, sample_fmts_p, 0, "ADPCM IMA Xbox") +ADPCM_ENCODER(ADPCM_MS, adpcm_ms, sample_fmts, 0, "ADPCM Microsoft") +ADPCM_ENCODER(ADPCM_SWF, adpcm_swf, sample_fmts, 0, "ADPCM Shockwave Flash") +ADPCM_ENCODER(ADPCM_YAMAHA, adpcm_yamaha, sample_fmts, 0, "ADPCM Yamaha") diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 042b07c895..6ccf53f1a0 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -699,6 +699,7 @@ extern const FFCodec ff_adpcm_ima_wav_encoder; extern const FFCodec ff_adpcm_ima_wav_decoder; extern const FFCodec ff_adpcm_ima_ws_encoder; extern const FFCodec ff_adpcm_ima_ws_decoder; +extern const FFCodec ff_adpcm_ima_xbox_encoder; extern const FFCodec ff_adpcm_ima_xbox_decoder; extern const FFCodec ff_adpcm_ms_encoder; extern const FFCodec ff_adpcm_ms_decoder; diff --git a/libavcodec/version.h b/libavcodec/version.h index 9d910cf848..8a10a7db97 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 23 +#define LIBAVCODEC_VERSION_MINOR 24 #define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- 2.51.2 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org