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

Added support for missing codecs in FLV tag library.

Browse source
This commit is contained in:
Thulinma 2014-09-06 14:37:26 +02:00
parent 9adb055f3a
commit 5792097cc4
1 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/flv_tag.cpp
View file

@ -139,23 +139,21 @@ const char * FLV::Tag::getVideoCodec() {
const char * FLV::Tag::getAudioCodec() { const char * FLV::Tag::getAudioCodec() {
switch (data[11] & 0xF0) { switch (data[11] & 0xF0) {
case 0x00: case 0x00:
return "linear PCM PE"; return "PCMPE";
case 0x10: case 0x10:
return "ADPCM"; return "ADPCM";
case 0x20: case 0x20:
return "MP3"; return "MP3";
case 0x30: case 0x30:
return "linear PCM LE"; return "PCM";
case 0x40: case 0x40:
return "Nelly16kHz";
case 0x50: case 0x50:
return "Nelly8kHz";
case 0x60: case 0x60:
return "Nelly"; return "Nellymoser";
case 0x70: case 0x70:
return "G711A-law"; return "G711A";
case 0x80: case 0x80:
return "G711mu-law"; return "G711mu";
case 0x90: case 0x90:
return "reserved"; return "reserved";
case 0xA0: case 0xA0:
@ -163,7 +161,7 @@ const char * FLV::Tag::getAudioCodec() {
case 0xB0: case 0xB0:
return "Speex"; return "Speex";
case 0xE0: case 0xE0:
return "MP38kHz"; return "MP3";
case 0xF0: case 0xF0:
return "DeviceSpecific"; return "DeviceSpecific";
default: default:
@ -444,14 +442,42 @@ bool FLV::Tag::DTSCLoader(DTSC::Packet & packData, DTSC::Track & track) {
} else { } else {
memcpy(data + 12, tmpData, len - 16); memcpy(data + 12, tmpData, len - 16);
} }
unsigned int datarate = track.rate;
data[11] = 0; data[11] = 0;
if (track.codec == "AAC") { if (track.codec == "AAC") {
data[11] |= 0xA0; data[11] |= 0xA0;
} }
if (track.codec == "MP3") { if (track.codec == "MP3") {
if (datarate == 8000){
data[11] |= 0xE0;
}else{
data[11] |= 0x20; data[11] |= 0x20;
} }
unsigned int datarate = track.rate; }
if (track.codec == "ADPCM") {
data[11] |= 0x10;
}
if (track.codec == "PCM") {
data[11] |= 0x30;
}
if (track.codec == "Nellymoser") {
if (datarate == 8000){
data[11] |= 0x50;
}else if(datarate == 16000){
data[11] |= 0x40;
}else{
data[11] |= 0x60;
}
}
if (track.codec == "G711a") {
data[11] |= 0x70;
}
if (track.codec == "G711mu") {
data[11] |= 0x80;
}
if (track.codec == "Speex") {
data[11] |= 0xB0;
}
if (datarate >= 44100) { if (datarate >= 44100) {
data[11] |= 0x0C; data[11] |= 0x0C;
} else if (datarate >= 22050) { } else if (datarate >= 22050) {