Merge changes I0aa848bb,If81dd3c1,Ib03bde00,I1ae58c7f (7327aab8) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodecBufferChannel.cpp

+33 −9

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

		#include <android/hardware/cas/native/1.0/IDescrambler.h>
		#include <android/hardware/drm/1.0/types.h>
		#include <android-base/properties.h>
		#include <android-base/stringprintf.h>
		#include <binder/MemoryBase.h>
		#include <binder/MemoryDealer.h>
		@@ -253,6 +254,16 @@ status_t CCodecBufferChannel::queueInputBufferInternal(
		usesFrameReassembler = true;
		input->frameReassembler.process(buffer, &items);
		} else {
		int32_t cvo = 0;
		if (buffer->meta()->findInt32("cvo", &cvo)) {
		int32_t rotation = cvo % 360;
		// change rotation to counter-clock wise.
		rotation = ((rotation <= 0) ? 0 : 360) - rotation;

		Mutexed<OutputSurface>::Locked output(mOutputSurface);
		uint64_t frameIndex = work->input.ordinal.frameIndex.peeku();
		output->rotation[frameIndex] = rotation;
		}
		work->input.buffers.push_back(c2buffer);
		if (encryptedBlock) {
		work->input.infoBuffers.emplace_back(C2InfoBuffer::CreateLinearBuffer(
		@@ -747,6 +758,22 @@ status_t CCodecBufferChannel::renderOutputBuffer(
		c2Buffer->getInfo(C2StreamRotationInfo::output::PARAM_TYPE));
		bool flip = rotation && (rotation->flip & 1);
		uint32_t quarters = ((rotation ? rotation->value : 0) / 90) & 3;

		{
		Mutexed<OutputSurface>::Locked output(mOutputSurface);
		if (output->surface == nullptr) {
		ALOGI("[%s] cannot render buffer without surface", mName);
		return OK;
		}
		int64_t frameIndex;
		buffer->meta()->findInt64("frameIndex", &frameIndex);
		if (output->rotation.count(frameIndex) != 0) {
		auto it = output->rotation.find(frameIndex);
		quarters = (it->second / 90) & 3;
		output->rotation.erase(it);
		}
		}

		uint32_t transform = 0;
		switch (quarters) {
		case 0: // no rotation
		@@ -790,14 +817,6 @@ status_t CCodecBufferChannel::renderOutputBuffer(
		hdr10PlusInfo.reset();
		}

		{
		Mutexed<OutputSurface>::Locked output(mOutputSurface);
		if (output->surface == nullptr) {
		ALOGI("[%s] cannot render buffer without surface", mName);
		return OK;
		}
		}

		std::vector<C2ConstGraphicBlock> blocks = c2Buffer->data().graphicBlocks();
		if (blocks.size() != 1u) {
		ALOGD("[%s] expected 1 graphic block, but got %zu", mName, blocks.size());
		@@ -873,7 +892,12 @@ status_t CCodecBufferChannel::renderOutputBuffer(
		}
		return result;
		}

		if(android::base::GetBoolProperty("debug.stagefright.fps", false)) {
		ALOGD("[%s] queue buffer successful", mName);
		} else {
		ALOGV("[%s] queue buffer successful", mName);
		}

		int64_t mediaTimeUs = 0;
		(void)buffer->meta()->findInt64("timeUs", &mediaTimeUs);

media/codec2/sfplugin/CCodecBufferChannel.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,7 @@ private:
		sp<Surface> surface;
		uint32_t generation;
		int maxDequeueBuffers;
		std::map<uint64_t, int> rotation;
		};
		Mutexed<OutputSurface> mOutputSurface;

media/codec2/sfplugin/CCodecBuffers.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -316,6 +316,7 @@ OutputBuffers::BufferAction OutputBuffers::popFromStashAndRegister(
		// Append information from the front stash entry to outBuffer.
		(*outBuffer)->meta()->setInt64("timeUs", entry.timestamp);
		(*outBuffer)->meta()->setInt32("flags", entry.flags);
		(*outBuffer)->meta()->setInt64("frameIndex", entry.ordinal.frameIndex.peekll());
		ALOGV("[%s] popFromStashAndRegister: "
		"out buffer index = %zu [%p] => %p + %zu (%lld)",
		mName, *index, outBuffer->get(),

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -746,9 +746,15 @@ bool NuPlayer::Decoder::handleAnOutputBuffer(

		mOutputBuffers.editItemAt(index) = buffer;

		int64_t frameIndex;
		bool frameIndexFound = buffer->meta()->findInt64("frameIndex", &frameIndex);

		buffer->setRange(offset, size);
		buffer->meta()->clear();
		buffer->meta()->setInt64("timeUs", timeUs);
		if (frameIndexFound) {
		buffer->meta()->setInt64("frameIndex", frameIndex);
		}

		bool eos = flags & MediaCodec::BUFFER_FLAG_EOS;
		// we do not expect CODECCONFIG or SYNCFRAME for decoder

media/libstagefright/rtsp/AAVCAssembler.cpp

+61 −6

Original line number	Diff line number	Diff line
		@@ -25,8 +25,11 @@
		#include <media/stagefright/foundation/ABuffer.h>
		#include <media/stagefright/foundation/ADebug.h>
		#include <media/stagefright/foundation/AMessage.h>
		#include <media/stagefright/foundation/avc_utils.h>
		#include <media/stagefright/foundation/hexdump.h>

		#include <android-base/properties.h>

		#include <stdint.h>

		namespace android {
		@@ -39,7 +42,9 @@ AAVCAssembler::AAVCAssembler(const sp<AMessage> &notify)
		mNextExpectedSeqNo(0),
		mAccessUnitDamaged(false),
		mFirstIFrameProvided(false),
		mLastIFrameProvidedAtMs(0) {
		mLastIFrameProvidedAtMs(0),
		mWidth(0),
		mHeight(0) {
		}

		AAVCAssembler::~AAVCAssembler() {
		@@ -115,6 +120,8 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addNALUnit(
		sp<ABuffer> buffer = *queue->begin();
		uint32_t rtpTime;
		CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&rtpTime));
		buffer->meta()->setObject("source", source);

		int64_t startTime = source->mFirstSysTime / 1000;
		int64_t nowTime = ALooper::GetNowUs() / 1000;
		int64_t playedTime = nowTime - startTime;
		@@ -224,6 +231,21 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addNALUnit(
		}
		}

		void AAVCAssembler::checkSpsUpdated(const sp<ABuffer> &buffer) {
		const uint8_t *data = buffer->data();
		unsigned nalType = data[0] & 0x1f;
		if (nalType == 0x7) {
		int32_t width = 0, height = 0;
		FindAVCDimensions(buffer, &width, &height);
		if (width != mWidth \|\| height != mHeight) {
		mFirstIFrameProvided = false;
		mWidth = width;
		mHeight = height;
		ALOGD("found a new resolution (%u x %u)", mWidth, mHeight);
		}
		}
		}

		void AAVCAssembler::checkIFrameProvided(const sp<ABuffer> &buffer) {
		if (buffer->size() == 0) {
		return;
		@@ -231,26 +253,50 @@ void AAVCAssembler::checkIFrameProvided(const sp<ABuffer> &buffer) {
		const uint8_t *data = buffer->data();
		unsigned nalType = data[0] & 0x1f;
		if (nalType == 0x5) {
		mFirstIFrameProvided = true;
		mLastIFrameProvidedAtMs = ALooper::GetNowUs() / 1000;
		if (!mFirstIFrameProvided) {
		mFirstIFrameProvided = true;

		uint32_t rtpTime;
		CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&rtpTime));
		ALOGD("got First I-frame to be decoded. rtpTime=%u, size=%zu", rtpTime, buffer->size());
		ALOGD("got First I-frame to be decoded. rtpTime=%d, size=%zu", rtpTime, buffer->size());
		}
		}
		}

		bool AAVCAssembler::dropFramesUntilIframe(const sp<ABuffer> &buffer) {
		const uint8_t *data = buffer->data();
		unsigned nalType = data[0] & 0x1f;
		if (!mFirstIFrameProvided && nalType < 0x5) {
		return true;
		}

		return false;
		}

		void AAVCAssembler::addSingleNALUnit(const sp<ABuffer> &buffer) {
		ALOGV("addSingleNALUnit of size %zu", buffer->size());
		#if !LOG_NDEBUG
		hexdump(buffer->data(), buffer->size());
		#endif

		checkSpsUpdated(buffer);
		checkIFrameProvided(buffer);

		uint32_t rtpTime;
		CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&rtpTime));

		if (dropFramesUntilIframe(buffer)) {
		sp<ARTPSource> source = nullptr;
		buffer->meta()->findObject("source", (sp<android::RefBase>*)&source);
		if (source != nullptr) {
		ALOGD("Issued FIR to get the I-frame");
		source->onIssueFIRByAssembler();
		}
		ALOGV("Dropping P-frame till I-frame provided. rtpTime %u", rtpTime);
		return;
		}

		if (!mNALUnits.empty() && rtpTime != mAccessUnitRTPTime) {
		submitAccessUnit();
		}
		@@ -431,6 +477,7 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit(

		size_t offset = 1;
		int32_t cvo = -1;
		sp<ARTPSource> source = nullptr;
		List<sp<ABuffer> >::iterator it = queue->begin();
		for (size_t i = 0; i < totalCount; ++i) {
		const sp<ABuffer> &buffer = *it;
		@@ -442,6 +489,7 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit(

		memcpy(unit->data() + offset, buffer->data() + 2, buffer->size() - 2);

		buffer->meta()->findObject("source", (sp<android::RefBase>*)&source);
		buffer->meta()->findInt32("cvo", &cvo);
		offset += buffer->size() - 2;

		@@ -453,6 +501,9 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit(
		if (cvo >= 0) {
		unit->meta()->setInt32("cvo", cvo);
		}
		if (source != nullptr) {
		unit->meta()->setObject("source", source);
		}

		addSingleNALUnit(unit);

		@@ -464,7 +515,11 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit(
		void AAVCAssembler::submitAccessUnit() {
		CHECK(!mNALUnits.empty());

		if(android::base::GetBoolProperty("debug.stagefright.fps", false)) {
		ALOGD("Access unit complete (%zu nal units)", mNALUnits.size());
		} else {
		ALOGV("Access unit complete (%zu nal units)", mNALUnits.size());
		}

		size_t totalSize = 0;
		for (List<sp<ABuffer> >::iterator it = mNALUnits.begin();