hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed FLV/RTMP/HDS A-law and Mu-law support

Browse source
This commit is contained in:
Thulinma 2017-04-07 16:09:20 +02:00
parent d158ba3213
commit 66ecd88130
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/flv_tag.cpp
View file

@ -194,9 +194,9 @@ const char * FLV::Tag::getAudioCodec() {
case 0x60: case 0x60:
return "Nellymoser"; return "Nellymoser";
case 0x70: case 0x70:
return "G711A"; return "ALAW";
case 0x80: case 0x80:
return "G711mu"; return "ULAW";
case 0x90: case 0x90:
return "reserved"; return "reserved";
case 0xA0: case 0xA0:
@ -500,10 +500,10 @@ bool FLV::Tag::DTSCLoader(DTSC::Packet & packData, DTSC::Track & track) {
data[11] |= 0x60; data[11] |= 0x60;
} }
} }
if (track.codec == "G711a") { if (track.codec == "ALAW") {
data[11] |= 0x70; data[11] |= 0x70;
} }
if (track.codec == "G711mu") { if (track.codec == "ULAW") {
data[11] |= 0x80; data[11] |= 0x80;
} }
if (track.codec == "Speex") { if (track.codec == "Speex") {

4
src/output/output_hds.cpp
View file

@ -158,8 +158,8 @@ namespace Mist {
capa["codecs"][0u][1u].append("Nellymoser"); capa["codecs"][0u][1u].append("Nellymoser");
capa["codecs"][0u][1u].append("PCM"); capa["codecs"][0u][1u].append("PCM");
capa["codecs"][0u][1u].append("ADPCM"); capa["codecs"][0u][1u].append("ADPCM");
capa["codecs"][0u][1u].append("G711a"); capa["codecs"][0u][1u].append("ALAW");
capa["codecs"][0u][1u].append("G711mu"); capa["codecs"][0u][1u].append("ULAW");
capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["handler"] = "http";
capa["methods"][0u]["type"] = "flash/11"; capa["methods"][0u]["type"] = "flash/11";
capa["methods"][0u]["priority"] = 6ll; capa["methods"][0u]["priority"] = 6ll;

4
src/output/output_progressive_flv.cpp
View file

@ -49,8 +49,8 @@ namespace Mist {
capa["codecs"][0u][1u].append("Nellymoser"); capa["codecs"][0u][1u].append("Nellymoser");
capa["codecs"][0u][1u].append("PCM"); capa["codecs"][0u][1u].append("PCM");
capa["codecs"][0u][1u].append("ADPCM"); capa["codecs"][0u][1u].append("ADPCM");
capa["codecs"][0u][1u].append("G711a"); capa["codecs"][0u][1u].append("ALAW");
capa["codecs"][0u][1u].append("G711mu"); capa["codecs"][0u][1u].append("ULAW");
capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["handler"] = "http";
capa["methods"][0u]["type"] = "flash/7"; capa["methods"][0u]["type"] = "flash/7";
capa["methods"][0u]["priority"] = 5ll; capa["methods"][0u]["priority"] = 5ll;

8
src/output/output_rtmp.cpp
View file

@ -266,8 +266,8 @@ namespace Mist {
capa["codecs"][0u][1u].append("Nellymoser"); capa["codecs"][0u][1u].append("Nellymoser");
capa["codecs"][0u][1u].append("PCM"); capa["codecs"][0u][1u].append("PCM");
capa["codecs"][0u][1u].append("ADPCM"); capa["codecs"][0u][1u].append("ADPCM");
capa["codecs"][0u][1u].append("G711a"); capa["codecs"][0u][1u].append("ALAW");
capa["codecs"][0u][1u].append("G711mu"); capa["codecs"][0u][1u].append("ULAW");
capa["methods"][0u]["handler"] = "rtmp"; capa["methods"][0u]["handler"] = "rtmp";
capa["methods"][0u]["type"] = "flash/10"; capa["methods"][0u]["type"] = "flash/10";
capa["methods"][0u]["priority"] = 7ll; capa["methods"][0u]["priority"] = 7ll;
@ -384,10 +384,10 @@ namespace Mist {
dataheader[0] |= 0x60; dataheader[0] |= 0x60;
} }
} }
if (track.codec == "G711a") { if (track.codec == "ALAW") {
dataheader[0] |= 0x70; dataheader[0] |= 0x70;
} }
if (track.codec == "G711mu") { if (track.codec == "ULAW") {
dataheader[0] |= 0x80; dataheader[0] |= 0x80;
} }
if (track.codec == "Speex") { if (track.codec == "Speex") {