Snap for 6332289 from 40ac2f6b22375f13ba1dde2f8d6c08fbb8e3f0e8 to qt-qpr3-release (530703f6) · Commits · e / os / android_frameworks_av

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+18 −3

Original line number	Diff line number	Diff line
		@@ -111,6 +111,8 @@ void DrmPlugin::initProperties() {
		// The content in this secure stop is implementation dependent, the clearkey
		// secureStop does not serve as a reference implementation.
		void DrmPlugin::installSecureStop(const hidl_vec<uint8_t>& sessionId) {
		Mutex::Autolock lock(mSecureStopLock);

		ClearkeySecureStop clearkeySecureStop;
		clearkeySecureStop.id = uint32ToVector(++mNextSecureStopId);
		clearkeySecureStop.data.assign(sessionId.begin(), sessionId.end());
		@@ -744,6 +746,7 @@ Return<void> DrmPlugin::getOfflineLicenseState(const KeySetId& keySetId,
		}

		Return<void> DrmPlugin::getSecureStops(getSecureStops_cb _hidl_cb) {
		mSecureStopLock.lock();
		std::vector<SecureStop> stops;
		for (auto itr = mSecureStops.begin(); itr != mSecureStops.end(); ++itr) {
		ClearkeySecureStop clearkeyStop = itr->second;
		@@ -755,26 +758,32 @@ Return<void> DrmPlugin::getSecureStops(getSecureStops_cb _hidl_cb) {
		stop.opaqueData = toHidlVec(stopVec);
		stops.push_back(stop);
		}
		mSecureStopLock.unlock();

		_hidl_cb(Status::OK, stops);
		return Void();
		}

		Return<void> DrmPlugin::getSecureStop(const hidl_vec<uint8_t>& secureStopId,
		getSecureStop_cb _hidl_cb) {
		SecureStop stop;
		std::vector<uint8_t> stopVec;

		mSecureStopLock.lock();
		auto itr = mSecureStops.find(toVector(secureStopId));
		if (itr != mSecureStops.end()) {
		ClearkeySecureStop clearkeyStop = itr->second;
		std::vector<uint8_t> stopVec;
		stopVec.insert(stopVec.end(), clearkeyStop.id.begin(), clearkeyStop.id.end());
		stopVec.insert(stopVec.end(), clearkeyStop.data.begin(), clearkeyStop.data.end());
		}
		mSecureStopLock.unlock();

		SecureStop stop;
		if (!stopVec.empty()) {
		stop.opaqueData = toHidlVec(stopVec);
		_hidl_cb(Status::OK, stop);
		} else {
		_hidl_cb(Status::BAD_VALUE, stop);
		}

		return Void();
		}

		@@ -787,10 +796,12 @@ Return<Status> DrmPlugin::releaseAllSecureStops() {
		}

		Return<void> DrmPlugin::getSecureStopIds(getSecureStopIds_cb _hidl_cb) {
		mSecureStopLock.lock();
		std::vector<SecureStopId> ids;
		for (auto itr = mSecureStops.begin(); itr != mSecureStops.end(); ++itr) {
		ids.push_back(itr->first);
		}
		mSecureStopLock.unlock();

		_hidl_cb(Status::OK, toHidlVec(ids));
		return Void();
		@@ -856,6 +867,8 @@ Return<Status> DrmPlugin::releaseSecureStops(const SecureStopRelease& ssRelease)
		}

		Return<Status> DrmPlugin::removeSecureStop(const hidl_vec<uint8_t>& secureStopId) {
		Mutex::Autolock lock(mSecureStopLock);

		if (1 != mSecureStops.erase(toVector(secureStopId))) {
		return Status::BAD_VALUE;
		}
		@@ -863,6 +876,8 @@ Return<Status> DrmPlugin::removeSecureStop(const hidl_vec<uint8_t>& secureStopId
		}

		Return<Status> DrmPlugin::removeAllSecureStops() {
		Mutex::Autolock lock(mSecureStopLock);

		mSecureStops.clear();
		mNextSecureStopId = kSecureStopIdStart;
		return Status::OK;

drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -416,6 +416,7 @@ private:
		}

		DeviceFiles mFileHandle;
		Mutex mSecureStopLock;

		CLEARKEY_DISALLOW_COPY_AND_ASSIGN_AND_NEW(DrmPlugin);
		};

media/libaaudio/src/binding/IAAudioService.cpp

+57 −16

Original line number	Diff line number	Diff line
		@@ -237,12 +237,12 @@ IMPLEMENT_META_INTERFACE(AAudioService, "IAAudioService");

		status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,
		Parcel* reply, uint32_t flags) {
		aaudio_handle_t streamHandle;
		aaudio_handle_t streamHandle = 0;
		aaudio::AAudioStreamRequest request;
		aaudio::AAudioStreamConfiguration configuration;
		pid_t tid;
		int64_t nanoseconds;
		aaudio_result_t result;
		pid_t tid = 0;
		int64_t nanoseconds = 0;
		aaudio_result_t result = AAUDIO_OK;
		status_t status = NO_ERROR;
		ALOGV("BnAAudioService::onTransact(%i) %i", code, flags);

		@@ -285,7 +285,11 @@ status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,

		case CLOSE_STREAM: {
		CHECK_INTERFACE(IAAudioService, data, reply);
		data.readInt32(&streamHandle);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(CLOSE_STREAM) streamHandle failed!", __func__);
		return status;
		}
		result = closeStream(streamHandle);
		//ALOGD("BnAAudioService::onTransact CLOSE_STREAM 0x%08X, result = %d",
		// streamHandle, result);
		@@ -297,6 +301,7 @@ status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,
		CHECK_INTERFACE(IAAudioService, data, reply);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(GET_STREAM_DESCRIPTION) streamHandle failed!", __func__);
		return status;
		}
		aaudio::AudioEndpointParcelable parcelable;
		@@ -313,7 +318,11 @@ status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,

		case START_STREAM: {
		CHECK_INTERFACE(IAAudioService, data, reply);
		data.readInt32(&streamHandle);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(START_STREAM) streamHandle failed!", __func__);
		return status;
		}
		result = startStream(streamHandle);
		ALOGV("BnAAudioService::onTransact START_STREAM 0x%08X, result = %d",
		streamHandle, result);
		@@ -323,7 +332,11 @@ status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,

		case PAUSE_STREAM: {
		CHECK_INTERFACE(IAAudioService, data, reply);
		data.readInt32(&streamHandle);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(PAUSE_STREAM) streamHandle failed!", __func__);
		return status;
		}
		result = pauseStream(streamHandle);
		ALOGV("BnAAudioService::onTransact PAUSE_STREAM 0x%08X, result = %d",
		streamHandle, result);
		@@ -333,7 +346,11 @@ status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,

		case STOP_STREAM: {
		CHECK_INTERFACE(IAAudioService, data, reply);
		data.readInt32(&streamHandle);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(STOP_STREAM) streamHandle failed!", __func__);
		return status;
		}
		result = stopStream(streamHandle);
		ALOGV("BnAAudioService::onTransact STOP_STREAM 0x%08X, result = %d",
		streamHandle, result);
		@@ -343,7 +360,11 @@ status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,

		case FLUSH_STREAM: {
		CHECK_INTERFACE(IAAudioService, data, reply);
		data.readInt32(&streamHandle);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(FLUSH_STREAM) streamHandle failed!", __func__);
		return status;
		}
		result = flushStream(streamHandle);
		ALOGV("BnAAudioService::onTransact FLUSH_STREAM 0x%08X, result = %d",
		streamHandle, result);
		@@ -353,20 +374,40 @@ status_t BnAAudioService::onTransact(uint32_t code, const Parcel& data,

		case REGISTER_AUDIO_THREAD: {
		CHECK_INTERFACE(IAAudioService, data, reply);
		data.readInt32(&streamHandle);
		data.readInt32(&tid);
		data.readInt64(&nanoseconds);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(REGISTER_AUDIO_THREAD) streamHandle failed!", __func__);
		return status;
		}
		status = data.readInt32(&tid);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(REGISTER_AUDIO_THREAD) tid failed!", __func__);
		return status;
		}
		status = data.readInt64(&nanoseconds);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(REGISTER_AUDIO_THREAD) nanoseconds failed!", __func__);
		return status;
		}
		result = registerAudioThread(streamHandle, tid, nanoseconds);
		ALOGV("BnAAudioService::onTransact REGISTER_AUDIO_THREAD 0x%08X, result = %d",
		streamHandle, result);
		ALOGV("BnAAudioService::%s(REGISTER_AUDIO_THREAD) 0x%08X, result = %d",
		__func__, streamHandle, result);
		reply->writeInt32(result);
		return NO_ERROR;
		} break;

		case UNREGISTER_AUDIO_THREAD: {
		CHECK_INTERFACE(IAAudioService, data, reply);
		data.readInt32(&streamHandle);
		data.readInt32(&tid);
		status = data.readInt32(&streamHandle);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(UNREGISTER_AUDIO_THREAD) streamHandle failed!", __func__);
		return status;
		}
		status = data.readInt32(&tid);
		if (status != NO_ERROR) {
		ALOGE("BnAAudioService::%s(UNREGISTER_AUDIO_THREAD) tid failed!", __func__);
		return status;
		}
		result = unregisterAudioThread(streamHandle, tid);
		ALOGV("BnAAudioService::onTransact UNREGISTER_AUDIO_THREAD 0x%08X, result = %d",
		streamHandle, result);