Commit c56b9b1e authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Vittorio Giovara

lavc: Add DSS SP decoder

Signed-off-by: 's avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
Signed-off-by: 's avatarVittorio Giovara <vittorio.giovara@gmail.com>
parent 0fbb2713
...@@ -15,6 +15,7 @@ version <next>: ...@@ -15,6 +15,7 @@ version <next>:
- DXVA2-accelerated HEVC decoding - DXVA2-accelerated HEVC decoding
- AAC ELD 480 decoding - AAC ELD 480 decoding
- Intel QSV-accelerated H.264 decoding - Intel QSV-accelerated H.264 decoding
- DSS SP decoder
version 11: version 11:
......
...@@ -820,6 +820,7 @@ following image formats are supported: ...@@ -820,6 +820,7 @@ following image formats are supported:
@tab Used in Bink and Smacker files in many games. @tab Used in Bink and Smacker files in many games.
@item Delphine Software International CIN audio @tab @tab X @item Delphine Software International CIN audio @tab @tab X
@tab Codec used in Delphine Software International games. @tab Codec used in Delphine Software International games.
@item Digital Speech Standard - Standard Play mode (DSS SP) @tab @tab X
@item Discworld II BMV Audio @tab @tab X @item Discworld II BMV Audio @tab @tab X
@item COOK @tab @tab X @item COOK @tab @tab X
@tab All versions except 5.1 are supported. @tab All versions except 5.1 are supported.
......
...@@ -169,6 +169,7 @@ OBJS-$(CONFIG_DPX_DECODER) += dpx.o ...@@ -169,6 +169,7 @@ OBJS-$(CONFIG_DPX_DECODER) += dpx.o
OBJS-$(CONFIG_DPX_ENCODER) += dpxenc.o OBJS-$(CONFIG_DPX_ENCODER) += dpxenc.o
OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinaudio.o OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinaudio.o
OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinvideo.o OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinvideo.o
OBJS-$(CONFIG_DSS_SP_DECODER) += dss_sp.o
OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o
OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o
OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o
......
...@@ -308,6 +308,7 @@ void avcodec_register_all(void) ...@@ -308,6 +308,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(COOK, cook); REGISTER_DECODER(COOK, cook);
REGISTER_DECODER(DCA, dca); REGISTER_DECODER(DCA, dca);
REGISTER_DECODER(DSICINAUDIO, dsicinaudio); REGISTER_DECODER(DSICINAUDIO, dsicinaudio);
REGISTER_DECODER(DSS_SP, dss_sp);
REGISTER_ENCDEC (EAC3, eac3); REGISTER_ENCDEC (EAC3, eac3);
REGISTER_ENCDEC (FLAC, flac); REGISTER_ENCDEC (FLAC, flac);
REGISTER_DECODER(G723_1, g723_1); REGISTER_DECODER(G723_1, g723_1);
......
...@@ -444,6 +444,7 @@ enum AVCodecID { ...@@ -444,6 +444,7 @@ enum AVCodecID {
AV_CODEC_ID_METASOUND, AV_CODEC_ID_METASOUND,
AV_CODEC_ID_PAF_AUDIO, AV_CODEC_ID_PAF_AUDIO,
AV_CODEC_ID_ON2AVC, AV_CODEC_ID_ON2AVC,
AV_CODEC_ID_DSS_SP,
/* subtitle codecs */ /* subtitle codecs */
AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
......
...@@ -2201,6 +2201,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -2201,6 +2201,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .long_name = NULL_IF_CONFIG_SMALL("G.723.1"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_DSS_SP,
.type = AVMEDIA_TYPE_AUDIO,
.name = "dss_sp",
.long_name = NULL_IF_CONFIG_SMALL("Digital Speech Standard - Standard Play mode (DSS SP)"),
.props = AV_CODEC_PROP_LOSSY,
},
{ {
.id = AV_CODEC_ID_G729, .id = AV_CODEC_ID_G729,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
......
This diff is collapsed.
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 14 #define LIBAVCODEC_VERSION_MINOR 15
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment