Snap for 7206732 from 047263a05704ed32810b5c5cc0f529d4367f3acb to sc-release (398b0357) · Commits · e / os / android_frameworks_av

drm/libmediadrm/DrmHal.cpp

+10 −5

Original line number	Diff line number	Diff line
		@@ -317,8 +317,7 @@ void DrmHal::cleanup() {
		closeOpenSessions();

		Mutex::Autolock autoLock(mLock);
		reportPluginMetrics();
		reportFrameworkMetrics();
		reportFrameworkMetrics(reportPluginMetrics());

		setListener(NULL);
		mInitCheck = NO_INIT;
		@@ -1464,7 +1463,7 @@ status_t DrmHal::signRSA(Vector<uint8_t> const &sessionId,
		return hResult.isOk() ? err : DEAD_OBJECT;
		}

		void DrmHal::reportFrameworkMetrics() const
		std::string DrmHal::reportFrameworkMetrics(const std::string& pluginMetrics) const
		{
		mediametrics_handle_t item(mediametrics_create("mediadrm"));
		mediametrics_setUid(item, mMetrics.GetAppUid());
		@@ -1493,21 +1492,26 @@ void DrmHal::reportFrameworkMetrics() const
		if (!b64EncodedMetrics.empty()) {
		mediametrics_setCString(item, "serialized_metrics", b64EncodedMetrics.c_str());
		}
		if (!pluginMetrics.empty()) {
		mediametrics_setCString(item, "plugin_metrics", pluginMetrics.c_str());
		}
		if (!mediametrics_selfRecord(item)) {
		ALOGE("Failed to self record framework metrics");
		}
		mediametrics_delete(item);
		return serializedMetrics;
		}

		void DrmHal::reportPluginMetrics() const
		std::string DrmHal::reportPluginMetrics() const
		{
		Vector<uint8_t> metricsVector;
		String8 vendor;
		String8 description;
		std::string metricsString;
		if (getPropertyStringInternal(String8("vendor"), vendor) == OK &&
		getPropertyStringInternal(String8("description"), description) == OK &&
		getPropertyByteArrayInternal(String8("metrics"), metricsVector) == OK) {
		std::string metricsString = toBase64StringNoPad(metricsVector.array(),
		metricsString = toBase64StringNoPad(metricsVector.array(),
		metricsVector.size());
		status_t res = android::reportDrmPluginMetrics(metricsString, vendor,
		description, mMetrics.GetAppUid());
		@@ -1515,6 +1519,7 @@ void DrmHal::reportPluginMetrics() const
		ALOGE("Metrics were retrieved but could not be reported: %d", res);
		}
		}
		return metricsString;
		}

		bool DrmHal::requiresSecureDecoder(const char *mime) const {

drm/libmediadrm/include/mediadrm/DrmHal.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -241,8 +241,8 @@ private:

		void writeByteArray(Parcel &obj, const hidl_vec<uint8_t>& array);

		void reportPluginMetrics() const;
		void reportFrameworkMetrics() const;
		std::string reportPluginMetrics() const;
		std::string reportFrameworkMetrics(const std::string& pluginMetrics) const;
		status_t getPropertyStringInternal(String8 const &name, String8 &value) const;
		status_t getPropertyByteArrayInternal(String8 const &name,
		Vector<uint8_t> &value) const;

media/codec2/sfplugin/CCodec.cpp

+83 −3

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@
		#include <media/stagefright/BufferProducerWrapper.h>
		#include <media/stagefright/MediaCodecConstants.h>
		#include <media/stagefright/PersistentSurface.h>
		#include <utils/NativeHandle.h>

		#include "C2OMXNode.h"
		#include "CCodecBufferChannel.h"
		@@ -796,10 +797,30 @@ void CCodec::configure(const sp<AMessage> &msg) {
		mChannel->setMetaMode(CCodecBufferChannel::MODE_ANW);
		}

		status_t err = OK;
		sp<RefBase> obj;
		sp<Surface> surface;
		if (msg->findObject("native-window", &obj)) {
		surface = static_cast<Surface *>(obj.get());
		// setup tunneled playback
		if (surface != nullptr) {
		Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
		const std::unique_ptr<Config> &config = *configLocked;
		if ((config->mDomain & Config::IS_DECODER)
		&& (config->mDomain & Config::IS_VIDEO)) {
		int32_t tunneled;
		if (msg->findInt32("feature-tunneled-playback", &tunneled) && tunneled != 0) {
		ALOGI("Configuring TUNNELED video playback.");

		err = configureTunneledVideoPlayback(comp, &config->mSidebandHandle, msg);
		if (err != OK) {
		ALOGE("configureTunneledVideoPlayback failed!");
		return err;
		}
		config->mTunneled = true;
		}
		}
		}
		setSurface(surface);
		}

		@@ -1024,7 +1045,7 @@ void CCodec::configure(const sp<AMessage> &msg) {
		sdkParams = msg->dup();
		sdkParams->removeEntryAt(sdkParams->findEntryByName(PARAMETER_KEY_VIDEO_BITRATE));
		}
		status_t err = config->getConfigUpdateFromSdkParams(
		err = config->getConfigUpdateFromSdkParams(
		comp, sdkParams, Config::IS_CONFIG, C2_DONT_BLOCK, &configUpdate);
		if (err != OK) {
		ALOGW("failed to convert configuration to c2 params");
		@@ -1705,6 +1726,19 @@ void CCodec::release(bool sendCallback) {
		}

		status_t CCodec::setSurface(const sp<Surface> &surface) {
		Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
		const std::unique_ptr<Config> &config = *configLocked;
		if (config->mTunneled && config->mSidebandHandle != nullptr) {
		sp<ANativeWindow> nativeWindow = static_cast<ANativeWindow *>(surface.get());
		status_t err = native_window_set_sideband_stream(
		nativeWindow.get(),
		const_cast<native_handle_t *>(config->mSidebandHandle->handle()));
		if (err != OK) {
		ALOGE("NativeWindow(%p) native_window_set_sideband_stream(%p) failed! (err %d).",
		nativeWindow.get(), config->mSidebandHandle->handle(), err);
		return err;
		}
		}
		return mChannel->setSurface(surface);
		}

		@@ -2101,6 +2135,51 @@ void CCodec::setDeadline(
		deadline->set(now + (timeout * mult), name);
		}

		status_t CCodec::configureTunneledVideoPlayback(
		std::shared_ptr<Codec2Client::Component> comp,
		sp<NativeHandle> *sidebandHandle,
		const sp<AMessage> &msg) {
		std::vector<std::unique_ptr<C2SettingResult>> failures;

		std::unique_ptr<C2PortTunneledModeTuning::output> tunneledPlayback =
		C2PortTunneledModeTuning::output::AllocUnique(
		1,
		C2PortTunneledModeTuning::Struct::SIDEBAND,
		C2PortTunneledModeTuning::Struct::REALTIME,
		0);
		// TODO: use KEY_AUDIO_HW_SYNC, KEY_HARDWARE_AV_SYNC_ID when they are in MediaCodecConstants.h
		if (msg->findInt32("audio-hw-sync", &tunneledPlayback->m.syncId[0])) {
		tunneledPlayback->m.syncType = C2PortTunneledModeTuning::Struct::sync_type_t::AUDIO_HW_SYNC;
		} else if (msg->findInt32("hw-av-sync-id", &tunneledPlayback->m.syncId[0])) {
		tunneledPlayback->m.syncType = C2PortTunneledModeTuning::Struct::sync_type_t::HW_AV_SYNC;
		} else {
		tunneledPlayback->m.syncType = C2PortTunneledModeTuning::Struct::sync_type_t::REALTIME;
		tunneledPlayback->setFlexCount(0);
		}
		c2_status_t c2err = comp->config({ tunneledPlayback.get() }, C2_MAY_BLOCK, &failures);
		if (c2err != C2_OK) {
		return UNKNOWN_ERROR;
		}

		std::vector<std::unique_ptr<C2Param>> params;
		c2err = comp->query({}, {C2PortTunnelHandleTuning::output::PARAM_TYPE}, C2_DONT_BLOCK, &params);
		if (c2err == C2_OK && params.size() == 1u) {
		C2PortTunnelHandleTuning::output *videoTunnelSideband =
		C2PortTunnelHandleTuning::output::From(params[0].get());
		// Currently, Codec2 only supports non-fd case for sideband native_handle.
		native_handle_t *handle = native_handle_create(0, videoTunnelSideband->flexCount());
		sidebandHandle = NativeHandle::create(handle, true / ownsHandle */);
		if (handle != nullptr && videoTunnelSideband->flexCount()) {
		memcpy(handle->data, videoTunnelSideband->m.values,
		sizeof(int32_t) * videoTunnelSideband->flexCount());
		return OK;
		} else {
		return NO_MEMORY;
		}
		}
		return UNKNOWN_ERROR;
		}

		void CCodec::initiateReleaseIfStuck() {
		std::string name;
		bool pendingDeadline = false;
		@@ -2113,7 +2192,9 @@ void CCodec::initiateReleaseIfStuck() {
		pendingDeadline = true;
		}
		}
		if (name.empty()) {
		Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
		const std::unique_ptr<Config> &config = *configLocked;
		if (config->mTunneled == false && name.empty()) {
		constexpr std::chrono::steady_clock::duration kWorkDurationThreshold = 3s;
		std::chrono::steady_clock::duration elapsed = mChannel->elapsed();
		if (elapsed >= kWorkDurationThreshold) {
		@@ -2506,4 +2587,3 @@ std::shared_ptr<C2GraphicBlock> CCodec::FetchGraphicBlock(
		}

		} // namespace android

media/codec2/sfplugin/CCodecConfig.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#define LOG_TAG "CCodecConfig"
		#include <cutils/properties.h>
		#include <log/log.h>
		#include <utils/NativeHandle.h>

		#include <C2Component.h>
		#include <C2Param.h>
		@@ -321,7 +322,8 @@ const std::vector<ConfigMapper> StandardParams::NO_MAPPERS;
		CCodecConfig::CCodecConfig()
		: mInputFormat(new AMessage),
		mOutputFormat(new AMessage),
		mUsingSurface(false) { }
		mUsingSurface(false),
		mTunneled(false) { }

		void CCodecConfig::initializeStandardParams() {
		typedef Domain D;

media/codec2/sfplugin/CCodecConfig.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		namespace android {

		struct AMessage;
		class NativeHandle;
		struct StandardParams;

		/**
		@@ -141,6 +142,10 @@ struct CCodecConfig {

		std::set<std::string> mLastConfig;

		/// Tunneled codecs
		bool mTunneled;
		sp<NativeHandle> mSidebandHandle;

		CCodecConfig();

		/// initializes the members required to manage the format: descriptors, reflector,