VT: Add control of base jitter dynamics
[Problem] Assembler regards many normal packets as "too late"
[Cause] Legacy base(static) jitter was only good at good N/W case.
[Solution] Change base jitter not to be static anymore.
Apply dynamic concept for base jitter also.
Now jitter buffer is composed of 3 sub jitter buffers.
┌- static - Given static minimum time
│ that waits to complete a NAL.
│
Jitter Buffer --+- base - Major propagation time of the N/W.
│ So its dynamics depends on N/W state.
│ This would major jitter buffer time
│ that waits to complete a NAL.
│
└- inter arrival - A variance of
arrival times of packets / NALs.
Refered formula defined in RFC3550.
Bug: 188504024
Change-Id: I0df19095da6efd3f496234a5e6e7e3f38ee353a7
Signed-off-by: Kim Sungyeon <sy85.kim@samsung.com>
diff --git a/media/libstagefright/rtsp/AAVCAssembler.cpp b/media/libstagefright/rtsp/AAVCAssembler.cpp
index 92b2b09..e1cc5ec 100644
--- a/media/libstagefright/rtsp/AAVCAssembler.cpp
+++ b/media/libstagefright/rtsp/AAVCAssembler.cpp
@@ -45,6 +45,7 @@
mAccessUnitDamaged(false),
mFirstIFrameProvided(false),
mLastIFrameProvidedAtMs(0),
+ mLastRtpTimeJitterDataUs(0),
mWidth(0),
mHeight(0) {
}
@@ -123,45 +124,65 @@
sp<ABuffer> buffer = *queue->begin();
buffer->meta()->setObject("source", source);
+ /**
+ * RFC3550 calculates the interarrival jitter time for 'ALL packets'.
+ * But that is not useful as an ingredient of buffering time.
+ * Instead, we calculates the time only for all 'NAL units'.
+ */
int64_t rtpTime = findRTPTime(firstRTPTime, buffer);
+ int64_t nowTimeUs = ALooper::GetNowUs();
+ if (rtpTime != mLastRtpTimeJitterDataUs) {
+ source->putBaseJitterData(rtpTime, nowTimeUs);
+ mLastRtpTimeJitterDataUs = rtpTime;
+ }
+ source->putInterArrivalJitterData(rtpTime, nowTimeUs);
const int64_t startTimeMs = source->mFirstSysTime / 1000;
- const int64_t nowTimeMs = ALooper::GetNowUs() / 1000;
- const int64_t staticJbTimeMs = source->getStaticJitterTimeMs();
- const int64_t dynamicJbTimeMs = source->getDynamicJitterTimeMs();
+ const int64_t nowTimeMs = nowTimeUs / 1000;
+ const int32_t staticJitterTimeMs = source->getStaticJitterTimeMs();
+ const int32_t baseJitterTimeMs = source->getBaseJitterTimeMs();
+ const int32_t dynamicJitterTimeMs = source->getInterArrivalJitterTimeMs();
const int64_t clockRate = source->mClockRate;
int64_t playedTimeMs = nowTimeMs - startTimeMs;
int64_t playedTimeRtp = source->mFirstRtpTime + MsToRtp(playedTimeMs, clockRate);
/**
- * Based on experience in real commercial network services,
+ * Based on experiences in real commercial network services,
* 300 ms is a maximum heuristic jitter buffer time for video RTP service.
*/
/**
- * The static(base) jitter is a kind of expected propagation time that we desire.
- * We can drop packets if it doesn't meet our standards.
- * If it gets shorter we can get faster response but can lose packets.
+ * The base jitter is an expected additional propagation time.
+ * We can drop packets if the time doesn't meet our standards.
+ * If it gets shorter, we can get faster response but should drop delayed packets.
* Expecting range : 50ms ~ 1000ms (But 300 ms would be practical upper bound)
*/
- const int64_t baseJbTimeRtp = MsToRtp(staticJbTimeMs, clockRate);
+ const int32_t baseJbTimeMs = std::min(std::max(staticJitterTimeMs, baseJitterTimeMs), 300);
/**
* Dynamic jitter is a variance of interarrival time as defined in the 6.4.1 of RFC 3550.
- * We can regard this as a tolerance of every moments.
+ * We can regard this as a tolerance of every data putting moments.
* Expecting range : 0ms ~ 150ms (Not to over 300 ms practically)
*/
- const int64_t dynamicJbTimeRtp = // Max 150
- std::min(MsToRtp(dynamicJbTimeMs, clockRate), MsToRtp(150, clockRate));
- const int64_t jitterTimeRtp = baseJbTimeRtp + dynamicJbTimeRtp; // Total jitter time
+ const int32_t dynamicJbTimeMs = std::min(dynamicJitterTimeMs, 150);
+ const int64_t dynamicJbTimeRtp = MsToRtp(dynamicJbTimeMs, clockRate);
+ /* Fundamental jitter time */
+ const int32_t jitterTimeMs = baseJbTimeMs;
+ const int64_t jitterTimeRtp = MsToRtp(jitterTimeMs, clockRate);
+ // Till (T), this assembler waits unconditionally to collect current NAL unit
int64_t expiredTimeRtp = rtpTime + jitterTimeRtp; // When does this buffer expire ? (T)
int64_t diffTimeRtp = playedTimeRtp - expiredTimeRtp;
bool isExpired = (diffTimeRtp >= 0); // It's expired if T is passed away
- bool isFirstLineBroken = (diffTimeRtp > jitterTimeRtp); // (T + jitter) is a standard tolerance
- int64_t finalMargin = dynamicJbTimeRtp * JITTER_MULTIPLE;
- bool isSecondLineBroken = (diffTimeRtp > jitterTimeRtp + finalMargin); // The Maginot line
+ // From (T), this assembler tries to complete the NAL till (T + try)
+ int32_t tryJbTimeMs = baseJitterTimeMs / 2 + dynamicJbTimeMs;
+ int64_t tryJbTimeRtp = MsToRtp(tryJbTimeMs, clockRate);
+ bool isFirstLineBroken = (diffTimeRtp > tryJbTimeRtp);
+
+ // After (T + try), it gives last chance till (T + try + a) with warning messages.
+ int64_t alpha = dynamicJbTimeRtp * JITTER_MULTIPLE; // Use Dyn as 'a'
+ bool isSecondLineBroken = (diffTimeRtp > (tryJbTimeRtp + alpha)); // The Maginot line
if (mShowQueue && mShowQueueCnt < 20) {
showCurrentQueue(queue);
@@ -179,20 +200,20 @@
if (isFirstLineBroken) {
if (isSecondLineBroken) {
- ALOGW("buffer too late ... \t Diff in Jb=%lld \t "
+ int64_t totalDiffTimeMs = RtpToMs(diffTimeRtp + jitterTimeRtp, clockRate);
+ ALOGE("buffer too late... \t RTP diff from exp =%lld \t MS diff from stamp = %lld\t\t"
"Seq# %d \t ExpSeq# %d \t"
- "JitterMs %lld + (%lld * %.3f)",
- (long long)(diffTimeRtp),
+ "JitterMs %d + (%d + %d * %.3f)",
+ (long long)diffTimeRtp, (long long)totalDiffTimeMs,
buffer->int32Data(), mNextExpectedSeqNo,
- (long long)staticJbTimeMs, (long long)dynamicJbTimeMs, JITTER_MULTIPLE + 1);
+ jitterTimeMs, tryJbTimeMs, dynamicJbTimeMs, JITTER_MULTIPLE);
printNowTimeMs(startTimeMs, nowTimeMs, playedTimeMs);
printRTPTime(rtpTime, playedTimeRtp, expiredTimeRtp, isExpired);
mNextExpectedSeqNo = pickProperSeq(queue, firstRTPTime, playedTimeRtp, jitterTimeRtp);
} else {
- ALOGW("=== WARNING === buffer arrived after %lld + %lld = %lld ms === WARNING === ",
- (long long)staticJbTimeMs, (long long)dynamicJbTimeMs,
- (long long)RtpToMs(jitterTimeRtp, clockRate));
+ ALOGW("=== WARNING === buffer arrived after %d + %d = %d ms === WARNING === ",
+ jitterTimeMs, tryJbTimeMs, jitterTimeMs + tryJbTimeMs);
}
}
diff --git a/media/libstagefright/rtsp/AAVCAssembler.h b/media/libstagefright/rtsp/AAVCAssembler.h
index 954086c..8d19773 100644
--- a/media/libstagefright/rtsp/AAVCAssembler.h
+++ b/media/libstagefright/rtsp/AAVCAssembler.h
@@ -48,6 +48,7 @@
bool mAccessUnitDamaged;
bool mFirstIFrameProvided;
uint64_t mLastIFrameProvidedAtMs;
+ int64_t mLastRtpTimeJitterDataUs;
int32_t mWidth;
int32_t mHeight;
List<sp<ABuffer> > mNALUnits;
diff --git a/media/libstagefright/rtsp/AHEVCAssembler.cpp b/media/libstagefright/rtsp/AHEVCAssembler.cpp
index cd60203..d32e85d 100644
--- a/media/libstagefright/rtsp/AHEVCAssembler.cpp
+++ b/media/libstagefright/rtsp/AHEVCAssembler.cpp
@@ -52,6 +52,7 @@
mAccessUnitDamaged(false),
mFirstIFrameProvided(false),
mLastIFrameProvidedAtMs(0),
+ mLastRtpTimeJitterDataUs(0),
mWidth(0),
mHeight(0) {
@@ -133,45 +134,65 @@
sp<ABuffer> buffer = *queue->begin();
buffer->meta()->setObject("source", source);
+ /**
+ * RFC3550 calculates the interarrival jitter time for 'ALL packets'.
+ * But that is not useful as an ingredient of buffering time.
+ * Instead, we calculates the time only for all 'NAL units'.
+ */
int64_t rtpTime = findRTPTime(firstRTPTime, buffer);
+ int64_t nowTimeUs = ALooper::GetNowUs();
+ if (rtpTime != mLastRtpTimeJitterDataUs) {
+ source->putBaseJitterData(rtpTime, nowTimeUs);
+ mLastRtpTimeJitterDataUs = rtpTime;
+ }
+ source->putInterArrivalJitterData(rtpTime, nowTimeUs);
const int64_t startTimeMs = source->mFirstSysTime / 1000;
- const int64_t nowTimeMs = ALooper::GetNowUs() / 1000;
- const int64_t staticJbTimeMs = source->getStaticJitterTimeMs();
- const int64_t dynamicJbTimeMs = source->getDynamicJitterTimeMs();
+ const int64_t nowTimeMs = nowTimeUs / 1000;
+ const int32_t staticJitterTimeMs = source->getStaticJitterTimeMs();
+ const int32_t baseJitterTimeMs = source->getBaseJitterTimeMs();
+ const int32_t dynamicJitterTimeMs = source->getInterArrivalJitterTimeMs();
const int64_t clockRate = source->mClockRate;
int64_t playedTimeMs = nowTimeMs - startTimeMs;
int64_t playedTimeRtp = source->mFirstRtpTime + MsToRtp(playedTimeMs, clockRate);
/**
- * Based on experience in real commercial network services,
+ * Based on experiences in real commercial network services,
* 300 ms is a maximum heuristic jitter buffer time for video RTP service.
*/
/**
- * The static(base) jitter is a kind of expected propagation time that we desire.
- * We can drop packets if it doesn't meet our standards.
- * If it gets shorter we can get faster response but can lose packets.
+ * The base jitter is an expected additional propagation time.
+ * We can drop packets if the time doesn't meet our standards.
+ * If it gets shorter, we can get faster response but should drop delayed packets.
* Expecting range : 50ms ~ 1000ms (But 300 ms would be practical upper bound)
*/
- const int64_t baseJbTimeRtp = MsToRtp(staticJbTimeMs, clockRate);
+ const int32_t baseJbTimeMs = std::min(std::max(staticJitterTimeMs, baseJitterTimeMs), 300);
/**
* Dynamic jitter is a variance of interarrival time as defined in the 6.4.1 of RFC 3550.
- * We can regard this as a tolerance of every moments.
+ * We can regard this as a tolerance of every data putting moments.
* Expecting range : 0ms ~ 150ms (Not to over 300 ms practically)
*/
- const int64_t dynamicJbTimeRtp = // Max 150
- std::min(MsToRtp(dynamicJbTimeMs, clockRate), MsToRtp(150, clockRate));
- const int64_t jitterTimeRtp = baseJbTimeRtp + dynamicJbTimeRtp; // Total jitter time
+ const int32_t dynamicJbTimeMs = std::min(dynamicJitterTimeMs, 150);
+ const int64_t dynamicJbTimeRtp = MsToRtp(dynamicJbTimeMs, clockRate);
+ /* Fundamental jitter time */
+ const int32_t jitterTimeMs = baseJbTimeMs;
+ const int64_t jitterTimeRtp = MsToRtp(jitterTimeMs, clockRate);
+ // Till (T), this assembler waits unconditionally to collect current NAL unit
int64_t expiredTimeRtp = rtpTime + jitterTimeRtp; // When does this buffer expire ? (T)
int64_t diffTimeRtp = playedTimeRtp - expiredTimeRtp;
bool isExpired = (diffTimeRtp >= 0); // It's expired if T is passed away
- bool isFirstLineBroken = (diffTimeRtp > jitterTimeRtp); // (T + jitter) is a standard tolerance
- int64_t finalMargin = dynamicJbTimeRtp * JITTER_MULTIPLE;
- bool isSecondLineBroken = (diffTimeRtp > jitterTimeRtp + finalMargin); // The Maginot line
+ // From (T), this assembler tries to complete the NAL till (T + try)
+ int32_t tryJbTimeMs = baseJitterTimeMs / 2 + dynamicJbTimeMs;
+ int64_t tryJbTimeRtp = MsToRtp(tryJbTimeMs, clockRate);
+ bool isFirstLineBroken = (diffTimeRtp > tryJbTimeRtp);
+
+ // After (T + try), it gives last chance till (T + try + a) with warning messages.
+ int64_t alpha = dynamicJbTimeRtp * JITTER_MULTIPLE; // Use Dyn as 'a'
+ bool isSecondLineBroken = (diffTimeRtp > (tryJbTimeRtp + alpha)); // The Maginot line
if (mShowQueueCnt < 20) {
showCurrentQueue(queue);
@@ -189,20 +210,20 @@
if (isFirstLineBroken) {
if (isSecondLineBroken) {
- ALOGW("buffer too late ... \t Diff in Jb=%lld \t "
+ int64_t totalDiffTimeMs = RtpToMs(diffTimeRtp + jitterTimeRtp, clockRate);
+ ALOGE("buffer too late... \t RTP diff from exp =%lld \t MS diff from stamp = %lld\t\t"
"Seq# %d \t ExpSeq# %d \t"
- "JitterMs %lld + (%lld * %.3f)",
- (long long)(diffTimeRtp),
+ "JitterMs %d + (%d + %d * %.3f)",
+ (long long)diffTimeRtp, (long long)totalDiffTimeMs,
buffer->int32Data(), mNextExpectedSeqNo,
- (long long)staticJbTimeMs, (long long)dynamicJbTimeMs, JITTER_MULTIPLE + 1);
+ jitterTimeMs, tryJbTimeMs, dynamicJbTimeMs, JITTER_MULTIPLE);
printNowTimeMs(startTimeMs, nowTimeMs, playedTimeMs);
printRTPTime(rtpTime, playedTimeRtp, expiredTimeRtp, isExpired);
mNextExpectedSeqNo = pickProperSeq(queue, firstRTPTime, playedTimeRtp, jitterTimeRtp);
} else {
- ALOGW("=== WARNING === buffer arrived after %lld + %lld = %lld ms === WARNING === ",
- (long long)staticJbTimeMs, (long long)dynamicJbTimeMs,
- (long long)RtpToMs(jitterTimeRtp, clockRate));
+ ALOGW("=== WARNING === buffer arrived after %d + %d = %d ms === WARNING === ",
+ jitterTimeMs, tryJbTimeMs, jitterTimeMs + tryJbTimeMs);
}
}
diff --git a/media/libstagefright/rtsp/AHEVCAssembler.h b/media/libstagefright/rtsp/AHEVCAssembler.h
index e64b661..68777a7 100644
--- a/media/libstagefright/rtsp/AHEVCAssembler.h
+++ b/media/libstagefright/rtsp/AHEVCAssembler.h
@@ -49,6 +49,7 @@
bool mAccessUnitDamaged;
bool mFirstIFrameProvided;
uint64_t mLastIFrameProvidedAtMs;
+ int64_t mLastRtpTimeJitterDataUs;
int32_t mWidth;
int32_t mHeight;
List<sp<ABuffer> > mNALUnits;
diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp
index 9509377..33c85a7 100644
--- a/media/libstagefright/rtsp/ARTPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -723,7 +723,6 @@
buffer->setInt32Data(u16at(&data[2]));
buffer->setRange(payloadOffset, size - payloadOffset);
- source->putDynamicJitterData(rtpTime, s->mLastPollTimeUs);
source->processRTPPacket(buffer);
return OK;
diff --git a/media/libstagefright/rtsp/ARTPSource.cpp b/media/libstagefright/rtsp/ARTPSource.cpp
index 402dc27..8787d65 100644
--- a/media/libstagefright/rtsp/ARTPSource.cpp
+++ b/media/libstagefright/rtsp/ARTPSource.cpp
@@ -146,6 +146,7 @@
mFirstSsrc = ssrc;
ALOGD("first-rtp arrived: first-rtp-time=%u, sys-time=%lld, seq-num=%u, ssrc=%d",
mFirstRtpTime, (long long)mFirstSysTime, mHighestSeqNumber, mFirstSsrc);
+ mJitterCalc->init(mFirstRtpTime, mFirstSysTime, 0, mStaticJbTimeMs * 1000);
mQueue.push_back(buffer);
return true;
}
@@ -331,7 +332,7 @@
data[18] = (mHighestSeqNumber >> 8) & 0xff;
data[19] = mHighestSeqNumber & 0xff;
- uint32_t jitterTime = getDynamicJitterTimeMs() * mClockRate / 1000;
+ uint32_t jitterTime = 0;
data[20] = jitterTime >> 24; // Interarrival jitter
data[21] = (jitterTime >> 16) & 0xff;
data[22] = (jitterTime >> 8) & 0xff;
@@ -518,20 +519,28 @@
mIssueFIRRequests = enable;
}
-uint32_t ARTPSource::getStaticJitterTimeMs() {
+int32_t ARTPSource::getStaticJitterTimeMs() {
return mStaticJbTimeMs;
}
-uint32_t ARTPSource::getDynamicJitterTimeMs() {
- return mJitterCalc->getJitterMs();
+int32_t ARTPSource::getBaseJitterTimeMs() {
+ return mJitterCalc->getBaseJitterMs();
+}
+
+int32_t ARTPSource::getInterArrivalJitterTimeMs() {
+ return mJitterCalc->getInterArrivalJitterMs();
}
void ARTPSource::setStaticJitterTimeMs(const uint32_t jbTimeMs) {
mStaticJbTimeMs = jbTimeMs;
}
-void ARTPSource::putDynamicJitterData(uint32_t timeStamp, int64_t arrivalTime) {
- mJitterCalc->putData(timeStamp, arrivalTime);
+void ARTPSource::putBaseJitterData(uint32_t timeStamp, int64_t arrivalTime) {
+ mJitterCalc->putBaseData(timeStamp, arrivalTime);
+}
+
+void ARTPSource::putInterArrivalJitterData(uint32_t timeStamp, int64_t arrivalTime) {
+ mJitterCalc->putInterArrivalData(timeStamp, arrivalTime);
}
bool ARTPSource::isNeedToEarlyNotify() {
diff --git a/media/libstagefright/rtsp/ARTPSource.h b/media/libstagefright/rtsp/ARTPSource.h
index 56011d3..0edff23 100644
--- a/media/libstagefright/rtsp/ARTPSource.h
+++ b/media/libstagefright/rtsp/ARTPSource.h
@@ -70,10 +70,12 @@
void setSelfID(const uint32_t selfID);
void setPeriodicFIR(bool enable);
- uint32_t getStaticJitterTimeMs();
- uint32_t getDynamicJitterTimeMs();
+ int32_t getStaticJitterTimeMs();
+ int32_t getBaseJitterTimeMs();
+ int32_t getInterArrivalJitterTimeMs();
void setStaticJitterTimeMs(const uint32_t jbTimeMs);
- void putDynamicJitterData(uint32_t timeStamp, int64_t arrivalTime);
+ void putBaseJitterData(uint32_t timeStamp, int64_t arrivalTime);
+ void putInterArrivalJitterData(uint32_t timeStamp, int64_t arrivalTime);
bool isNeedToEarlyNotify();
void notifyPktInfo(int32_t bitrate, bool isRegular);
@@ -104,7 +106,7 @@
List<sp<ABuffer> > mQueue;
sp<ARTPAssembler> mAssembler;
- uint32_t mStaticJbTimeMs;
+ int32_t mStaticJbTimeMs;
sp<JitterCalc> mJitterCalc;
typedef struct infoNACK {
diff --git a/media/libstagefright/rtsp/JitterCalculator.cpp b/media/libstagefright/rtsp/JitterCalculator.cpp
index 466171c..93b5a83 100644
--- a/media/libstagefright/rtsp/JitterCalculator.cpp
+++ b/media/libstagefright/rtsp/JitterCalculator.cpp
@@ -25,45 +25,63 @@
JitterCalc::JitterCalc(int32_t clockRate)
: mClockRate(clockRate) {
- init();
+ init(0, 0, 0, 0);
}
-void JitterCalc::init() {
- mJitterValueUs = 0;
- mLastTimeStamp = 0;
- mLastArrivalTimeUs = 0;
+void JitterCalc::init(uint32_t rtpTime, int64_t arrivalTimeUs, int32_t base, int32_t inter) {
+ mFirstTimeStamp = rtpTime;
+ mLastTimeStamp = rtpTime;
+ mFirstArrivalTimeUs = arrivalTimeUs;
+ mLastArrivalTimeUs = arrivalTimeUs;
+
+ mBaseJitterUs = base;
+ mInterArrivalJitterUs = inter;
}
-void JitterCalc::putData(int64_t rtpTime, int64_t arrivalTimeUs) {
- if (mLastTimeStamp == 0) {
- mLastTimeStamp = rtpTime;
- mLastArrivalTimeUs = arrivalTimeUs;
- }
-
+void JitterCalc::putBaseData(int64_t rtpTime, int64_t arrivalTimeUs) {
+ // A RTP time wraps around after UINT32_MAX. We must consider this case.
const int64_t UINT32_MSB = 0x80000000;
+ int64_t overflowMask = (mFirstTimeStamp & UINT32_MSB & ~rtpTime) << 1;
+ int64_t tempRtpTime = overflowMask | rtpTime;
+
+ // Base jitter implementation can be various
+ int64_t scheduledTimeUs = (tempRtpTime - (int64_t)mFirstTimeStamp) * 1000000ll / mClockRate;
+ int64_t elapsedTimeUs = arrivalTimeUs - mFirstArrivalTimeUs;
+ int64_t correctionTimeUs = elapsedTimeUs - scheduledTimeUs; // additional propagation delay;
+ mBaseJitterUs = (mBaseJitterUs * 15 + correctionTimeUs) / 16;
+ ALOGV("BaseJitterUs : %lld \t\t correctionTimeUs : %lld",
+ (long long)mBaseJitterUs, (long long)correctionTimeUs);
+}
+
+void JitterCalc::putInterArrivalData(int64_t rtpTime, int64_t arrivalTimeUs) {
+ const int64_t UINT32_MSB = 0x80000000;
+ int64_t tempRtpTime = rtpTime;
int64_t tempLastTimeStamp = mLastTimeStamp;
+
// A RTP time wraps around after UINT32_MAX. We must consider this case.
int64_t overflowMask = (mLastTimeStamp ^ rtpTime) & UINT32_MSB;
- rtpTime |= ((overflowMask & ~rtpTime) << 1);
+ tempRtpTime |= ((overflowMask & ~rtpTime) << 1);
tempLastTimeStamp |= ((overflowMask & ~mLastTimeStamp) << 1);
- ALOGV("Raw stamp \t\t now %llx \t\t last %llx",
- (long long)rtpTime, (long long)tempLastTimeStamp);
-
- int64_t diffTimeStampUs = abs(rtpTime - tempLastTimeStamp) * 1000000ll / mClockRate;
- int64_t diffArrivalUs = abs(arrivalTimeUs - mLastArrivalTimeUs);
- ALOGV("diffTimeStampus %lld \t\t diffArrivalUs %lld",
- (long long)diffTimeStampUs, (long long)diffArrivalUs);
// 6.4.1 of RFC3550 defines this interarrival jitter value.
- mJitterValueUs = (mJitterValueUs * 15 + abs(diffTimeStampUs - diffArrivalUs)) / 16;
- ALOGV("JitterUs %lld", (long long)mJitterValueUs);
+ int64_t diffTimeStampUs = abs(tempRtpTime - tempLastTimeStamp) * 1000000ll / mClockRate;
+ int64_t diffArrivalUs = arrivalTimeUs - mLastArrivalTimeUs; // Can't be minus
+ ALOGV("diffTimeStampUs %lld \t\t diffArrivalUs %lld",
+ (long long)diffTimeStampUs, (long long)diffArrivalUs);
+
+ int64_t varianceUs = diffArrivalUs - diffTimeStampUs;
+ mInterArrivalJitterUs = (mInterArrivalJitterUs * 15 + abs(varianceUs)) / 16;
mLastTimeStamp = (uint32_t)rtpTime;
mLastArrivalTimeUs = arrivalTimeUs;
}
-uint32_t JitterCalc::getJitterMs() {
- return mJitterValueUs / 1000;
+int32_t JitterCalc::getBaseJitterMs() {
+ return mBaseJitterUs / 1000;
+}
+
+int32_t JitterCalc::getInterArrivalJitterMs() {
+ return mInterArrivalJitterUs / 1000;
}
} // namespace android
diff --git a/media/libstagefright/rtsp/JitterCalculator.h b/media/libstagefright/rtsp/JitterCalculator.h
index 03e43ff..ff36f1f 100644
--- a/media/libstagefright/rtsp/JitterCalculator.h
+++ b/media/libstagefright/rtsp/JitterCalculator.h
@@ -28,15 +28,22 @@
// Time Stamp per Second
const int32_t mClockRate;
- uint32_t mJitterValueUs;
+ uint32_t mFirstTimeStamp;
uint32_t mLastTimeStamp;
+ int64_t mFirstArrivalTimeUs;
int64_t mLastArrivalTimeUs;
- void init();
+ int32_t mBaseJitterUs;
+ int32_t mInterArrivalJitterUs;
+
public:
JitterCalc(int32_t clockRate);
- void putData(int64_t rtpTime, int64_t arrivalTime);
- uint32_t getJitterMs();
+
+ void init(uint32_t rtpTime, int64_t arrivalTimeUs, int32_t base, int32_t inter);
+ void putInterArrivalData(int64_t rtpTime, int64_t arrivalTime);
+ void putBaseData(int64_t rtpTime, int64_t arrivalTimeUs);
+ int32_t getBaseJitterMs();
+ int32_t getInterArrivalJitterMs();
};
} // namespace android