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

libmist backport from new metadata branch with improved typing and styling

Browse source
This commit is contained in:
Erik Zandvliet 2018-11-28 12:16:00 +01:00 • committed by Thulinma
parent 7a03d3e96c
commit 10fa4b7e7b
88 changed files with 5957 additions and 5757 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/mpeg.cpp
View file

@ -13,6 +13,7 @@ namespace Mpeg{
// samplerate is encoded in bits 0x0C of header[2];
res.sampleRate = sampleRates[mpegVersion][((hdr[2] >> 2) & 0x03)] * 1000;
res.channels = 2 - (hdr[3] >> 7);
res.layer = 4 - (hdr[1] >> 1) & 0x03;
return res;
}
@ -44,7 +45,7 @@ namespace Mpeg{
return true;
}
if (hdr[3] == 0x00){// Picture header
mpInfo.tempSeq = (((uint16_t)hdr[4]) << 2) || (hdr[5] >> 6);
mpInfo.tempSeq = ((uint16_t)hdr[4] << 2) | (hdr[5] >> 6);
mpInfo.frameType = (hdr[5] & 0x38) >> 3;
return true;
}
@ -55,8 +56,8 @@ namespace Mpeg{
void parseMPEG2Headers(const char *hdr, uint32_t len, MPEG2Info &mpInfo){
mpInfo.clear();
const char *offset = hdr;
char *maxData = (char*)hdr + len - 5;
if (maxData - hdr > 250){maxData = (char*)hdr + 250;}
char *maxData = (char *)hdr + len - 5;
if (maxData - hdr > 250){maxData = (char *)hdr + 250;}
while (offset < maxData){
if (offset[2] > 1){
// We have no zero in the third byte, so we need to skip at least 3 bytes forward