Commit fd13030d authored by Jean-Paul Saman's avatar Jean-Paul Saman

davinci: add g711 encoder and decoder fourcc's

parent d6755c78
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#define DAVINCI_HAS_MPEG4_CODEC #define DAVINCI_HAS_MPEG4_CODEC
#define DAVINCI_HAS_H264_CODEC #define DAVINCI_HAS_H264_CODEC
#define DAVINCI_HAS_VC1_CODEC #define DAVINCI_HAS_VC1_CODEC
#define DAVINCI_HAS_G711_CODEC
#undef DAVINCI_HAS_MP3_CODEC #undef DAVINCI_HAS_MP3_CODEC
#undef DAVINCI_HAS_AAC_CODEC #undef DAVINCI_HAS_AAC_CODEC
...@@ -55,6 +56,7 @@ ...@@ -55,6 +56,7 @@
#define DAVINIC_DEC_MP3 "mp3dec" #define DAVINIC_DEC_MP3 "mp3dec"
#define DAVINCI_DEC_AAC "aacdec" #define DAVINCI_DEC_AAC "aacdec"
#define DAVINCI_DEC_G711 "g711dec"
/* encoders */ /* encoders */
#define DAVINCI_ENC_MPEG1 "mpegenc" #define DAVINCI_ENC_MPEG1 "mpegenc"
...@@ -63,6 +65,8 @@ ...@@ -63,6 +65,8 @@
#define DAVINCI_ENC_H264 "h264enc" #define DAVINCI_ENC_H264 "h264enc"
#define DAVINCI_ENC_VC1 "vc1enc" #define DAVINCI_ENC_VC1 "vc1enc"
#define DAVINCI_ENC_G711 "g711enc"
#define DAVINIC_NONE "" #define DAVINIC_NONE ""
static const struct static const struct
...@@ -384,6 +388,43 @@ static const struct ...@@ -384,6 +388,43 @@ static const struct
AUDIO_ES, "MPEG AAC Audio" }, AUDIO_ES, "MPEG AAC Audio" },
{ VLC_FOURCC('a','a','c',' '), DAVINCI_DEC_AAC, DAVINIC_NONE, { VLC_FOURCC('a','a','c',' '), DAVINCI_DEC_AAC, DAVINIC_NONE,
AUDIO_ES, "MPEG AAC Audio" }, AUDIO_ES, "MPEG AAC Audio" },
#endif
#ifdef DAVINCI_HAS_G711_CODEC
/* PCM Audio */
{ VLC_FOURCC('s','8',' ',' '), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM S8" },
{ VLC_FOURCC('u','8',' ',' '), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM U8" },
{ VLC_FOURCC('s','1','6','l'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM S16 LE" },
{ VLC_FOURCC('s','1','6','b'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM S16 BE" },
{ VLC_FOURCC('u','1','6','l'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM U16 LE" },
{ VLC_FOURCC('u','1','6','b'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM U16 BE" },
{ VLC_FOURCC('s','2','4','l'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM S24 LE" },
{ VLC_FOURCC('s','2','4','b'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM S24 BE" },
{ VLC_FOURCC('u','2','4','l'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM U24 LE" },
{ VLC_FOURCC('u','2','4','b'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM U24 BE" },
{ VLC_FOURCC('s','3','2','l'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM S32 LE" },
{ VLC_FOURCC('s','3','2','b'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM S32 BE" },
{ VLC_FOURCC('u','3','2','l'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM U32 LE" },
{ VLC_FOURCC('u','3','2','b'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM U32 BE" },
{ VLC_FOURCC('a','l','a','w'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM ALAW" },
{ VLC_FOURCC('u','l','a','w'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM ULAW" },
{ VLC_FOURCC('d','a','u','d'), DAVINCI_DEC_G711, DAVINCI_ENC_G711,
AUDIO_ES, "PCM ULAW" },
#endif #endif
{ 0, "", "", 0, "" } { 0, "", "", 0, "" }
}; };
......
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