summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Smelykh <ilya.smelykh@gmail.com>2019-02-08 16:10:25 +0000
committerTim-Philipp Müller <tim@centricular.com>2019-05-06 23:43:07 +0200
commit3bc7fc1fe457e6a97dcda3f58c07c44f87c69da3 (patch)
tree5bed32bad4b2b3ad5f0510960e60ad555e6740ee
parent3ebeac676ce6fa1d83e3a7518eb67170e431b707 (diff)
downloadgstreamer-plugins-good-3bc7fc1fe457e6a97dcda3f58c07c44f87c69da3.tar.gz
flvmux: Use 8kHz sample rate for alaw/mulaw audio
-rw-r--r--gst/flv/gstflvmux.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index 50bcda0ee..4446c6ea4 100644
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -84,8 +84,8 @@ static GstStaticPadTemplate audiosink_templ = GST_STATIC_PAD_TEMPLATE ("audio",
"audio/mpeg, mpegversion = (int) { 4, 2 }, stream-format = (string) raw; "
"audio/x-nellymoser, channels = (int) { 1, 2 }, rate = (int) { 5512, 8000, 11025, 16000, 22050, 44100 }; "
"audio/x-raw, format = (string) { U8, S16LE}, layout = (string) interleaved, channels = (int) { 1, 2 }, rate = (int) { 5512, 11025, 22050, 44100 }; "
- "audio/x-alaw, channels = (int) { 1, 2 }, rate = (int) { 5512, 11025, 22050, 44100 }; "
- "audio/x-mulaw, channels = (int) { 1, 2 }, rate = (int) { 5512, 11025, 22050, 44100 }; "
+ "audio/x-alaw, channels = (int) { 1, 2 }, rate = (int) 8000; "
+ "audio/x-mulaw, channels = (int) { 1, 2 }, rate = (int) 8000; "
"audio/x-speex, channels = (int) 1, rate = (int) 16000;")
);
@@ -517,7 +517,8 @@ gst_flv_mux_audio_pad_setcaps (GstFlvMuxPad * pad, GstCaps * caps)
pad->rate = 2;
else if (rate == 44100)
pad->rate = 3;
- else if (rate == 8000 && (pad->codec == 5 || pad->codec == 14))
+ else if (rate == 8000 && (pad->codec == 5 || pad->codec == 14
+ || pad->codec == 7 || pad->codec == 8))
pad->rate = 0;
else if (rate == 16000 && (pad->codec == 4 || pad->codec == 11))
pad->rate = 0;