Snap for 6659731 from 6665b818e0eebb672c09aea5a0c27492b87ea42b to rvc-qpr1-release (39ad93c5) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Writer.cpp

+28 −0

Original line number	Diff line number	Diff line
		@@ -1110,6 +1110,21 @@ void MPEG4Writer::writeCompositionMatrix(int degrees) {
		writeInt32(0x40000000); // w
		}

		void MPEG4Writer::printWriteDurations() {
		if (mWriteDurationPQ.empty()) {
		return;
		}
		std::string writeDurationsString =
		"Top " + std::to_string(mWriteDurationPQ.size()) + " write durations(microseconds):";
		uint8_t i = 0;
		while (!mWriteDurationPQ.empty()) {
		writeDurationsString +=
		" #" + std::to_string(++i) + ":" + std::to_string(mWriteDurationPQ.top().count());
		mWriteDurationPQ.pop();
		}
		ALOGD("%s", writeDurationsString.c_str());
		}

		status_t MPEG4Writer::release() {
		ALOGD("release()");
		status_t err = OK;
		@@ -1138,6 +1153,9 @@ status_t MPEG4Writer::release() {
		mStarted = false;
		free(mInMemoryCache);
		mInMemoryCache = NULL;

		printWriteDurations();

		return err;
		}

		@@ -1594,7 +1612,17 @@ size_t MPEG4Writer::write(
		void MPEG4Writer::writeOrPostError(int fd, const void* buf, size_t count) {
		if (mWriteSeekErr == true)
		return;

		auto beforeTP = std::chrono::high_resolution_clock::now();
		ssize_t bytesWritten = ::write(fd, buf, count);
		auto afterTP = std::chrono::high_resolution_clock::now();
		auto writeDuration =
		std::chrono::duration_cast<std::chrono::microseconds>(afterTP - beforeTP).count();
		mWriteDurationPQ.emplace(writeDuration);
		if (mWriteDurationPQ.size() > kWriteDurationsCount) {
		mWriteDurationPQ.pop();
		}

		/* Write as much as possible during stop() execution when there was an error
		* (mWriteSeekErr == true) in the previous call to write() or lseek64().
		*/

+6 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <media/stagefright/foundation/AHandlerReflector.h>
		#include <media/stagefright/foundation/ALooper.h>
		#include <mutex>
		#include <queue>

		namespace android {

		@@ -125,6 +126,10 @@ private:
		bool mWriteSeekErr;
		bool mFallocateErr;
		bool mPreAllocationEnabled;
		// Queue to hold top long write durations
		std::priority_queue<std::chrono::microseconds, std::vector<std::chrono::microseconds>,
		std::greater<std::chrono::microseconds>> mWriteDurationPQ;
		const uint8_t kWriteDurationsCount = 5;

		sp<ALooper> mLooper;
		sp<AHandlerReflector<MPEG4Writer> > mReflector;
		@@ -149,6 +154,7 @@ private:
		int64_t estimateMoovBoxSize(int32_t bitRate);
		int64_t estimateFileLevelMetaSize(MetaData *params);
		void writeCachedBoxToFile(const char *type);
		void printWriteDurations();

		struct Chunk {
		Track *mTrack; // Owner