From 60b425395edbd1abe23ff60e5db0d5fe272d7b6a Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Fri, 7 Apr 2017 16:09:20 +0200
Subject: [PATCH] Fixed FLV/RTMP/HDS A-law and Mu-law support

---
 lib/flv_tag.cpp                       | 8 ++++----
 src/output/output_hds.cpp             | 4 ++--
 src/output/output_progressive_flv.cpp | 4 ++--
 src/output/output_rtmp.cpp            | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/flv_tag.cpp b/lib/flv_tag.cpp
index e6683c35..75822854 100644
--- a/lib/flv_tag.cpp
+++ b/lib/flv_tag.cpp
@@ -194,9 +194,9 @@ const char * FLV::Tag::getAudioCodec() {
     case 0x60:
       return "Nellymoser";
     case 0x70:
-      return "G711A";
+      return "ALAW";
     case 0x80:
-      return "G711mu";
+      return "ULAW";
     case 0x90:
       return "reserved";
     case 0xA0:
@@ -500,10 +500,10 @@ bool FLV::Tag::DTSCLoader(DTSC::Packet & packData, DTSC::Track & track) {
         data[11] |= 0x60;
       }
     }
-    if (track.codec == "G711a") {
+    if (track.codec == "ALAW") {
       data[11] |= 0x70;
     }
-    if (track.codec == "G711mu") {
+    if (track.codec == "ULAW") {
       data[11] |= 0x80;
     }
     if (track.codec == "Speex") {
diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp
index 66377080..d88cd025 100644
--- a/src/output/output_hds.cpp
+++ b/src/output/output_hds.cpp
@@ -156,8 +156,8 @@ namespace Mist {
     capa["codecs"][0u][1u].append("Nellymoser");
     capa["codecs"][0u][1u].append("PCM");
     capa["codecs"][0u][1u].append("ADPCM");
-    capa["codecs"][0u][1u].append("G711a");
-    capa["codecs"][0u][1u].append("G711mu");
+    capa["codecs"][0u][1u].append("ALAW");
+    capa["codecs"][0u][1u].append("ULAW");
     capa["methods"][0u]["handler"] = "http";
     capa["methods"][0u]["type"] = "flash/11";
     capa["methods"][0u]["priority"] = 6ll;
diff --git a/src/output/output_progressive_flv.cpp b/src/output/output_progressive_flv.cpp
index 870f19f8..49dc174a 100644
--- a/src/output/output_progressive_flv.cpp
+++ b/src/output/output_progressive_flv.cpp
@@ -22,8 +22,8 @@ namespace Mist {
     capa["codecs"][0u][1u].append("Nellymoser");
     capa["codecs"][0u][1u].append("PCM");
     capa["codecs"][0u][1u].append("ADPCM");
-    capa["codecs"][0u][1u].append("G711a");
-    capa["codecs"][0u][1u].append("G711mu");
+    capa["codecs"][0u][1u].append("ALAW");
+    capa["codecs"][0u][1u].append("ULAW");
     capa["methods"][0u]["handler"] = "http";
     capa["methods"][0u]["type"] = "flash/7";
     capa["methods"][0u]["priority"] = 5ll;
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 69dbdebc..bf1f8866 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -140,8 +140,8 @@ namespace Mist {
     capa["codecs"][0u][1u].append("Nellymoser");
     capa["codecs"][0u][1u].append("PCM");
     capa["codecs"][0u][1u].append("ADPCM");
-    capa["codecs"][0u][1u].append("G711a");
-    capa["codecs"][0u][1u].append("G711mu");
+    capa["codecs"][0u][1u].append("ALAW");
+    capa["codecs"][0u][1u].append("ULAW");
     capa["methods"][0u]["handler"] = "rtmp";
     capa["methods"][0u]["type"] = "flash/10";
     capa["methods"][0u]["priority"] = 7ll;
@@ -243,10 +243,10 @@ namespace Mist {
           dataheader[0] |= 0x60;
         }
       }
-      if (track.codec == "G711a") {
+      if (track.codec == "ALAW") {
         dataheader[0] |= 0x70;
       }
-      if (track.codec == "G711mu") {
+      if (track.codec == "ULAW") {
         dataheader[0] |= 0x80;
       }
       if (track.codec == "Speex") {