From 2348635a8e20db37687a8f2bbc59f3cc418e4f05 Mon Sep 17 00:00:00 2001 From: JackMacWindows Date: Fri, 10 Jun 2022 21:42:00 +0000 Subject: [PATCH 1/2] avcodec: Add DFPWM reading support --- include/vlc_fourcc.h | 1 + modules/codec/avcodec/fourcc.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 6ed227d2c6..36a7519fd5 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -591,6 +591,7 @@ #define VLC_CODEC_DSD_LSBF_PLANAR VLC_FOURCC('D','S','F','l') #define VLC_CODEC_DSD_MSBF VLC_FOURCC('D','S','D',' ') #define VLC_CODEC_DSD_MSBF_PLANAR VLC_FOURCC('D','S','F','m') +#define VLC_CODEC_DFPWM VLC_FOURCC('D','F','P','W') /* Subtitle */ #define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ') diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index fc761cde66..d419858b7d 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -498,6 +498,9 @@ static const struct vlc_avcodec_fourcc audio_codecs[] = { VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND }, /* AV_CODEC_ID_PAF_AUDIO */ { VLC_CODEC_ON2AVC, AV_CODEC_ID_ON2AVC }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 59, 22, 100 ) + { VLC_CODEC_DFPWM, AV_CODEC_ID_DFPWM }, +#endif /* DSD */ { VLC_CODEC_DSD_LSBF, AV_CODEC_ID_DSD_LSBF }, From 498250149c74e80552ec1eeafab02a715f924cdb Mon Sep 17 00:00:00 2001 From: JackMacWindows Date: Sat, 11 Jun 2022 20:31:04 +0000 Subject: [PATCH 2/2] Add DFPWM codec to src/misc/fourcc_list.h --- src/misc/fourcc_list.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h index aab5892f55..2643ac2654 100644 --- a/src/misc/fourcc_list.h +++ b/src/misc/fourcc_list.h @@ -1701,6 +1701,8 @@ static const staticentry_t p_list_audio[] = { B(VLC_CODEC_DSD_LSBF_PLANAR, "DSD (Direct Stream Digital) LSB first, planar"), B(VLC_CODEC_DSD_MSBF_PLANAR, "DSD (Direct Stream Digital) MSB first, planar"), + + B(VLC_CODEC_DFPWM, "DFPWM1a audio"), }; static const staticentry_t p_list_spu[] = {