Remove doxygen errors, update Doxyfile to latest version.

This commit is contained in:
Thulinma 2014-01-05 11:57:56 +01:00
parent 33427f1663
commit b5a4ea1b93
10 changed files with 1429 additions and 939 deletions

2335
Doxyfile

File diff suppressed because it is too large Load diff

View file

@ -95,8 +95,10 @@ std::string & HTTP::Parser::BuildResponse(std::string code, std::string message)
/// Creates and sends a valid HTTP 1.0 or 1.1 response. /// Creates and sends a valid HTTP 1.0 or 1.1 response.
/// The response is partly build from internal variables set before this call is made. /// The response is partly build from internal variables set before this call is made.
/// To be precise, protocol, headers and body are used. /// To be precise, protocol, headers and body are used.
/// This call will attempt to buffer as little as possible and block until the whole request is sent.
/// \param code The HTTP response code. Usually you want 200. /// \param code The HTTP response code. Usually you want 200.
/// \param message The HTTP response message. Usually you want "OK". /// \param message The HTTP response message. Usually you want "OK".
/// \param conn The Socket::Connection to send the response over.
void HTTP::Parser::SendResponse(std::string code, std::string message, Socket::Connection & conn){ void HTTP::Parser::SendResponse(std::string code, std::string message, Socket::Connection & conn){
/// \todo Include GET/POST variable parsing? /// \todo Include GET/POST variable parsing?
std::map<std::string, std::string>::iterator it; std::map<std::string, std::string>::iterator it;

View file

@ -118,7 +118,7 @@ namespace MP4 {
} }
/// Attempts to typecast this Box to a more specific type and call the toPrettyString() function of that type. /// Attempts to typecast this Box to a more specific type and call the toPrettyString() function of that type.
/// If this failed, it will print out a message saying pretty-printing is not implemented for <boxtype>. /// If this failed, it will print out a message saying pretty-printing is not implemented for that boxtype.
std::string Box::toPrettyString(uint32_t indent){ std::string Box::toPrettyString(uint32_t indent){
switch (ntohl( *((int*)(data + 4)))){ //type is at this address switch (ntohl( *((int*)(data + 4)))){ //type is at this address
case 0x6D666864: case 0x6D666864:

View file

@ -26,7 +26,7 @@ namespace MP4{
mvhdBox.setRate(0x10000); mvhdBox.setRate(0x10000);
//calculating longest duration //calculating longest duration
int fileDuration = 0; int fileDuration = 0;
///\TODO lastms and firstms fixen ///\ odo lastms and firstms fixen
for ( std::map<int,DTSC::Track>::iterator trackIt = metaData.tracks.begin(); trackIt != metaData.tracks.end(); trackIt ++) { for ( std::map<int,DTSC::Track>::iterator trackIt = metaData.tracks.begin(); trackIt != metaData.tracks.end(); trackIt ++) {
if (trackIt->second.lastms - trackIt->second.firstms > fileDuration){ if (trackIt->second.lastms - trackIt->second.firstms > fileDuration){
fileDuration = trackIt->second.lastms - trackIt->second.firstms; fileDuration = trackIt->second.lastms - trackIt->second.firstms;
@ -106,7 +106,7 @@ namespace MP4{
tkhdBox.setVersion(0); tkhdBox.setVersion(0);
tkhdBox.setFlags(15); tkhdBox.setFlags(15);
tkhdBox.setTrackID(it->second.trackID); tkhdBox.setTrackID(it->second.trackID);
///\TODO duration firstms and lastms fix ///\ odo duration firstms and lastms fix
tkhdBox.setDuration(it->second.lastms + it->second.firstms); tkhdBox.setDuration(it->second.lastms + it->second.firstms);
if (it->second.type == "video"){ if (it->second.type == "video"){
@ -139,7 +139,7 @@ namespace MP4{
} }
timescale = ((double)(42 * tmpParts) / (it->second.lastms + it->second.firstms)) * 1000; timescale = ((double)(42 * tmpParts) / (it->second.lastms + it->second.firstms)) * 1000;
mdhdBox.setTimeScale(timescale); mdhdBox.setTimeScale(timescale);
///\TODO fix lastms, firstms ///\ odo fix lastms, firstms
mdhdBox.setDuration((it->second.lastms + it->second.firstms) * ((double)timescale / 1000)); mdhdBox.setDuration((it->second.lastms + it->second.firstms) * ((double)timescale / 1000));
mdiaBox.setContent(mdhdBox, 0); mdiaBox.setContent(mdhdBox, 0);
@ -219,7 +219,7 @@ namespace MP4{
} }
stblBox.setContent(stsdBox,0); stblBox.setContent(stsdBox,0);
/// \TODO update following stts lines /// \ odo update following stts lines
MP4::STTS sttsBox;//current version probably causes problems MP4::STTS sttsBox;//current version probably causes problems
sttsBox.setVersion(0); sttsBox.setVersion(0);
MP4::STTSEntry newEntry; MP4::STTSEntry newEntry;

View file

@ -205,7 +205,7 @@ namespace OGG{
std::cerr << "Segments too big, create a continue page" << std::endl; std::cerr << "Segments too big, create a continue page" << std::endl;
} }
///\TODO MAKE FIX HERE /// \todo MAKE FIX HERE
bool Page::setSegmentTable(std::vector<unsigned int> layout){ bool Page::setSegmentTable(std::vector<unsigned int> layout){
dataSum=0; dataSum=0;
for (unsigned int i = 0; i < layout.size(); i++){ for (unsigned int i = 0; i < layout.size(); i++){

View file

@ -644,12 +644,12 @@ bool RTMPStream::Chunk::Parse(std::string & indata){
} }
} //Parse } //Parse
/// Parses the argument string into the current chunk. /// Parses the argument Socket::Buffer into the current chunk.
/// Tries to read a whole chunk, removing data from the input as it reads. /// Tries to read a whole chunk, removing data from the Buffer as it reads.
/// If only part of a chunk is read, it will remove the part and call itself again. /// If a single packet contains a partial chunk, it will remove the packet and
/// This has the effect of only causing a "true" reponse in the case a *whole* chunk /// call itself again. This has the effect of only causing a "true" reponse in
/// is read, not just part of a chunk. /// the case a *whole* chunk is read, not just part of a chunk.
/// \param indata The input string to parse and update. /// \param buffer The input to parse and update.
/// \warning This function will destroy the current data in this chunk! /// \warning This function will destroy the current data in this chunk!
/// \returns True if a whole chunk could be read, false otherwise. /// \returns True if a whole chunk could be read, false otherwise.
bool RTMPStream::Chunk::Parse(Socket::Buffer & buffer){ bool RTMPStream::Chunk::Parse(Socket::Buffer & buffer){

View file

@ -1,4 +1,4 @@
/// \file time.cpp /// \file timing.cpp
/// Utilities for handling time and timestamps. /// Utilities for handling time and timestamps.
#include "timing.h" #include "timing.h"

View file

@ -1,4 +1,4 @@
/// \file time.h /// \file timing.h
/// Utilities for handling time and timestamps. /// Utilities for handling time and timestamps.
#pragma once #pragma once

View file

@ -400,7 +400,9 @@ void TS::Packet::FillFree(std::string & NewVal){
/// Fills the free bytes of the TS::Packet. /// Fills the free bytes of the TS::Packet.
/// Stores as many bytes from NewVal as possible in the packet. /// Stores as many bytes from NewVal as possible in the packet.
/// The minimum of TS::Packet::BytesFree and maxLen is used.
/// \param NewVal The data to store in the packet. /// \param NewVal The data to store in the packet.
/// \param maxLen The maximum amount of bytes to store.
int TS::Packet::FillFree(const char* NewVal, int maxLen){ int TS::Packet::FillFree(const char* NewVal, int maxLen){
int toWrite = std::min((int)BytesFree(), maxLen); int toWrite = std::min((int)BytesFree(), maxLen);
strBuf += std::string(NewVal, toWrite); strBuf += std::string(NewVal, toWrite);

View file

@ -61,6 +61,7 @@ namespace TS {
/// The length of this header will ALWAYS be 7 bytes, and has to be /// The length of this header will ALWAYS be 7 bytes, and has to be
/// prepended on each audio frame. /// prepended on each audio frame.
/// \param FrameLen the length of the current audio frame. /// \param FrameLen the length of the current audio frame.
/// \param initData A string containing the initalization data for this track's codec.
static inline std::string GetAudioHeader(int FrameLen, std::string initData){ static inline std::string GetAudioHeader(int FrameLen, std::string initData){
char StandardHeader[7] = {0xFF, 0xF1, 0x00, 0x00, 0x00, 0x1F, 0xFC}; char StandardHeader[7] = {0xFF, 0xF1, 0x00, 0x00, 0x00, 0x1F, 0xFC};
FrameLen += 7; FrameLen += 7;