Mercurial > libavformat.hg

comparison matroskadec.c @ 3746:d9d8ee457c22 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
matroska: add support for most variants of PCM
author aurel
date Wed, 20 Aug 2008 00:49:45 +0000
parents 47807c439186
children b8f428926617
comparison
equal deleted inserted replaced
3745:47807c439186 3746:d9d8ee457c22
1160 } else if (!strcmp(track->codec_id, "V_QUICKTIME") 1160 } else if (!strcmp(track->codec_id, "V_QUICKTIME")
1161 && (track->codec_priv.size >= 86) 1161 && (track->codec_priv.size >= 86)
1162 && (track->codec_priv.data != NULL)) { 1162 && (track->codec_priv.data != NULL)) {
1163 track->video.fourcc = AV_RL32(track->codec_priv.data); 1163 track->video.fourcc = AV_RL32(track->codec_priv.data);
1164 codec_id=codec_get_id(codec_movvideo_tags, track->video.fourcc); 1164 codec_id=codec_get_id(codec_movvideo_tags, track->video.fourcc);
1165 } else if (codec_id == CODEC_ID_PCM_S16BE) {
1166 switch (track->audio.bitdepth) {
1167 case 8: codec_id = CODEC_ID_PCM_U8; break;
1168 case 24: codec_id = CODEC_ID_PCM_S24BE; break;
1169 case 32: codec_id = CODEC_ID_PCM_S32BE; break;
1170 }
1171 } else if (codec_id == CODEC_ID_PCM_S16LE) {
1172 switch (track->audio.bitdepth) {
1173 case 8: codec_id = CODEC_ID_PCM_U8; break;
1174 case 24: codec_id = CODEC_ID_PCM_S24LE; break;
1175 case 32: codec_id = CODEC_ID_PCM_S32LE; break;
1176 }
1177 } else if (codec_id==CODEC_ID_PCM_F32LE && track->audio.bitdepth==64) {
1178 codec_id = CODEC_ID_PCM_F64LE;
1165 } else if (codec_id == CODEC_ID_AAC && !track->codec_priv.size) { 1179 } else if (codec_id == CODEC_ID_AAC && !track->codec_priv.size) {
1166 int profile = matroska_aac_profile(track->codec_id); 1180 int profile = matroska_aac_profile(track->codec_id);
1167 int sri = matroska_aac_sri(track->audio.samplerate); 1181 int sri = matroska_aac_sri(track->audio.samplerate);
1168 extradata = av_malloc(5); 1182 extradata = av_malloc(5);
1169 if (extradata == NULL) 1183 if (extradata == NULL)