Mercurial > libavformat.hg
changeset 5287:64e6e0d096b9 libavformat
Add Speex support to the FLV muxer.
| author | jbr |
|---|---|
| date | Fri, 16 Oct 2009 03:02:25 +0000 |
| parents | 3ce92654e943 |
| children | 15f34b5059ed |
| files | avformat.h flvenc.c |
| diffstat | 2 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Thu Oct 15 13:55:19 2009 +0000 +++ b/avformat.h Fri Oct 16 03:02:25 2009 +0000 @@ -23,7 +23,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MINOR 39 -#define LIBAVFORMAT_VERSION_MICRO 1 +#define LIBAVFORMAT_VERSION_MICRO 2 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \
--- a/flvenc.c Thu Oct 15 13:55:19 2009 +0000 +++ b/flvenc.c Fri Oct 16 03:02:25 2009 +0000 @@ -43,6 +43,7 @@ {CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET}, {CODEC_ID_AAC, FLV_CODECID_AAC >> FLV_AUDIO_CODECID_OFFSET}, {CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET}, + {CODEC_ID_SPEEX, FLV_CODECID_SPEEX >> FLV_AUDIO_CODECID_OFFSET}, {CODEC_ID_NONE, 0} }; @@ -59,7 +60,22 @@ if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ | FLV_SAMPLESSIZE_16BIT | FLV_STEREO; - else { + else if (enc->codec_id == CODEC_ID_SPEEX) { + if (enc->sample_rate != 16000) { + av_log(enc, AV_LOG_ERROR, "flv only supports wideband (16kHz) Speex audio\n"); + return -1; + } + if (enc->channels != 1) { + av_log(enc, AV_LOG_ERROR, "flv only supports mono Speex audio\n"); + return -1; + } + if (enc->frame_size / 320 > 8) { + av_log(enc, AV_LOG_WARNING, "Warning: Adobe Flash Player is known " + "to have trouble with Speex streams " + "with more than 8 frames per packet.\n"); + } + return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT; + } else { switch (enc->sample_rate) { case 44100: flags |= FLV_SAMPLERATE_44100HZ;