Merge "MPEG4Writer: Better logging in DumpTimeStamps()"
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index b322670..1ec419a 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2914,14 +2914,18 @@
}
void MPEG4Writer::Track::dumpTimeStamps() {
- ALOGE("Dumping %s track's last 10 frames timestamp and frame type ", getTrackType());
- std::string timeStampString;
- for (std::list<TimestampDebugHelperEntry>::iterator entry = mTimestampDebugHelper.begin();
- entry != mTimestampDebugHelper.end(); ++entry) {
- timeStampString += "(" + std::to_string(entry->pts)+
- "us, " + std::to_string(entry->dts) + "us " + entry->frameType + ") ";
+ if (!mTimestampDebugHelper.empty()) {
+ std::string timeStampString = "Dumping " + std::string(getTrackType()) + " track's last " +
+ std::to_string(mTimestampDebugHelper.size()) +
+ " frames' timestamps(pts, dts) and frame type : ";
+ for (const TimestampDebugHelperEntry& entry : mTimestampDebugHelper) {
+ timeStampString += "\n(" + std::to_string(entry.pts) + "us, " +
+ std::to_string(entry.dts) + "us " + entry.frameType + ") ";
+ }
+ ALOGE("%s", timeStampString.c_str());
+ } else {
+ ALOGE("0 frames to dump timeStamps in %s track ", getTrackType());
}
- ALOGE("%s", timeStampString.c_str());
}
status_t MPEG4Writer::Track::threadEntry() {