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

AAC RTMP/FLV input now ignore metadata and instead parse init data for channel count and sampling rate

Browse source
This commit is contained in:
Thulinma 2020-10-16 14:45:45 +02:00
parent 19840f32d4
commit 28060d2113
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/adts.h
View file

@ -53,26 +53,36 @@ namespace aac {
default: return 0;
}
}
static inline uint16_t channels(const std::string & conf){
static inline uint16_t channels(const std::string &conf){
Utils::bitstream bs;
bs.append(conf.data(), conf.size());
if (bs.get(5) == 31){bs.skip(6);}//skip object type
if (bs.get(4) == 15){bs.skip(24);}//frequency index
return bs.get(4);//channel configuration
if (bs.get(5) == 31){bs.skip(6);}// skip object type
if (bs.get(4) == 15){bs.skip(24);}// frequency index
uint8_t chanConfig = bs.get(4);
if (chanConfig == 0){
WARN_MSG("Unimplemented AAC AOT Specific Config parsing");
return 8;
}
if (chanConfig > 7){
WARN_MSG("Unimplemented AAC channel configuration %" PRIu8, chanConfig);
return 8;
}
if (chanConfig == 7){return 8;}
return chanConfig;
}
static inline uint8_t objtype(const std::string & conf){
static inline uint8_t objtype(const std::string &conf){
Utils::bitstream bs;
bs.append(conf.data(), conf.size());
uint8_t ot = bs.get(5);
if (ot == 31){return bs.get(6)+32;}
if (ot == 31){return bs.get(6) + 32;}
return ot;
}
static inline uint16_t samples(const std::string & conf){
static inline uint16_t samples(const std::string &conf){
Utils::bitstream bs;
bs.append(conf.data(), conf.size());
if (bs.get(5) == 31){bs.skip(6);}//skip object type
if (bs.get(4) == 15){bs.skip(24);}//frequency index
bs.skip(4);//channel configuration
if (bs.get(5) == 31){bs.skip(6);}// skip object type
if (bs.get(4) == 15){bs.skip(24);}// frequency index
bs.skip(4); // channel configuration
if (bs.get(1)){
return 960;
}else{