[FFmpeg-cvslog] avcodec: add CBD2 DPCM decoder
Paul B Mahol
git at videolan.org
Fri Jan 27 20:42:22 EET 2023
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Jan 24 16:14:25 2023 +0100| [01343683fa219587fa282637389d13fde403099d] | committer: Paul B Mahol
avcodec: add CBD2 DPCM decoder
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01343683fa219587fa282637389d13fde403099d
---
Changelog | 1 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/codec_desc.c | 7 +++++++
libavcodec/codec_id.h | 1 +
libavcodec/dpcm.c | 10 ++++++++++
libavcodec/utils.c | 1 +
libavcodec/version.h | 2 +-
libavformat/aiff.c | 1 +
libavformat/aiffdec.c | 1 +
10 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/Changelog b/Changelog
index 9679abce14..ddcbe9eaa1 100644
--- a/Changelog
+++ b/Changelog
@@ -30,6 +30,7 @@ version <next>:
- adrc audio filter
- afdelaysrc audio filter
- WADY DPCM decoder and demuxer
+- CBD2 DPCM decoder
version 5.1:
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2d9710923d..f0ffd0b961 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -278,6 +278,7 @@ OBJS-$(CONFIG_BRENDER_PIX_DECODER) += brenderpix.o
OBJS-$(CONFIG_C93_DECODER) += c93.o
OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \
cavsdata.o
+OBJS-$(CONFIG_CBD2_DECODER) += dpcm.o
OBJS-$(CONFIG_CCAPTION_DECODER) += ccaption_dec.o ass.o
OBJS-$(CONFIG_CDGRAPHICS_DECODER) += cdgraphics.o
OBJS-$(CONFIG_CDTOONS_DECODER) += cdtoons.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index f728c6c82e..f30047e17a 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -620,6 +620,7 @@ extern const FFCodec ff_pcm_vidc_encoder;
extern const FFCodec ff_pcm_vidc_decoder;
/* DPCM codecs */
+extern const FFCodec ff_cbd2_dpcm_decoder;
extern const FFCodec ff_derf_dpcm_decoder;
extern const FFCodec ff_gremlin_dpcm_decoder;
extern const FFCodec ff_interplay_dpcm_decoder;
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 2272232ed6..50f9794e10 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2626,6 +2626,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("DPCM Marble WADY"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
+ {
+ .id = AV_CODEC_ID_CBD2_DPCM,
+ .type = AVMEDIA_TYPE_AUDIO,
+ .name = "cbd2_dpcm",
+ .long_name = NULL_IF_CONFIG_SMALL("DPCM Cuberoot-Delta-Exact"),
+ .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+ },
/* audio codecs */
{
diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h
index 5ec3fd4b30..cdf7eb79c3 100644
--- a/libavcodec/codec_id.h
+++ b/libavcodec/codec_id.h
@@ -431,6 +431,7 @@ enum AVCodecID {
AV_CODEC_ID_GREMLIN_DPCM,
AV_CODEC_ID_DERF_DPCM,
AV_CODEC_ID_WADY_DPCM,
+ AV_CODEC_ID_CBD2_DPCM,
/* audio codecs */
AV_CODEC_ID_MP2 = 0x15000,
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index 86cb9134f8..6ea9e2c065 100644
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -194,6 +194,13 @@ static av_cold int dpcm_decode_init(AVCodecContext *avctx)
}
break;
+ case AV_CODEC_ID_CBD2_DPCM:
+ for (i = -128; i < 128; i++) {
+ int16_t cube = (i * i * i) / 64;
+ s->array[i+128] = cube;
+ }
+ break;
+
case AV_CODEC_ID_GREMLIN_DPCM: {
int delta = 0;
int code = 64;
@@ -265,6 +272,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, AVFrame *frame,
case AV_CODEC_ID_WADY_DPCM:
case AV_CODEC_ID_DERF_DPCM:
case AV_CODEC_ID_GREMLIN_DPCM:
+ case AV_CODEC_ID_CBD2_DPCM:
case AV_CODEC_ID_SDX2_DPCM:
out = buf_size;
break;
@@ -386,6 +394,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, AVFrame *frame,
}
break;
+ case AV_CODEC_ID_CBD2_DPCM:
case AV_CODEC_ID_SDX2_DPCM:
while (output_samples < samples_end) {
int8_t n = bytestream2_get_byteu(&gb);
@@ -468,6 +477,7 @@ const FFCodec ff_ ## name_ ## _decoder = { \
FF_CODEC_DECODE_CB(dpcm_decode_frame), \
}
+DPCM_DECODER(AV_CODEC_ID_CBD2_DPCM, cbd2_dpcm, "DPCM Cuberoot-Delta-Exact");
DPCM_DECODER(AV_CODEC_ID_DERF_DPCM, derf_dpcm, "DPCM Xilam DERF");
DPCM_DECODER(AV_CODEC_ID_GREMLIN_DPCM, gremlin_dpcm, "DPCM Gremlin");
DPCM_DECODER(AV_CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay");
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 27ab92c9ce..808a7b8f5b 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -514,6 +514,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
case AV_CODEC_ID_PCM_SGA:
case AV_CODEC_ID_PCM_U8:
case AV_CODEC_ID_SDX2_DPCM:
+ case AV_CODEC_ID_CBD2_DPCM:
case AV_CODEC_ID_DERF_DPCM:
case AV_CODEC_ID_WADY_DPCM:
return 8;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index dfd3d5d7e5..7ac8d2b2fe 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#include "version_major.h"
-#define LIBAVCODEC_VERSION_MINOR 57
+#define LIBAVCODEC_VERSION_MINOR 58
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 0f25b436bd..1ceac69a70 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -46,6 +46,7 @@ const AVCodecTag ff_codec_aiff_tags[] = {
{ AV_CODEC_ID_QDMC, MKTAG('Q','D','M','C') },
{ AV_CODEC_ID_QDM2, MKTAG('Q','D','M','2') },
{ AV_CODEC_ID_QCELP, MKTAG('Q','c','l','p') },
+ { AV_CODEC_ID_CBD2_DPCM, MKTAG('C','B','D','2') },
{ AV_CODEC_ID_SDX2_DPCM, MKTAG('S','D','X','2') },
{ AV_CODEC_ID_ADPCM_IMA_WS, MKTAG('A','D','P','4') },
{ AV_CODEC_ID_NONE, 0 },
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 80733e5801..1cde12c193 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -164,6 +164,7 @@ static int get_aiff_header(AVFormatContext *s, int64_t size,
case AV_CODEC_ID_ADPCM_IMA_WS:
case AV_CODEC_ID_ADPCM_G722:
case AV_CODEC_ID_MACE6:
+ case AV_CODEC_ID_CBD2_DPCM:
case AV_CODEC_ID_SDX2_DPCM:
par->block_align = 1 * channels;
break;
More information about the ffmpeg-cvslog
mailing list