Merge "MTP: Skip runtime thumbnail generation for Android Host" into sc-dev
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 1986272..f2bcebb 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -164,8 +164,8 @@
static const char *kCodecRecentLatencyAvg = "android.media.mediacodec.recent.avg"; /* in us */
static const char *kCodecRecentLatencyCount = "android.media.mediacodec.recent.n";
static const char *kCodecRecentLatencyHist = "android.media.mediacodec.recent.hist"; /* in us */
-static const char *kCodecPlaybackDuration =
- "android.media.mediacodec.playback-duration"; /* in sec */
+static const char *kCodecPlaybackDurationSec =
+ "android.media.mediacodec.playback-duration-sec"; /* in sec */
/* -1: shaper disabled
>=0: number of fields changed */
@@ -864,9 +864,9 @@
if (mLatencyUnknown > 0) {
mediametrics_setInt64(mMetricsHandle, kCodecLatencyUnknown, mLatencyUnknown);
}
- int64_t playbackDuration = mPlaybackDurationAccumulator->getDurationInSeconds();
- if (playbackDuration > 0) {
- mediametrics_setInt64(mMetricsHandle, kCodecPlaybackDuration, playbackDuration);
+ int64_t playbackDurationSec = mPlaybackDurationAccumulator->getDurationInSeconds();
+ if (playbackDurationSec > 0) {
+ mediametrics_setInt64(mMetricsHandle, kCodecPlaybackDurationSec, playbackDurationSec);
}
if (mLifetimeStartNs > 0) {
nsecs_t lifetime = systemTime(SYSTEM_TIME_MONOTONIC) - mLifetimeStartNs;
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
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 1bbc2ba..7045128 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -2652,7 +2652,8 @@
if (OK != res) {
ALOGE("%s: Failed to append dynamic depth tags: %s (%d)", __FUNCTION__,
strerror(-res), res);
- return res;
+ // Allow filtering of small JPEG sizes to succeed even if dynamic depth
+ // tags fail to generate.
}
return OK;
diff --git a/services/mediametrics/statsd_codec.cpp b/services/mediametrics/statsd_codec.cpp
index c1a5163..065c594 100644
--- a/services/mediametrics/statsd_codec.cpp
+++ b/services/mediametrics/statsd_codec.cpp
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <statslog.h>
+#include <stats_event.h>
#include "cleaner.h"
#include "MediaMetricsService.h"
@@ -43,11 +44,20 @@
{
if (item == nullptr) return false;
- // these go into the statsd wrapper
+ AStatsEvent* event = AStatsEvent_obtain();
+ AStatsEvent_setAtomId(event, android::util::MEDIA_CODEC_REPORTED);
+
const nsecs_t timestamp_nanos = MediaMetricsService::roundTime(item->getTimestamp());
- const std::string package_name = item->getPkgName();
- const int64_t package_version_code = item->getPkgVersionCode();
- const int64_t media_apex_version = 0;
+ AStatsEvent_writeInt64(event, timestamp_nanos);
+
+ std::string package_name = item->getPkgName();
+ AStatsEvent_writeString(event, package_name.c_str());
+
+ int64_t package_version_code = item->getPkgVersionCode();
+ AStatsEvent_writeInt64(event, package_version_code);
+
+ int64_t media_apex_version = 0;
+ AStatsEvent_writeInt64(event, media_apex_version);
// the rest into our own proto
//
@@ -55,297 +65,334 @@
// flesh out the protobuf we'll hand off with our data
//
- //android.media.mediacodec.log-session-id string
- std::string sessionId;
- if (item->getString("android.media.mediacodec.log-session-id", &sessionId)) {
- metrics_proto.set_log_session_id(sessionId);
- }
- // android.media.mediacodec.codec string
std::string codec;
if (item->getString("android.media.mediacodec.codec", &codec)) {
metrics_proto.set_codec(codec);
}
+ AStatsEvent_writeString(event, codec.c_str());
std::string mime;
if (item->getString("android.media.mediacodec.mime", &mime)) {
metrics_proto.set_mime(mime);
}
+ AStatsEvent_writeString(event, mime.c_str());
std::string mode;
- if ( item->getString("android.media.mediacodec.mode", &mode)) {
+ if (item->getString("android.media.mediacodec.mode", &mode)) {
metrics_proto.set_mode(mode);
}
+ AStatsEvent_writeString(event, mode.c_str());
int32_t encoder = -1;
- if ( item->getInt32("android.media.mediacodec.encoder", &encoder)) {
+ if (item->getInt32("android.media.mediacodec.encoder", &encoder)) {
metrics_proto.set_encoder(encoder);
}
+ AStatsEvent_writeInt32(event, encoder);
int32_t secure = -1;
- if ( item->getInt32("android.media.mediacodec.secure", &secure)) {
+ if (item->getInt32("android.media.mediacodec.secure", &secure)) {
metrics_proto.set_secure(secure);
}
+ AStatsEvent_writeInt32(event, secure);
int32_t width = -1;
- if ( item->getInt32("android.media.mediacodec.width", &width)) {
+ if (item->getInt32("android.media.mediacodec.width", &width)) {
metrics_proto.set_width(width);
}
+ AStatsEvent_writeInt32(event, width);
int32_t height = -1;
- if ( item->getInt32("android.media.mediacodec.height", &height)) {
+ if (item->getInt32("android.media.mediacodec.height", &height)) {
metrics_proto.set_height(height);
}
+ AStatsEvent_writeInt32(event, height);
int32_t rotation = -1;
- if ( item->getInt32("android.media.mediacodec.rotation-degrees", &rotation)) {
+ if (item->getInt32("android.media.mediacodec.rotation-degrees", &rotation)) {
metrics_proto.set_rotation(rotation);
}
- // android.media.mediacodec.crypto int32 (although missing if not needed)
+ AStatsEvent_writeInt32(event, rotation);
+
int32_t crypto = -1;
- if ( item->getInt32("android.media.mediacodec.crypto", &crypto)) {
+ if (item->getInt32("android.media.mediacodec.crypto", &crypto)) {
metrics_proto.set_crypto(crypto);
}
+ AStatsEvent_writeInt32(event, crypto);
int32_t profile = -1;
- if ( item->getInt32("android.media.mediacodec.profile", &profile)) {
+ if (item->getInt32("android.media.mediacodec.profile", &profile)) {
metrics_proto.set_profile(profile);
}
+ AStatsEvent_writeInt32(event, profile);
int32_t level = -1;
- if ( item->getInt32("android.media.mediacodec.level", &level)) {
+ if (item->getInt32("android.media.mediacodec.level", &level)) {
metrics_proto.set_level(level);
}
+ AStatsEvent_writeInt32(event, level);
+
int32_t max_width = -1;
if ( item->getInt32("android.media.mediacodec.maxwidth", &max_width)) {
metrics_proto.set_max_width(max_width);
}
+ AStatsEvent_writeInt32(event, max_width);
int32_t max_height = -1;
if ( item->getInt32("android.media.mediacodec.maxheight", &max_height)) {
metrics_proto.set_max_height(max_height);
}
+ AStatsEvent_writeInt32(event, max_height);
int32_t error_code = -1;
if ( item->getInt32("android.media.mediacodec.errcode", &error_code)) {
metrics_proto.set_error_code(error_code);
}
+ AStatsEvent_writeInt32(event, error_code);
std::string error_state;
if ( item->getString("android.media.mediacodec.errstate", &error_state)) {
metrics_proto.set_error_state(error_state);
}
+ AStatsEvent_writeString(event, error_state.c_str());
int64_t latency_max = -1;
- if ( item->getInt64("android.media.mediacodec.latency.max", &latency_max)) {
+ if (item->getInt64("android.media.mediacodec.latency.max", &latency_max)) {
metrics_proto.set_latency_max(latency_max);
}
+ AStatsEvent_writeInt64(event, latency_max);
int64_t latency_min = -1;
- if ( item->getInt64("android.media.mediacodec.latency.min", &latency_min)) {
+ if (item->getInt64("android.media.mediacodec.latency.min", &latency_min)) {
metrics_proto.set_latency_min(latency_min);
}
+ AStatsEvent_writeInt64(event, latency_min);
int64_t latency_avg = -1;
- if ( item->getInt64("android.media.mediacodec.latency.avg", &latency_avg)) {
+ if (item->getInt64("android.media.mediacodec.latency.avg", &latency_avg)) {
metrics_proto.set_latency_avg(latency_avg);
}
+ AStatsEvent_writeInt64(event, latency_avg);
int64_t latency_count = -1;
- if ( item->getInt64("android.media.mediacodec.latency.n", &latency_count)) {
+ if (item->getInt64("android.media.mediacodec.latency.n", &latency_count)) {
metrics_proto.set_latency_count(latency_count);
}
+ AStatsEvent_writeInt64(event, latency_count);
int64_t latency_unknown = -1;
- if ( item->getInt64("android.media.mediacodec.latency.unknown", &latency_unknown)) {
+ if (item->getInt64("android.media.mediacodec.latency.unknown", &latency_unknown)) {
metrics_proto.set_latency_unknown(latency_unknown);
}
+ AStatsEvent_writeInt64(event, latency_unknown);
int32_t queue_secure_input_buffer_error = -1;
if (item->getInt32("android.media.mediacodec.queueSecureInputBufferError",
- &queue_secure_input_buffer_error)) {
+ &queue_secure_input_buffer_error)) {
metrics_proto.set_queue_secure_input_buffer_error(queue_secure_input_buffer_error);
}
+ AStatsEvent_writeInt32(event, queue_secure_input_buffer_error);
int32_t queue_input_buffer_error = -1;
if (item->getInt32("android.media.mediacodec.queueInputBufferError",
- &queue_input_buffer_error)) {
+ &queue_input_buffer_error)) {
metrics_proto.set_queue_input_buffer_error(queue_input_buffer_error);
}
- // android.media.mediacodec.latency.hist NOT EMITTED
+ AStatsEvent_writeInt32(event, queue_input_buffer_error);
std::string bitrate_mode;
if (item->getString("android.media.mediacodec.bitrate_mode", &bitrate_mode)) {
metrics_proto.set_bitrate_mode(bitrate_mode);
}
+ AStatsEvent_writeString(event, bitrate_mode.c_str());
int32_t bitrate = -1;
if (item->getInt32("android.media.mediacodec.bitrate", &bitrate)) {
metrics_proto.set_bitrate(bitrate);
}
+ AStatsEvent_writeInt32(event, bitrate);
int64_t lifetime_millis = -1;
if (item->getInt64("android.media.mediacodec.lifetimeMs", &lifetime_millis)) {
lifetime_millis = mediametrics::bucket_time_minutes(lifetime_millis);
metrics_proto.set_lifetime_millis(lifetime_millis);
}
+ AStatsEvent_writeInt64(event, lifetime_millis);
- // android.media.mediacodec.channelCount
+ int64_t playback_duration_sec = -1;
+ item->getInt64("android.media.mediacodec.playback-duration-sec", &playback_duration_sec);
+ // DO NOT record playback-duration in the metrics_proto - it should only
+ // exist in the flattened atom
+ AStatsEvent_writeInt64(event, playback_duration_sec);
+
+ std::string sessionId;
+ if (item->getString("android.media.mediacodec.log-session-id", &sessionId)) {
+ metrics_proto.set_log_session_id(sessionId);
+ }
+ AStatsEvent_writeString(event, codec.c_str());
+
int32_t channelCount = -1;
- if ( item->getInt32("android.media.mediacodec.channelCount", &channelCount)) {
+ if (item->getInt32("android.media.mediacodec.channelCount", &channelCount)) {
metrics_proto.set_channel_count(channelCount);
}
+ AStatsEvent_writeInt32(event, channelCount);
- // android.media.mediacodec.sampleRate
int32_t sampleRate = -1;
- if ( item->getInt32("android.media.mediacodec.sampleRate", &sampleRate)) {
+ if (item->getInt32("android.media.mediacodec.sampleRate", &sampleRate)) {
metrics_proto.set_sample_rate(sampleRate);
}
+ AStatsEvent_writeInt32(event, sampleRate);
// TODO PWG may want these fuzzed up a bit to obscure some precision
- // android.media.mediacodec.vencode.bytes
int64_t bytes = -1;
- if ( item->getInt64("android.media.mediacodec.vencode.bytes", &bytes)) {
+ if (item->getInt64("android.media.mediacodec.vencode.bytes", &bytes)) {
metrics_proto.set_video_encode_bytes(bytes);
}
+ AStatsEvent_writeInt64(event, bytes);
- // android.media.mediacodec.vencode.frames
int64_t frames = -1;
- if ( item->getInt64("android.media.mediacodec.vencode.frames", &frames)) {
+ if (item->getInt64("android.media.mediacodec.vencode.frames", &frames)) {
metrics_proto.set_video_encode_frames(frames);
}
+ AStatsEvent_writeInt64(event, frames);
- // android.media.mediacodec.vencode.durationUs
- int64_t durationUs = -1;
- if ( item->getInt64("android.media.mediacodec.vencode.durationUs", &durationUs)) {
- metrics_proto.set_video_encode_duration_us(durationUs);
- }
-
- // android.media.mediacodec.color-format
- int32_t colorFormat = -1;
- if ( item->getInt32("android.media.mediacodec.color-format", &colorFormat)) {
- metrics_proto.set_color_format(colorFormat);
- }
-
- // android.media.mediacodec.frame-rate
- double frameRate = -1.0;
- if ( item->getDouble("android.media.mediacodec.frame-rate", &frameRate)) {
- metrics_proto.set_frame_rate(frameRate);
- }
-
- // android.media.mediacodec.capture-rate
- double captureRate = -1.0;
- if ( item->getDouble("android.media.mediacodec.capture-rate", &captureRate)) {
- metrics_proto.set_capture_rate(captureRate);
- }
-
- // android.media.mediacodec.operating-rate
- double operatingRate = -1.0;
- if ( item->getDouble("android.media.mediacodec.operating-rate", &operatingRate)) {
- metrics_proto.set_operating_rate(operatingRate);
- }
-
- // android.media.mediacodec.priority
- int32_t priority = -1;
- if ( item->getInt32("android.media.mediacodec.priority", &priority)) {
- metrics_proto.set_priority(priority);
- }
-
- // android.media.mediacodec.video-qp-i-min
- int32_t qpIMin = -1;
- if ( item->getInt32("android.media.mediacodec.video-qp-i-min", &qpIMin)) {
- metrics_proto.set_video_qp_i_min(qpIMin);
- }
-
- // android.media.mediacodec.video-qp-i-max
- int32_t qpIMax = -1;
- if ( item->getInt32("android.media.mediacodec.video-qp-i-max", &qpIMax)) {
- metrics_proto.set_video_qp_i_max(qpIMax);
- }
-
- // android.media.mediacodec.video-qp-p-min
- int32_t qpPMin = -1;
- if ( item->getInt32("android.media.mediacodec.video-qp-p-min", &qpPMin)) {
- metrics_proto.set_video_qp_p_min(qpPMin);
- }
-
- // android.media.mediacodec.video-qp-p-max
- int32_t qpPMax = -1;
- if ( item->getInt32("android.media.mediacodec.video-qp-p-max", &qpPMax)) {
- metrics_proto.set_video_qp_p_max(qpPMax);
- }
-
- // android.media.mediacodec.video-qp-b-min
- int32_t qpBMin = -1;
- if ( item->getInt32("android.media.mediacodec.video-qp-b-min", &qpBMin)) {
- metrics_proto.set_video_qp_b_min(qpIMin);
- }
-
- // android.media.mediacodec.video-qp-b-max
- int32_t qpBMax = -1;
- if ( item->getInt32("android.media.mediacodec.video-qp-b-max", &qpBMax)) {
- metrics_proto.set_video_qp_b_max(qpBMax);
- }
-
- // android.media.mediacodec.video.input.bytes
int64_t inputBytes = -1;
- if ( item->getInt64("android.media.mediacodec.video.input.bytes", &inputBytes)) {
+ if (item->getInt64("android.media.mediacodec.video.input.bytes", &inputBytes)) {
metrics_proto.set_video_input_bytes(inputBytes);
}
+ AStatsEvent_writeInt64(event, inputBytes);
- // android.media.mediacodec.video.input.frames
int64_t inputFrames = -1;
- if ( item->getInt64("android.media.mediacodec.video.input.frames", &inputFrames)) {
+ if (item->getInt64("android.media.mediacodec.video.input.frames", &inputFrames)) {
metrics_proto.set_video_input_frames(inputFrames);
}
+ AStatsEvent_writeInt64(event, inputFrames);
- // android.media.mediacodec.original.bitrate
+ int64_t durationUs = -1;
+ if (item->getInt64("android.media.mediacodec.vencode.durationUs", &durationUs)) {
+ metrics_proto.set_video_encode_duration_us(durationUs);
+ }
+ AStatsEvent_writeInt64(event, durationUs);
+
+ int32_t colorFormat = -1;
+ if (item->getInt32("android.media.mediacodec.color-format", &colorFormat)) {
+ metrics_proto.set_color_format(colorFormat);
+ }
+ AStatsEvent_writeInt32(event, colorFormat);
+
+ double frameRate = -1.0;
+ if (item->getDouble("android.media.mediacodec.frame-rate", &frameRate)) {
+ metrics_proto.set_frame_rate(frameRate);
+ }
+ AStatsEvent_writeFloat(event, (float) frameRate);
+
+ double captureRate = -1.0;
+ if (item->getDouble("android.media.mediacodec.capture-rate", &captureRate)) {
+ metrics_proto.set_capture_rate(captureRate);
+ }
+ AStatsEvent_writeFloat(event, (float) captureRate);
+
+ double operatingRate = -1.0;
+ if (item->getDouble("android.media.mediacodec.operating-rate", &operatingRate)) {
+ metrics_proto.set_operating_rate(operatingRate);
+ }
+ AStatsEvent_writeFloat(event, (float) operatingRate);
+
+ int32_t priority = -1;
+ if (item->getInt32("android.media.mediacodec.priority", &priority)) {
+ metrics_proto.set_priority(priority);
+ }
+ AStatsEvent_writeInt32(event, priority);
+
+ int32_t qpIMin = -1;
+ if (item->getInt32("android.media.mediacodec.video-qp-i-min", &qpIMin)) {
+ metrics_proto.set_video_qp_i_min(qpIMin);
+ }
+ AStatsEvent_writeInt32(event, qpIMin);
+
+ int32_t qpIMax = -1;
+ if (item->getInt32("android.media.mediacodec.video-qp-i-max", &qpIMax)) {
+ metrics_proto.set_video_qp_i_max(qpIMax);
+ }
+ AStatsEvent_writeInt32(event, qpIMax);
+
+ int32_t qpPMin = -1;
+ if (item->getInt32("android.media.mediacodec.video-qp-p-min", &qpPMin)) {
+ metrics_proto.set_video_qp_p_min(qpPMin);
+ }
+ AStatsEvent_writeInt32(event, qpPMin);
+
+ int32_t qpPMax = -1;
+ if (item->getInt32("android.media.mediacodec.video-qp-p-max", &qpPMax)) {
+ metrics_proto.set_video_qp_p_max(qpPMax);
+ }
+ AStatsEvent_writeInt32(event, qpPMax);
+
+ int32_t qpBMin = -1;
+ if (item->getInt32("android.media.mediacodec.video-qp-b-min", &qpBMin)) {
+ metrics_proto.set_video_qp_b_min(qpBMin);
+ }
+ AStatsEvent_writeInt32(event, qpBMin);
+
+ int32_t qpBMax = -1;
+ if (item->getInt32("android.media.mediacodec.video-qp-b-max", &qpBMax)) {
+ metrics_proto.set_video_qp_b_max(qpBMax);
+ }
+ AStatsEvent_writeInt32(event, qpBMax);
+
int32_t originalBitrate = -1;
- if ( item->getInt32("android.media.mediacodec.original.bitrate", &originalBitrate)) {
+ if (item->getInt32("android.media.mediacodec.original.bitrate", &originalBitrate)) {
metrics_proto.set_original_bitrate(originalBitrate);
}
+ AStatsEvent_writeInt32(event, originalBitrate);
- // android.media.mediacodec.shaped
int32_t shapingEnhanced = -1;
if ( item->getInt32("android.media.mediacodec.shaped", &shapingEnhanced)) {
metrics_proto.set_shaping_enhanced(shapingEnhanced);
}
+ AStatsEvent_writeInt32(event, shapingEnhanced);
- // android.media.mediacodec.original-video-qp-i-min
int32_t qpIMinOri = -1;
if ( item->getInt32("android.media.mediacodec.original-video-qp-i-min", &qpIMinOri)) {
metrics_proto.set_original_video_qp_i_min(qpIMinOri);
}
+ AStatsEvent_writeInt32(event, qpIMinOri);
- // android.media.mediacodec.original-video-qp-i-max
int32_t qpIMaxOri = -1;
if ( item->getInt32("android.media.mediacodec.original-video-qp-i-max", &qpIMaxOri)) {
metrics_proto.set_original_video_qp_i_max(qpIMaxOri);
}
+ AStatsEvent_writeInt32(event, qpIMaxOri);
- // android.media.mediacodec.original-video-qp-p-min
int32_t qpPMinOri = -1;
if ( item->getInt32("android.media.mediacodec.original-video-qp-p-min", &qpPMinOri)) {
metrics_proto.set_original_video_qp_p_min(qpPMinOri);
}
+ AStatsEvent_writeInt32(event, qpPMinOri);
- // android.media.mediacodec.original-video-qp-p-max
int32_t qpPMaxOri = -1;
if ( item->getInt32("android.media.mediacodec.original-video-qp-p-max", &qpPMaxOri)) {
metrics_proto.set_original_video_qp_p_max(qpPMaxOri);
}
+ AStatsEvent_writeInt32(event, qpPMaxOri);
- // android.media.mediacodec.original-video-qp-b-min
int32_t qpBMinOri = -1;
if ( item->getInt32("android.media.mediacodec.original-video-qp-b-min", &qpBMinOri)) {
- metrics_proto.set_original_video_qp_b_min(qpIMinOri);
+ metrics_proto.set_original_video_qp_b_min(qpBMinOri);
}
+ AStatsEvent_writeInt32(event, qpBMinOri);
- // android.media.mediacodec.original-video-qp-b-max
int32_t qpBMaxOri = -1;
if ( item->getInt32("android.media.mediacodec.original-video-qp-b-max", &qpBMaxOri)) {
metrics_proto.set_original_video_qp_b_max(qpBMaxOri);
}
+ AStatsEvent_writeInt32(event, qpBMaxOri);
+
+ int err = AStatsEvent_write(event);
+ if (err < 0) {
+ ALOGE("Failed to write codec metrics to statsd (%d)", err);
+ }
+ AStatsEvent_release(event);
std::string serialized;
if (!metrics_proto.SerializeToString(&serialized)) {
@@ -357,6 +404,7 @@
timestamp_nanos, package_name.c_str(), package_version_code,
media_apex_version,
bf_serialized);
+
std::stringstream log;
log << "result:" << result << " {"
<< " mediametrics_codec_reported:"
@@ -394,6 +442,7 @@
<< " bitrate:" << bitrate
<< " original_bitrate:" << originalBitrate
<< " lifetime_millis:" << lifetime_millis
+ << " playback_duration_seconds:" << playback_duration_sec
<< " log_session_id:" << sessionId
<< " channel_count:" << channelCount
<< " sample_rate:" << sampleRate
@@ -421,6 +470,8 @@
<< " original_qp_b_max:" << qpBMaxOri
<< " }";
statsdLog->log(android::util::MEDIAMETRICS_CODEC_REPORTED, log.str());
+
+
return true;
}
