generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make RIFF-based demuxers handle F32LE and F64LE PCM audio.

Browse Source 
Originally committed as revision 14835 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2008-08-19 10:54:30 +00:00
parent 7b21690a91
commit 57406d8eb8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/riff.c
View File

@ -171,6 +171,8 @@ const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_PCM_S24LE, 0x0001 }, { CODEC_ID_PCM_S24LE, 0x0001 },
{ CODEC_ID_PCM_S32LE, 0x0001 }, { CODEC_ID_PCM_S32LE, 0x0001 },
{ CODEC_ID_ADPCM_MS, 0x0002 }, { CODEC_ID_ADPCM_MS, 0x0002 },
{ CODEC_ID_PCM_F32LE, 0x0003 },
{ CODEC_ID_PCM_F64LE, 0x0003 }, /* must come after f32le in this list */
{ CODEC_ID_PCM_ALAW, 0x0006 }, { CODEC_ID_PCM_ALAW, 0x0006 },
{ CODEC_ID_PCM_MULAW, 0x0007 }, { CODEC_ID_PCM_MULAW, 0x0007 },
{ CODEC_ID_WMAVOICE, 0x000A }, { CODEC_ID_WMAVOICE, 0x000A },
@ -252,8 +254,10 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
bps = 4; bps = 4;
} else if (enc->codec_id == CODEC_ID_PCM_S24LE) { } else if (enc->codec_id == CODEC_ID_PCM_S24LE) {
bps = 24; bps = 24;
} else if (enc->codec_id == CODEC_ID_PCM_S32LE) { } else if (enc->codec_id == CODEC_ID_PCM_S32LE || enc->codec_id == CODEC_ID_PCM_F32LE) {
bps = 32; bps = 32;
} else if (enc->codec_id == CODEC_ID_PCM_F64LE) {
bps = 64;
} else { } else {
bps = 16; bps = 16;
} }
@ -273,6 +277,8 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
if (enc->codec_id == CODEC_ID_PCM_U8 || if (enc->codec_id == CODEC_ID_PCM_U8 ||
enc->codec_id == CODEC_ID_PCM_S24LE || enc->codec_id == CODEC_ID_PCM_S24LE ||
enc->codec_id == CODEC_ID_PCM_S32LE || enc->codec_id == CODEC_ID_PCM_S32LE ||
enc->codec_id == CODEC_ID_PCM_F32LE ||
enc->codec_id == CODEC_ID_PCM_F64LE ||
enc->codec_id == CODEC_ID_PCM_S16LE) { enc->codec_id == CODEC_ID_PCM_S16LE) {
bytespersec = enc->sample_rate * blkalign; bytespersec = enc->sample_rate * blkalign;
} else { } else {
@ -410,6 +416,8 @@ int wav_codec_get_id(unsigned int tag, int bps)
id = CODEC_ID_PCM_S24LE; id = CODEC_ID_PCM_S24LE;
if (id == CODEC_ID_PCM_S16LE && bps == 32) if (id == CODEC_ID_PCM_S16LE && bps == 32)
id = CODEC_ID_PCM_S32LE; id = CODEC_ID_PCM_S32LE;
if (id == CODEC_ID_PCM_F32LE && bps == 64)
id = CODEC_ID_PCM_F64LE;
if (id == CODEC_ID_ADPCM_IMA_WAV && bps == 8) if (id == CODEC_ID_ADPCM_IMA_WAV && bps == 8)
id = CODEC_ID_PCM_ZORK; id = CODEC_ID_PCM_ZORK;
return id; return id;