flvenc: Support muxing 16 kHz nellymoser

Message ID 1323958203-20761-1-git-send-email-martin@martin.st
State Committed
Commit bd2ff1a8bc01668b66314c20494c839f774de38e
Headers show

Commit Message

Martin Storsjö Dec. 15, 2011, 2:10 p.m.
---
 libavformat/flvenc.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Comments

Luca Barbato Dec. 15, 2011, 2:19 p.m. | #1
On 15/12/11 15:10, Martin Storsjö wrote:
> ---
>   libavformat/flvenc.c |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>

Looks fine.

Patch

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index dfa17e0..623bea7 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -90,6 +90,7 @@  static int get_audio_flags(AVCodecContext *enc){
         case    11025:
             flags |= FLV_SAMPLERATE_11025HZ;
             break;
+        case    16000: //nellymoser only
         case     8000: //nellymoser only
         case     5512: //not mp3
             if(enc->codec_id != CODEC_ID_MP3){
@@ -125,6 +126,8 @@  static int get_audio_flags(AVCodecContext *enc){
     case CODEC_ID_NELLYMOSER:
         if (enc->sample_rate == 8000) {
             flags |= FLV_CODECID_NELLYMOSER_8KHZ_MONO | FLV_SAMPLESSIZE_16BIT;
+        } else if (enc->sample_rate == 16000) {
+            flags |= FLV_CODECID_NELLYMOSER_16KHZ_MONO | FLV_SAMPLESSIZE_16BIT;
         } else {
             flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT;
         }