Mercurial > libavformat.hg
changeset 3746:d9d8ee457c22 libavformat
matroska: add support for most variants of PCM
| author | aurel |
|---|---|
| date | Wed, 20 Aug 2008 00:49:45 +0000 |
| parents | 47807c439186 |
| children | b8f428926617 |
| files | matroska.c matroskadec.c |
| diffstat | 2 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/matroska.c Wed Aug 20 00:44:25 2008 +0000 +++ b/matroska.c Wed Aug 20 00:49:45 2008 +0000 @@ -41,9 +41,15 @@ {"A_MPEG/L3" , CODEC_ID_MP3}, {"A_MPEG/L2" , CODEC_ID_MP2}, {"A_MPEG/L1" , CODEC_ID_MP2}, - {"A_PCM/INT/BIG" , CODEC_ID_PCM_U16BE}, - {"A_PCM/INT/LIT" , CODEC_ID_PCM_U16LE}, -// {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE}, + {"A_PCM/INT/BIG" , CODEC_ID_PCM_S16BE}, + {"A_PCM/INT/BIG" , CODEC_ID_PCM_S24BE}, + {"A_PCM/INT/BIG" , CODEC_ID_PCM_S32BE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_S16LE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_S24LE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_S32LE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_U8}, + {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE}, + {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE}, {"A_AC3" , CODEC_ID_AC3}, // {"A_EAC3" , CODEC_ID_EAC3}, {"A_DTS" , CODEC_ID_DTS},
--- a/matroskadec.c Wed Aug 20 00:44:25 2008 +0000 +++ b/matroskadec.c Wed Aug 20 00:49:45 2008 +0000 @@ -1162,6 +1162,20 @@ && (track->codec_priv.data != NULL)) { track->video.fourcc = AV_RL32(track->codec_priv.data); codec_id=codec_get_id(codec_movvideo_tags, track->video.fourcc); + } else if (codec_id == CODEC_ID_PCM_S16BE) { + switch (track->audio.bitdepth) { + case 8: codec_id = CODEC_ID_PCM_U8; break; + case 24: codec_id = CODEC_ID_PCM_S24BE; break; + case 32: codec_id = CODEC_ID_PCM_S32BE; break; + } + } else if (codec_id == CODEC_ID_PCM_S16LE) { + switch (track->audio.bitdepth) { + case 8: codec_id = CODEC_ID_PCM_U8; break; + case 24: codec_id = CODEC_ID_PCM_S24LE; break; + case 32: codec_id = CODEC_ID_PCM_S32LE; break; + } + } else if (codec_id==CODEC_ID_PCM_F32LE && track->audio.bitdepth==64) { + codec_id = CODEC_ID_PCM_F64LE; } else if (codec_id == CODEC_ID_AAC && !track->codec_priv.size) { int profile = matroska_aac_profile(track->codec_id); int sri = matroska_aac_sri(track->audio.samplerate);