Mercurial > libavformat.hg

comparison riff.c @ 3693:2f769a4057e7 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support muxing of Zork PCM audio into RIFF formats.
author pross
date Tue, 05 Aug 2008 10:38:25 +0000
parents f615c35681cf
children 98156a539790
comparison
equal deleted inserted replaced
3692:e8f67b6063c3 3693:2f769a4057e7
172 { CODEC_ID_ADPCM_MS, 0x0002 }, 172 { CODEC_ID_ADPCM_MS, 0x0002 },
173 { CODEC_ID_PCM_ALAW, 0x0006 }, 173 { CODEC_ID_PCM_ALAW, 0x0006 },
174 { CODEC_ID_PCM_MULAW, 0x0007 }, 174 { CODEC_ID_PCM_MULAW, 0x0007 },
175 { CODEC_ID_WMAVOICE, 0x000A }, 175 { CODEC_ID_WMAVOICE, 0x000A },
176 { CODEC_ID_ADPCM_IMA_WAV, 0x0011 }, 176 { CODEC_ID_ADPCM_IMA_WAV, 0x0011 },
177 { CODEC_ID_PCM_ZORK, 0x0011 }, /* must come after adpcm_ima_wav in this list */
177 { CODEC_ID_ADPCM_YAMAHA, 0x0020 }, 178 { CODEC_ID_ADPCM_YAMAHA, 0x0020 },
178 { CODEC_ID_TRUESPEECH, 0x0022 }, 179 { CODEC_ID_TRUESPEECH, 0x0022 },
179 { CODEC_ID_GSM_MS, 0x0031 }, 180 { CODEC_ID_GSM_MS, 0x0031 },
180 { CODEC_ID_ADPCM_G726, 0x0045 }, 181 { CODEC_ID_ADPCM_G726, 0x0045 },
181 { CODEC_ID_MP2, 0x0050 }, 182 { CODEC_ID_MP2, 0x0050 },
239 put_le16(pb, enc->codec_tag); 240 put_le16(pb, enc->codec_tag);
240 put_le16(pb, enc->channels); 241 put_le16(pb, enc->channels);
241 put_le32(pb, enc->sample_rate); 242 put_le32(pb, enc->sample_rate);
242 if (enc->codec_id == CODEC_ID_PCM_U8 || 243 if (enc->codec_id == CODEC_ID_PCM_U8 ||
243 enc->codec_id == CODEC_ID_PCM_ALAW || 244 enc->codec_id == CODEC_ID_PCM_ALAW ||
244 enc->codec_id == CODEC_ID_PCM_MULAW) { 245 enc->codec_id == CODEC_ID_PCM_MULAW ||
246 enc->codec_id == CODEC_ID_PCM_ZORK) {
245 bps = 8; 247 bps = 8;
246 } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) { 248 } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) {
247 bps = 0; 249 bps = 0;
248 } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { // 250 } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { //
249 bps = 4; 251 bps = 4;