videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

vlc_fourcc: add a define for "XAJ\00" (EA ADPCM) 

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
Steve Lhomme 2017-07-06 16:28:34 +02:00 committed by Jean-Baptiste Kempf
parent ac2886e617
commit 788c0561fe
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/vlc_fourcc.h
View File

@ -440,6 +440,7 @@
#define VLC_CODEC_ADPCM_SBPRO_3 VLC_FOURCC('m','s',0x00,0xC3)
#define VLC_CODEC_ADPCM_SBPRO_4 VLC_FOURCC('m','s',0x00,0xC4)
#define VLC_CODEC_ADPCM_THP VLC_FOURCC('T','H','P','A')
#define VLC_CODEC_ADPCM_XA_EA VLC_FOURCC('X','A','J', 0)
#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')

4
modules/codec/adpcm.c
View File

@ -145,7 +145,7 @@ static int OpenDecoder( vlc_object_t *p_this )
case VLC_FOURCC('m','s',0x00,0x11): /* IMA ADPCM */
case VLC_CODEC_ADPCM_DK3:
case VLC_CODEC_ADPCM_DK4:
case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */
case VLC_CODEC_ADPCM_XA_EA:
break;
default:
return VLC_EGENERIC;
@ -189,7 +189,7 @@ static int OpenDecoder( vlc_object_t *p_this )
p_sys->codec = ADPCM_DK3;
i_max_channels = 2;
break;
case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */
case VLC_CODEC_ADPCM_EA: /* EA ADPCM */
p_sys->codec = ADPCM_EA;
p_sys->prev = calloc( 2 * p_dec->fmt_in.audio.i_channels,
sizeof( int16_t ) );

2
modules/demux/xa.c
View File

@ -115,7 +115,7 @@ static int Open( vlc_object_t * p_this )
}
es_format_t fmt;
es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC('X','A','J',0) );
es_format_Init( &fmt, AUDIO_ES, VLC_CODEC_ADPCM_EA );
msg_Dbg( p_demux, "assuming EA ADPCM audio codec" );
fmt.audio.i_rate = GetDWLE( &xa.nSamplesPerSec );

3
src/misc/fourcc_list.h
View File

@ -1308,6 +1308,9 @@ static const staticentry_t p_list_audio[] = {
B(VLC_CODEC_ADPCM_THP, "GameCube THP ADPCM"),
B(VLC_CODEC_ADPCM_XA_EA, "EA-XA ADPCM"),
A("XAJ\x00"),
/* AMR */
B(VLC_CODEC_AMR_NB, "AMR narrow band"),
A("samr"),