Mercurial > libavformat.hg

comparison flvenc.c @ 3273:83a8b43761bc libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Nellymoser handling in FLV
author bwolowiec
date Fri, 02 May 2008 19:35:31 +0000
parents 9c5e50e5eac0
children 7370e3ec8bda
comparison
equal deleted inserted replaced
3272:07038dc492ab 3273:83a8b43761bc
37 {CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET}, 37 {CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET},
38 {CODEC_ID_PCM_S8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET}, 38 {CODEC_ID_PCM_S8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET},
39 {CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET}, 39 {CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET},
40 {CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET}, 40 {CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET},
41 {CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET}, 41 {CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET},
42 {CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET},
42 {CODEC_ID_NONE, 0} 43 {CODEC_ID_NONE, 0}
43 }; 44 };
44 45
45 typedef struct FLVContext { 46 typedef struct FLVContext {
46 int hasAudio; 47 int hasAudio;
93 flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT; 94 flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT;
94 break; 95 break;
95 case CODEC_ID_ADPCM_SWF: 96 case CODEC_ID_ADPCM_SWF:
96 flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT; 97 flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT;
97 break; 98 break;
99 case CODEC_ID_NELLYMOSER:
100 flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT;
101 break;
98 case 0: 102 case 0:
99 flags |= enc->codec_tag<<4; 103 flags |= enc->codec_tag<<4;
100 break; 104 break;
101 default: 105 default:
102 av_log(enc, AV_LOG_ERROR, "codec not compatible with flv\n"); 106 av_log(enc, AV_LOG_ERROR, "codec not compatible with flv\n");