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

More TS-related improvements, to ADTS support specifically.

Browse source
This commit is contained in:
Thulinma 2016-07-07 13:20:12 +02:00
parent f7473bd26a
commit bd38fd20c3
4 changed files with 55 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
lib/adts.cpp
View file

@ -20,8 +20,8 @@ namespace aac {
bool adts::sameHeader(const adts & rhs) const {
if (len < 7 || rhs.len < 7){return false;}
return (memcmp(data, rhs.data, 7) == 0);
if (!rhs || !*this){return false;}
return (getAACProfile() == rhs.getAACProfile() && getFrequencyIndex() == rhs.getFrequencyIndex() && getChannelConfig() == rhs.getChannelConfig());
}
adts::adts(const adts & rhs){
@ -46,14 +46,14 @@ namespace aac {
}
}
unsigned long adts::getAACProfile(){
unsigned long adts::getAACProfile() const{
if (!data || !len){
return 0;
}
return ((data[2] >> 6) & 0x03) + 1;
}
unsigned long adts::getFrequencyIndex(){
unsigned long adts::getFrequencyIndex() const{
if (!data || !len){
return 0;
}
@ -61,7 +61,7 @@ namespace aac {
}
unsigned long adts::getFrequency(){
unsigned long adts::getFrequency() const{
if (!data || len < 3){
return 0;
}
@ -83,28 +83,28 @@ namespace aac {
}
}
unsigned long adts::getChannelConfig(){
unsigned long adts::getChannelConfig() const{
if (!data || !len){
return 0;
}
return ((data[2] & 0x01) << 2) | ((data[3] >> 6) & 0x03);
}
unsigned long adts::getChannelCount(){
unsigned long adts::getChannelCount() const{
if (!data || !len){
return 0;
}
return (getChannelConfig() == 7 ? 8 : getChannelConfig());
}
unsigned long adts::getHeaderSize(){
unsigned long adts::getHeaderSize() const{
if (!data || !len){
return 0;
}
return (data[1] & 0x01 ? 7 : 9);
}
unsigned long adts::getPayloadSize(){
unsigned long adts::getPayloadSize() const{
if (!data || len < 6){
return 0;
}
@ -122,7 +122,7 @@ namespace aac {
return ret;
}
unsigned long adts::getSampleCount(){
unsigned long adts::getSampleCount() const{
if (!data || len < 7){
return 0;
}
@ -135,11 +135,32 @@ namespace aac {
}
return data + getHeaderSize();
}
std::string adts::toPrettyString(){
std::string adts::toPrettyString() const{
std::stringstream res;
res << "SyncWord: " << std::hex << (((int)data[0] << 4) | ((data[1] >> 4) & 0x0F)) << std::endl;
res << "HeaderSize: " << std::dec << getHeaderSize() << std::endl;
res << "PayloadSize: " << std::dec << getPayloadSize() << std::endl;
res << "ADTS packet (payload size: " << getPayloadSize() << ")" << std::endl;
int syncWord = (((int)data[0] << 4) | ((data[1] >> 4) & 0x0F));
if (syncWord != 0xfff){
res << " Sync word " << std::hex << syncWord << " != fff!" << std::endl;
}
if (data[1] & 0x8 == 0x8){
res << " MPEG-2" << std::endl;
}else{
res << " MPEG-4" << std::endl;
}
if (data[1] & 0x6 != 0){
res << " Non-zero layer!" << std::endl;
}
if (data[1] & 0x1 == 0x0){
res << " CRC present" << std::endl;
}
res << " MPEG-4 audio object type: " << getAACProfile() << std::endl;
res << " Frequency: " << getFrequency() << "Hz" << std::endl;
res << " Channels: " << getChannelCount() << std::endl;
res << " Samples: " << getSampleCount() << std::endl;
return res.str();
}
adts::operator bool() const{
return (((int)data[0] << 4) | ((data[1] >> 4) & 0x0F)) == 0xfff && getFrequency();
}
}

19
lib/adts.h
View file

@ -9,16 +9,17 @@ namespace aac {
~adts();
adts& operator = (const adts & rhs);
bool sameHeader(const adts & rhs) const;
unsigned long getAACProfile();
unsigned long getFrequencyIndex();
unsigned long getFrequency();
unsigned long getChannelConfig();
unsigned long getChannelCount();
unsigned long getHeaderSize();
unsigned long getPayloadSize();
unsigned long getSampleCount();
unsigned long getAACProfile() const;
unsigned long getFrequencyIndex() const;
unsigned long getFrequency() const;
unsigned long getChannelConfig() const;
unsigned long getChannelCount() const;
unsigned long getHeaderSize() const;
unsigned long getPayloadSize() const;
unsigned long getSampleCount() const;
char * getPayload();
std::string toPrettyString();
std::string toPrettyString() const;
operator bool() const;
private:
char * data;
unsigned long len;

9
lib/ts_stream.cpp
View file

@ -418,15 +418,18 @@ namespace TS {
}
while (offsetInPes < realPayloadSize){
aac::adts adtsPack(pesPayload + offsetInPes, realPayloadSize - offsetInPes);
if (adtsPack.getFrequency() && adtsPack.getPayloadSize()){
if (adtsPack){
if (!adtsInfo.count(tid) || !adtsInfo[tid].sameHeader(adtsPack)){
MEDIUM_MSG("Setting new ADTS header: %s", adtsPack.toPrettyString().c_str());
adtsInfo[tid] = adtsPack;
}
outPackets[tid].push_back(DTSC::Packet());
outPackets[tid].back().genericFill(timeStamp + ((samplesRead * 1000) / adtsPack.getFrequency()), timeOffset, tid, adtsPack.getPayload(), adtsPack.getPayloadSize(), bPos, 0);
samplesRead += adtsPack.getSampleCount();
offsetInPes += adtsPack.getHeaderSize() + adtsPack.getPayloadSize();
}else{
offsetInPes++;
}
samplesRead += adtsPack.getSampleCount();
offsetInPes += adtsPack.getHeaderSize() + adtsPack.getPayloadSize();
}
if (threaded){
globalSem.post();

6
src/analysers/ts_analyser.cpp
View file

@ -35,6 +35,7 @@ namespace Analysers {
if (d[0] != 0 || d[1] != 0 || d[2] != 1){
res << " [!!! INVALID START CODE: " << (int)d[0] << " " << (int)d[1] << " " << (int)d[2] << " ]";
}
unsigned int padding = 0;
if (known){
if ((d[6] & 0xC0) != 0x80){
res << " [!INVALID FIRST BITS!]";
@ -90,7 +91,8 @@ namespace Analysers {
headSize += 0; /// \todo Implement this. Complicated field, bah.
}
if (d[8] != headSize){
res << " [Padding: " << ((int)d[8] - headSize) << "b]";
padding = d[8] - headSize;
res << " [Padding: " << padding << "b]";
}
if (timeFlags & 0x02){
long long unsigned int time = (((unsigned int)d[9] & 0xE) >> 1);
@ -116,7 +118,7 @@ namespace Analysers {
if(detailLevel==1){
unsigned int counter = 0;
for (unsigned int i = 9+headSize; i<d.size(); ++i){
for (unsigned int i = 9+headSize+padding; i<d.size(); ++i){
if ((i < d.size() - 4) && d[i] == 0 && d[i+1] == 0 && d[i+2] == 0 && d[i+3] == 1){res << std::endl; counter = 0;}
res << std::hex << std::setw(2) << std::setfill('0') << (int)(d[i]&0xff) << " ";
counter++;