DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master (c9e23f45) · Commits · e / os / android_frameworks_av

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,13 @@ class Codec2VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		mTimestampUs = 0u;
		mTimestampDevTest = false;
		if (mCompName == unknown_comp) mDisableTest = true;

		C2SecureModeTuning secureModeTuning{};
		mComponent->query({ &secureModeTuning }, {}, C2_MAY_BLOCK, nullptr);
		if (secureModeTuning.value == C2Config::SM_READ_PROTECTED) {
		mDisableTest = true;
		}

		if (mDisableTest) std::cout << "[ WARN ] Test Disabled \n";
		}

media/codec2/hidl/client/client.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -959,9 +959,9 @@ std::vector<C2Component::Traits> const& Codec2Client::ListComponents() {

		std::shared_ptr<Codec2Client::InputSurface> Codec2Client::CreateInputSurface(
		char const* serviceName) {
		uint32_t inputSurfaceSetting = ::android::base::GetUintProperty(
		"debug.stagefright.c2inputsurface", uint32_t(0));
		if (inputSurfaceSetting == 0) {
		int32_t inputSurfaceSetting = ::android::base::GetIntProperty(
		"debug.stagefright.c2inputsurface", int32_t(0));
		if (inputSurfaceSetting <= 0) {
		return nullptr;
		}
		size_t index = GetServiceNames().size();

media/codec2/sfplugin/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ cc_library_shared {
		"CCodecConfig.cpp",
		"Codec2Buffer.cpp",
		"Codec2InfoBuilder.cpp",
		"Omx2IGraphicBufferSource.cpp",
		"PipelineWatcher.cpp",
		"ReflectedParamUpdater.cpp",
		"SkipCutBuffer.cpp",
		@@ -41,8 +42,10 @@ cc_library_shared {
		"libmedia",
		"libmedia_omx",
		"libsfplugin_ccodec_utils",
		"libstagefright_bufferqueue_helper",
		"libstagefright_codecbase",
		"libstagefright_foundation",
		"libstagefright_omx",
		"libstagefright_omx_utils",
		"libstagefright_xmlparser",
		"libui",

media/codec2/sfplugin/CCodec.cpp

+22 −5

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@
		#include "CCodec.h"
		#include "CCodecBufferChannel.h"
		#include "InputSurfaceWrapper.h"
		#include "Omx2IGraphicBufferSource.h"

		extern "C" android::PersistentSurface *CreateInputSurface();

		@@ -1067,6 +1068,7 @@ sp<PersistentSurface> CCodec::CreateOmxInputSurface() {
		OmxStatus s;
		android::sp<HGraphicBufferProducer> gbp;
		android::sp<HGraphicBufferSource> gbs;

		using ::android::hardware::Return;
		Return<void> transStatus = omx->createInputSurface(
		[&s, &gbp, &gbs](
		@@ -1852,15 +1854,30 @@ extern "C" android::CodecBase *CreateCodec() {

		// Create Codec 2.0 input surface
		extern "C" android::PersistentSurface *CreateInputSurface() {
		using namespace android;
		// Attempt to create a Codec2's input surface.
		std::shared_ptr<android::Codec2Client::InputSurface> inputSurface =
		android::Codec2Client::CreateInputSurface();
		std::shared_ptr<Codec2Client::InputSurface> inputSurface =
		Codec2Client::CreateInputSurface();
		if (!inputSurface) {
		if (property_get_int32("debug.stagefright.c2inputsurface", 0) == -1) {
		sp<IGraphicBufferProducer> gbp;
		sp<OmxGraphicBufferSource> gbs = new OmxGraphicBufferSource();
		status_t err = gbs->initCheck();
		if (err != OK) {
		ALOGE("Failed to create persistent input surface: error %d", err);
		return nullptr;
		}
		return new android::PersistentSurface(
		return new PersistentSurface(
		gbs->getIGraphicBufferProducer(),
		sp<IGraphicBufferSource>(
		new Omx2IGraphicBufferSource(gbs)));
		} else {
		return nullptr;
		}
		}
		return new PersistentSurface(
		inputSurface->getGraphicBufferProducer(),
		static_cast<android::sp<android::hidl::base::V1_0::IBase>>(
		static_cast<sp<android::hidl::base::V1_0::IBase>>(
		inputSurface->getHalInterface()));
		}

media/codec2/sfplugin/CCodecBufferChannel.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -896,6 +896,9 @@ status_t CCodecBufferChannel::start(
		input->buffers.reset(new DummyInputBuffers(mName));
		} else if (mMetaMode == MODE_ANW) {
		input->buffers.reset(new GraphicMetadataInputBuffers(mName));
		// This is to ensure buffers do not get released prematurely.
		// TODO: handle this without going into array mode
		forceArrayMode = true;
		} else {
		input->buffers.reset(new GraphicInputBuffers(numInputSlots, mName));
		}