Snap for 6259407 from c42069ac43575462429c8dd83fda7730dda1771d to rvc-release (113040dc) · Commits · e / os / android_frameworks_av

apex/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		apex_defaults {
		name: "com.android.media-defaults",
		updatable: true,
		java_libs: ["updatable-media"],
		multilib: {
		first: {
		@@ -65,6 +66,7 @@ filegroup {

		apex_defaults {
		name: "com.android.media.swcodec-defaults",
		updatable: true,
		binaries: [
		"mediaswcodec",
		],

media/libstagefright/MPEG4Writer.cpp

+40 −11

Original line number	Diff line number	Diff line
		@@ -3108,6 +3108,7 @@ status_t MPEG4Writer::Track::threadEntry() {
		int32_t nActualFrames = 0; // frames containing non-CSD data (non-0 length)
		int32_t nZeroLengthFrames = 0;
		int64_t lastTimestampUs = 0; // Previous sample time stamp
		int64_t previousSampleTimestampWithoutFudgeUs = 0; // Timestamp received/without fudge for STTS
		int64_t lastDurationUs = 0; // Between the previous two samples
		int64_t currDurationTicks = 0; // Timescale based ticks
		int64_t lastDurationTicks = 0; // Timescale based ticks
		@@ -3120,6 +3121,8 @@ status_t MPEG4Writer::Track::threadEntry() {
		int64_t lastCttsOffsetTimeTicks = -1; // Timescale based ticks
		int32_t cttsSampleCount = 0; // Sample count in the current ctts table entry
		uint32_t lastSamplesPerChunk = 0;
		int64_t lastSampleDurationUs = -1; // Duration calculated from EOS buffer and its timestamp
		int64_t lastSampleDurationTicks = -1; // Timescale based ticks

		if (mIsAudio) {
		prctl(PR_SET_NAME, (unsigned long)"AudioTrackWriterThread", 0, 0, 0);
		@@ -3139,13 +3142,27 @@ status_t MPEG4Writer::Track::threadEntry() {
		MediaBufferBase *buffer;
		const char *trackName = getTrackType();
		while (!mDone && (err = mSource->read(&buffer)) == OK) {
		int32_t isEOS = false;
		if (buffer->range_length() == 0) {
		if (buffer->meta_data().findInt32(kKeyIsEndOfStream, &isEOS) && isEOS) {
		int64_t eosSampleTimestampUs = -1;
		CHECK(buffer->meta_data().findInt64(kKeyTime, &eosSampleTimestampUs));
		ALOGV("eosSampleTimestampUs:%" PRId64, eosSampleTimestampUs);
		lastSampleDurationUs = eosSampleTimestampUs - previousSampleTimestampWithoutFudgeUs
		- previousPausedDurationUs;
		CHECK(lastSampleDurationUs >= 0);
		lastSampleDurationTicks = (lastSampleDurationUs * mTimeScale + 500000LL)/1000000LL;
		buffer->release();
		buffer = NULL;
		buffer = nullptr;
		mSource->stop();
		break;
		} else {
		buffer->release();
		buffer = nullptr;
		++nZeroLengthFrames;
		continue;
		}

		}

		// If the codec specific data has not been received yet, delay pause.
		// After the codec specific data is received, discard what we received
		@@ -3470,6 +3487,8 @@ status_t MPEG4Writer::Track::threadEntry() {
		break;
		}

		previousSampleTimestampWithoutFudgeUs = timestampUs;

		// if the duration is different for this sample, see if it is close enough to the previous
		// duration that we can fudge it and use the same value, to avoid filling the stts table
		// with lots of near-identical entries.
		@@ -3591,13 +3610,20 @@ status_t MPEG4Writer::Track::threadEntry() {
		// there is no frame time after it, just repeat the previous
		// frame's duration.
		if (mStszTableEntries->count() == 1) {
		if (lastSampleDurationUs >= 0) {
		addOneSttsTableEntry(sampleCount, lastSampleDurationTicks);
		} else {
		lastDurationUs = 0; // A single sample's duration
		lastDurationTicks = 0;
		addOneSttsTableEntry(sampleCount, lastDurationTicks);
		}
		} else if (lastSampleDurationUs >= 0) {
		addOneSttsTableEntry(sampleCount, lastDurationTicks);
		addOneSttsTableEntry(1, lastSampleDurationTicks);
		} else {
		++sampleCount; // Count for the last sample
		}

		addOneSttsTableEntry(sampleCount, lastDurationTicks);
		}

		// The last ctts box entry may not have been written yet, and this
		// is to make sure that we write out the last ctts box entry.
		@@ -3606,9 +3632,12 @@ status_t MPEG4Writer::Track::threadEntry() {
		addOneCttsTableEntry(cttsSampleCount, lastCttsOffsetTimeTicks);
		}
		}

		if (lastSampleDurationUs >= 0) {
		mTrackDurationUs += lastSampleDurationUs;
		} else {
		mTrackDurationUs += lastDurationUs;
		}
		}
		mReachedEOS = true;

		sendTrackSummary(hasMultipleTracks);

media/libstagefright/MediaMuxer.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,11 @@ status_t MediaMuxer::writeSampleData(const sp<ABuffer> &buffer, size_t trackInde
		sampleMetaData.setInt32(kKeyIsMuxerData, 1);
		}

		if (flags & MediaCodec::BUFFER_FLAG_EOS) {
		sampleMetaData.setInt32(kKeyIsEndOfStream, 1);
		ALOGV("BUFFER_FLAG_EOS");
		}

		sp<MediaAdapter> currentTrack = mTrackList[trackIndex];
		// This pushBuffer will wait until the mediaBuffer is consumed.
		return currentTrack->pushBuffer(mediaBuffer);

media/libstagefright/include/media/stagefright/MetaDataBase.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ enum {
		kKeyIsSyncFrame = 'sync', // int32_t (bool)
		kKeyIsCodecConfig = 'conf', // int32_t (bool)
		kKeyIsMuxerData = 'muxd', // int32_t (bool)
		kKeyIsEndOfStream = 'feos', // int32_t (bool)
		kKeyTime = 'time', // int64_t (usecs)
		kKeyDecodingTime = 'decT', // int64_t (decoding timestamp in usecs)
		kKeyNTPTime = 'ntpT', // uint64_t (ntp-timestamp)

media/libstagefright/tests/writer/WriterTest.cpp

+7 −3

Original line number	Diff line number	Diff line
		@@ -243,6 +243,10 @@ int32_t WriterTest::addWriterSource(bool isAudio, configFormat params) {
		sp<MetaData> trackMeta = new MetaData;
		convertMessageToMetaData(format, trackMeta);
		mCurrentTrack = new MediaAdapter(trackMeta);
		if (mCurrentTrack == nullptr) {
		ALOGE("MediaAdapter returned nullptr");
		return -1;
		}
		status_t result = mWriter->addSource(mCurrentTrack);
		return result;
		}
		@@ -301,7 +305,7 @@ TEST_P(WriterTest, WriterTest) {
		getFileDetails(inputFile, inputInfo, param, isAudio, inputFileIdx);
		ASSERT_NE(inputFile.compare(gEnv->getRes()), 0) << "No input file specified";

		getInputBufferInfo(inputFile, inputInfo);
		ASSERT_NO_FATAL_FAILURE(getInputBufferInfo(inputFile, inputInfo));
		status = addWriterSource(isAudio, param);
		ASSERT_EQ((status_t)OK, status) << "Failed to add source for " << writerFormat << "Writer";

		@@ -338,7 +342,7 @@ TEST_P(WriterTest, PauseWriterTest) {
		getFileDetails(inputFile, inputInfo, param, isAudio, inputFileIdx);
		ASSERT_NE(inputFile.compare(gEnv->getRes()), 0) << "No input file specified";

		getInputBufferInfo(inputFile, inputInfo);
		ASSERT_NO_FATAL_FAILURE(getInputBufferInfo(inputFile, inputInfo));
		status = addWriterSource(isAudio, param);
		ASSERT_EQ((status_t)OK, status) << "Failed to add source for " << writerFormat << "Writer";

		@@ -397,7 +401,7 @@ TEST_P(WriterTest, MultiStartStopPauseTest) {
		getFileDetails(inputFile, inputInfo, param, isAudio, inputFileIdx);
		ASSERT_NE(inputFile.compare(gEnv->getRes()), 0) << "No input file specified";

		getInputBufferInfo(inputFile, inputInfo);
		ASSERT_NO_FATAL_FAILURE(getInputBufferInfo(inputFile, inputInfo));
		status = addWriterSource(isAudio, param);
		ASSERT_EQ((status_t)OK, status) << "Failed to add source for " << writerFormat << "Writer";