Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
fd13030d
Commit
fd13030d
authored
Jan 07, 2010
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
davinci: add g711 encoder and decoder fourcc's
parent
d6755c78
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
0 deletions
+41
-0
modules/codec/davinci/fourcc.c
modules/codec/davinci/fourcc.c
+41
-0
No files found.
modules/codec/davinci/fourcc.c
View file @
fd13030d
...
...
@@ -42,6 +42,7 @@
#define DAVINCI_HAS_MPEG4_CODEC
#define DAVINCI_HAS_H264_CODEC
#define DAVINCI_HAS_VC1_CODEC
#define DAVINCI_HAS_G711_CODEC
#undef DAVINCI_HAS_MP3_CODEC
#undef DAVINCI_HAS_AAC_CODEC
...
...
@@ -55,6 +56,7 @@
#define DAVINIC_DEC_MP3 "mp3dec"
#define DAVINCI_DEC_AAC "aacdec"
#define DAVINCI_DEC_G711 "g711dec"
/* encoders */
#define DAVINCI_ENC_MPEG1 "mpegenc"
...
...
@@ -63,6 +65,8 @@
#define DAVINCI_ENC_H264 "h264enc"
#define DAVINCI_ENC_VC1 "vc1enc"
#define DAVINCI_ENC_G711 "g711enc"
#define DAVINIC_NONE ""
static
const
struct
...
...
@@ -384,6 +388,43 @@ static const struct
AUDIO_ES
,
"MPEG AAC Audio"
},
{
VLC_FOURCC
(
'a'
,
'a'
,
'c'
,
' '
),
DAVINCI_DEC_AAC
,
DAVINIC_NONE
,
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
{
0
,
""
,
""
,
0
,
""
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment