Commit 5039d414 authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 2018.09.18

parent 76036ef1
......@@ -4,7 +4,7 @@
#ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
#define _BASICUSAGEENVIRONMENT_VERSION_HH
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.09.10"
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1536537600
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.09.18"
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1537228800
#endif
......@@ -4,7 +4,7 @@
#ifndef _USAGEENVIRONMENT_VERSION_HH
#define _USAGEENVIRONMENT_VERSION_HH
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.09.10"
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1536537600
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.09.18"
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1537228800
#endif
......@@ -4,7 +4,7 @@
# One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1
libliveMedia_VERSION_CURRENT=64
libliveMedia_VERSION_REVISION=1
libliveMedia_VERSION_REVISION=2
libliveMedia_VERSION_AGE=0
libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
......
......@@ -4,7 +4,7 @@
#ifndef _GROUPSOCK_VERSION_HH
#define _GROUPSOCK_VERSION_HH
#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.09.10"
#define GROUPSOCK_LIBRARY_VERSION_INT 1536537600
#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.09.18"
#define GROUPSOCK_LIBRARY_VERSION_INT 1537228800
#endif
......@@ -148,34 +148,34 @@ unsigned RawVideoRTPSink::getNbLineInPacket(unsigned fragOffset, unsigned * &len
}
unsigned lengthArray[100] = {0};
unsigned offsetArray[100] = {0};
unsigned positionInDataLine = 0;
unsigned curDataTotalLength = 0;
unsigned lineOffset = (fragOffset % fFrameParameters.scanLineSize);
unsigned remainingLineSize = fFrameParameters.scanLineSize - (fragOffset % fFrameParameters.scanLineSize);
while(1) {
if (packetMaxSize - specialHeaderSize - rtpHeaderSize - 6 < positionInDataLine) {
break; // sanity check
if (packetMaxSize - specialHeaderSize - rtpHeaderSize - 6 <= curDataTotalLength) {
break; // packet sanity check
}
// add one line
nbLines ++;
specialHeaderSize += 6;
remainingSizeInPacket = packetMaxSize - specialHeaderSize - rtpHeaderSize - positionInDataLine;
remainingSizeInPacket = packetMaxSize - specialHeaderSize - rtpHeaderSize - curDataTotalLength;
remainingSizeInPacket -= remainingSizeInPacket % fFrameParameters.pGroupSize; // use only multiple of pgroup
lengthArray[nbLines-1] = remainingLineSize < remainingSizeInPacket ? remainingLineSize : remainingSizeInPacket;
offsetArray[nbLines-1] = lineOffset * fFrameParameters.scanLineIterationStep / fFrameParameters.pGroupSize;
if (remainingLineSize >= remainingSizeInPacket) {
break;
}
if (fragOffset + remainingLineSize >= fFrameParameters.frameSize) {
break; // last packet
break; //packet full
}
remainingLineSize = fFrameParameters.scanLineSize;
positionInDataLine += lengthArray[nbLines-1];
curDataTotalLength += lengthArray[nbLines-1];
lineOffset = 0;
if (fragOffset + curDataTotalLength >= fFrameParameters.frameSize) {
break; // end of the frame.
}
}
lengths = new unsigned[nbLines];
......
......@@ -4,7 +4,7 @@
#ifndef _LIVEMEDIA_VERSION_HH
#define _LIVEMEDIA_VERSION_HH
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.09.10"
#define LIVEMEDIA_LIBRARY_VERSION_INT 1536537600
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.09.18"
#define LIVEMEDIA_LIBRARY_VERSION_INT 1537228800
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment