Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
1c3283dc
Commit
1c3283dc
authored
Jun 08, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Indeo Audio codecs and wave format tags
parent
b617ab5f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
0 deletions
+7
-0
include/vlc_codecs.h
include/vlc_codecs.h
+3
-0
include/vlc_fourcc.h
include/vlc_fourcc.h
+1
-0
src/misc/fourcc.c
src/misc/fourcc.c
+3
-0
No files found.
include/vlc_codecs.h
View file @
1c3283dc
...
@@ -250,6 +250,8 @@ ATTR_PACKED
...
@@ -250,6 +250,8 @@ ATTR_PACKED
#define WAVE_FORMAT_ATRAC3 0x0270
/* Atrac3, != from MSDN doc */
#define WAVE_FORMAT_ATRAC3 0x0270
/* Atrac3, != from MSDN doc */
#define WAVE_FORMAT_SONY_ATRAC3 0x0272
/* Atrac3, != from MSDN doc */
#define WAVE_FORMAT_SONY_ATRAC3 0x0272
/* Atrac3, != from MSDN doc */
#define WAVE_FORMAT_INDEO_AUDIO 0x0402
/* Indeo Audio Coder */
#define WAVE_FORMAT_AAC_2 0x1601
/* Other AAC */
#define WAVE_FORMAT_AAC_2 0x1601
/* Other AAC */
#define WAVE_FORMAT_AAC_LATM 0x1602
/* AAC/LATM */
#define WAVE_FORMAT_AAC_LATM 0x1602
/* AAC/LATM */
...
@@ -386,6 +388,7 @@ wave_format_tag_to_fourcc[] =
...
@@ -386,6 +388,7 @@ wave_format_tag_to_fourcc[] =
{
WAVE_FORMAT_GSM_AMR
,
VLC_CODEC_AMR_NB
,
"GSM-AMR Audio VBR, SID"
},
{
WAVE_FORMAT_GSM_AMR
,
VLC_CODEC_AMR_NB
,
"GSM-AMR Audio VBR, SID"
},
{
WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC
,
VLC_CODEC_ULEAD_DV_AUDIO_NTSC
,
"Ulead DV audio NTSC"
},
{
WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC
,
VLC_CODEC_ULEAD_DV_AUDIO_NTSC
,
"Ulead DV audio NTSC"
},
{
WAVE_FORMAT_ULEAD_DV_AUDIO_PAL
,
VLC_CODEC_ULEAD_DV_AUDIO_PAL
,
"Ulead DV audio PAL"
},
{
WAVE_FORMAT_ULEAD_DV_AUDIO_PAL
,
VLC_CODEC_ULEAD_DV_AUDIO_PAL
,
"Ulead DV audio PAL"
},
{
WAVE_FORMAT_INDEO_AUDIO
,
VLC_CODEC_INDEO_AUDIO
,
"Indeo Audio Coder"
},
{
WAVE_FORMAT_UNKNOWN
,
VLC_FOURCC
(
'u'
,
'n'
,
'd'
,
'f'
),
"Unknown"
}
{
WAVE_FORMAT_UNKNOWN
,
VLC_FOURCC
(
'u'
,
'n'
,
'd'
,
'f'
),
"Unknown"
}
};
};
...
...
include/vlc_fourcc.h
View file @
1c3283dc
...
@@ -332,6 +332,7 @@
...
@@ -332,6 +332,7 @@
#define VLC_CODEC_BMVAUDIO VLC_FOURCC('B','M','V','A')
#define VLC_CODEC_BMVAUDIO VLC_FOURCC('B','M','V','A')
#define VLC_CODEC_ULEAD_DV_AUDIO_NTSC VLC_FOURCC('m','s',0x02,0x15)
#define VLC_CODEC_ULEAD_DV_AUDIO_NTSC VLC_FOURCC('m','s',0x02,0x15)
#define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16)
#define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16)
#define VLC_CODEC_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02)
/* Subtitle */
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
...
...
src/misc/fourcc.c
View file @
1c3283dc
...
@@ -1290,6 +1290,9 @@ static const entry_t p_list_audio[] = {
...
@@ -1290,6 +1290,9 @@ static const entry_t p_list_audio[] = {
B
(
VLC_CODEC_ULEAD_DV_AUDIO_PAL
,
"Ulead DV audio PAL"
),
B
(
VLC_CODEC_ULEAD_DV_AUDIO_PAL
,
"Ulead DV audio PAL"
),
A
(
"ms
\x02\x16
"
),
A
(
"ms
\x02\x16
"
),
B
(
VLC_CODEC_INDEO_AUDIO
,
"Indeo Audio Coder"
),
A
(
"ms
\x04\x02
"
),
B
(
0
,
""
)
B
(
0
,
""
)
};
};
static
const
entry_t
p_list_spu
[]
=
{
static
const
entry_t
p_list_spu
[]
=
{
...
...
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