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
85de5692
Commit
85de5692
authored
Oct 28, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support G.723.1
parent
4f10df05
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
include/vlc_codecs.h
include/vlc_codecs.h
+3
-0
include/vlc_fourcc.h
include/vlc_fourcc.h
+2
-0
modules/demux/wav.c
modules/demux/wav.c
+1
-0
src/misc/fourcc.c
src/misc/fourcc.c
+4
-0
No files found.
include/vlc_codecs.h
View file @
85de5692
...
...
@@ -285,6 +285,8 @@ ATTR_PACKED
#define WAVE_FORMAT_VORB_2PLUS 0x6770
#define WAVE_FORMAT_VORB_3PLUS 0x6771
#define WAVE_FORMAT_G723_1 0xa100
#define WAVE_FORMAT_SPEEX 0xa109
/* Speex audio */
#define WAVE_FORMAT_FLAC 0xf1ac
/* Xiph Flac */
...
...
@@ -353,6 +355,7 @@ wave_format_tag_to_fourcc[] =
{
WAVE_FORMAT_TRUESPEECH
,
VLC_CODEC_TRUESPEECH
,
"Truespeech"
},
{
WAVE_FORMAT_GSM610
,
VLC_CODEC_GSM_MS
,
"Microsoft WAV GSM"
},
{
WAVE_FORMAT_G726
,
VLC_CODEC_ADPCM_G726
,
"G.726 ADPCM"
},
{
WAVE_FORMAT_G723_1
,
VLC_CODEC_G723_1
,
"G.723.1"
},
{
WAVE_FORMAT_MPEGLAYER3
,
VLC_CODEC_MPGA
,
"Mpeg Audio"
},
{
WAVE_FORMAT_MPEG
,
VLC_CODEC_MPGA
,
"Mpeg Audio"
},
{
WAVE_FORMAT_AMR_NB
,
VLC_CODEC_AMR_NB
,
"AMR NB"
},
...
...
include/vlc_fourcc.h
View file @
85de5692
...
...
@@ -281,6 +281,8 @@
#define VLC_CODEC_ADPCM_IMA_AMV VLC_FOURCC('i','m','a','v')
#define VLC_CODEC_ADPCM_IMA_QT VLC_FOURCC('i','m','a','4')
#define VLC_CODEC_ADPCM_YAMAHA VLC_FOURCC('m','s',0x00,0x20)
#define VLC_CODEC_G723_1 VLC_FOURCC('g','7','2', 0x31)
#define VLC_CODEC_G729 VLC_FOURCC('g','7','2','9')
#define VLC_CODEC_VMDAUDIO VLC_FOURCC('v','m','d','a')
#define VLC_CODEC_AMR_NB VLC_FOURCC('s','a','m','r')
#define VLC_CODEC_AMR_WB VLC_FOURCC('s','a','w','b')
...
...
modules/demux/wav.c
View file @
85de5692
...
...
@@ -343,6 +343,7 @@ static int Open( vlc_object_t * p_this )
case
VLC_CODEC_ADPCM_G726
:
case
VLC_CODEC_TRUESPEECH
:
case
VLC_CODEC_ATRAC3
:
case
VLC_CODEC_G723_1
:
if
(
FrameInfo_MSGSM
(
&
p_sys
->
i_frame_size
,
&
p_sys
->
i_frame_samples
,
&
p_sys
->
fmt
)
)
goto
error
;
...
...
src/misc/fourcc.c
View file @
85de5692
...
...
@@ -1239,6 +1239,10 @@ static const staticentry_t p_list_audio[] = {
B
(
VLC_CODEC_RALF
,
"RealAudio Lossless"
),
A
(
"LSD:"
),
/* G.723.1 */
B
(
VLC_CODEC_G723_1
,
"G.723.1 Audio"
),
A
(
"g72
\x31
"
),
/* PCM */
B
(
VLC_CODEC_S8
,
"PCM S8"
),
A
(
"s8 "
),
...
...
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