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

Removed ALL the compile warnings!

Browse source
This commit is contained in:
Thulinma 2014-01-05 15:28:53 +01:00
parent d8113e7829
commit 05d23a0ac6
21 changed files with 1472 additions and 1018 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/converters/dtsc2ogg.cpp
View file

@ -17,7 +17,6 @@ namespace Converters{
//JSON::Value meta = DTSCFile.getMeta();
srand (Util::getMS());//randomising with milliseconds from boot
std::vector<unsigned int> curSegTable;
char* curNewPayload;
OGG::headerPages oggMeta;
//Creating ID headers for theora and vorbis
DTSC::readOnlyMeta fileMeta = DTSCFile.getMeta();
@ -38,7 +37,7 @@ namespace Converters{
std::map< long long int, std::vector<JSON::Value> > DTSCBuffer;
long long unsigned int prevGran;
long long int currID;
long long int currGran;
long long unsigned int currGran;
OGG::Page curOggPage;
@ -50,7 +49,7 @@ namespace Converters{
}else{
prevGran = 0;
}
if (prevGran != 0 && (prevGran == -1 || currGran != prevGran)){
if (prevGran != 0 && (currGran != prevGran)){
curOggPage.readDTSCVector(DTSCBuffer[currID], oggMeta.DTSCID2OGGSerial[currID], oggMeta.DTSCID2seqNum[currID]);
std::cout << std::string((char*)curOggPage.getPage(), curOggPage.getPageSize());
DTSCBuffer[currID].clear();

7
src/converters/dtsc2ts.cpp
View file

@ -24,11 +24,10 @@ namespace Converters {
DTSC::Stream Strm;
int PacketNumber = 0;
long long unsigned int TimeStamp = 0;
int ThisNaluSize;
unsigned int ThisNaluSize;
char VideoCounter = 0;
char AudioCounter = 0;
bool WritePesHeader;
bool IsKeyFrame;
bool IsKeyFrame = false;
MP4::AVCC avccbox;
bool haveAvcc = false;
std::stringstream TSBuf;
@ -82,7 +81,7 @@ namespace Converters {
ToPack.append(avccbox.asAnnexB());
while (Strm.lastData().size()){
ThisNaluSize = (Strm.lastData()[0] << 24) + (Strm.lastData()[1] << 16) + (Strm.lastData()[2] << 8) + Strm.lastData()[3];
Strm.lastData().replace(0, 4, TS::NalHeader, 4);
Strm.lastData().replace(0, 4, "\000\000\000\001", 4);
if (ThisNaluSize + 4 == Strm.lastData().size()){
ToPack.append(Strm.lastData());
break;

5
src/converters/ogg2dtsc.cpp
View file

@ -30,8 +30,8 @@ namespace Converters{
std::string oggBuffer;
OGG::Page oggPage;
//Read all of std::cin to oggBuffer
double mspft;//microseconds per frame
double mspfv;//microseconds per frame vorbis
double mspft = 0;//microseconds per frame
double mspfv = 0;//microseconds per frame vorbis
JSON::Value DTSCOut;
JSON::Value DTSCHeader;
DTSCHeader.null();
@ -40,7 +40,6 @@ namespace Converters{
long long int lastTrackID = 1;
int headerSeen = 0;
bool headerWritten = false;//important bool, used for outputting the simple DTSC header.
bool allStreamsSeen = false; //other important bool used for error checking the EOS.
//while stream busy
while (std::cin.good()){
for (unsigned int i = 0; (i < 1024) && (std::cin.good()); i++){//buffering