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
7bd9d66e
Commit
7bd9d66e
authored
Aug 08, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Map Voxware MetaSound Codec IDs
parent
6283a220
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
include/vlc_codecs.h
include/vlc_codecs.h
+3
-0
include/vlc_fourcc.h
include/vlc_fourcc.h
+1
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+4
-0
No files found.
include/vlc_codecs.h
View file @
7bd9d66e
...
...
@@ -235,6 +235,7 @@ ATTR_PACKED
#define WAVE_FORMAT_MPEGLAYER3 0x0055
/* ISO/MPEG Layer3 Format Tag */
#define WAVE_FORMAT_AMR_NB 0x0057
/* AMR NB */
#define WAVE_FORMAT_AMR_WB 0x0058
/* AMR Wideband */
#define WAVE_FORMAT_VOXWARE_RT29 0x0075
/* VoxWare MetaSound */
#define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092
/* Sonic Foundry */
#define WAVE_FORMAT_AAC 0x00FF
/* */
...
...
@@ -396,6 +397,8 @@ wave_format_tag_to_fourcc[] =
{
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_INDEO_AUDIO
,
VLC_CODEC_INDEO_AUDIO
,
"Indeo Audio Coder"
},
{
WAVE_FORMAT_VOXWARE_RT29
,
VLC_CODEC_METASOUND
,
"VoxWare MetaSound"
},
{
WAVE_FORMAT_UNKNOWN
,
VLC_FOURCC
(
'u'
,
'n'
,
'd'
,
'f'
),
"Unknown"
}
};
...
...
include/vlc_fourcc.h
View file @
7bd9d66e
...
...
@@ -364,6 +364,7 @@
#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_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02)
#define VLC_CODEC_METASOUND VLC_FOURCC('m','s',0x00,0x75)
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
...
...
modules/codec/avcodec/fourcc.c
View file @
7bd9d66e
...
...
@@ -414,6 +414,10 @@ static const struct
{
VLC_CODEC_INDEO_AUDIO
,
AV_CODEC_ID_IAC
,
AUDIO_ES
},
#endif
#if LIBAVCODEC_VERSION_CHECK( 55, 15, 0, 24, 100 )
{
VLC_CODEC_METASOUND
,
AV_CODEC_ID_METASOUND
,
AUDIO_ES
},
#endif
/* PCM */
{
VLC_CODEC_S8
,
AV_CODEC_ID_PCM_S8
,
AUDIO_ES
},
{
VLC_CODEC_U8
,
AV_CODEC_ID_PCM_U8
,
AUDIO_ES
},
...
...
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