Snap for 7166403 from 85a32f4f741cc05961b4adc81bcd5a1e29560419 to sc-release (ec62fbff) · Commits · e / os / android_frameworks_av

drm/libmediadrm/CryptoHal.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -146,6 +146,9 @@ sp<ICryptoPlugin> CryptoHal::makeCryptoPlugin(const sp<ICryptoFactory>& factory,
		plugin = hPlugin;
		}
		);
		if (!hResult.isOk()) {
		mInitCheck = DEAD_OBJECT;
		}
		return plugin;
		}

		@@ -179,10 +182,8 @@ status_t CryptoHal::createPlugin(const uint8_t uuid[16], const void *data,
		}
		}

		if (mPlugin == NULL) {
		mInitCheck = ERROR_UNSUPPORTED;
		} else {
		mInitCheck = OK;
		if (mInitCheck == NO_INIT) {
		mInitCheck = mPlugin == NULL ? ERROR_UNSUPPORTED : OK;
		}

		return mInitCheck;

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ status_t GetLogMessages(const sp<U> &obj, Vector<::V1_4::LogMessage> &logs) {
		::V1_4::IDrmPlugin::getLogMessages_cb cb = [&](
		::V1_4::Status status,
		hidl_vec<::V1_4::LogMessage> hLogs) {
		if (::V1_4::Status::OK == status) {
		if (::V1_4::Status::OK != status) {
		err = status;
		return;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -906,7 +906,6 @@ void C2SoftHevcDec::process(
		work->result = C2_CORRUPTED;
		return;
		}
		continue;
		}
		if (0 < s_decode_op.u4_pic_wd && 0 < s_decode_op.u4_pic_ht) {
		if (mHeaderDecoded == false) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ cc_benchmark {
		cc_benchmark {
		name: "reverb_benchmark",
		vendor: true,
		host_supported: true,
		include_dirs: [
		"frameworks/av/media/libeffects/lvm/wrapper/Reverb",
		],

+1 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ cc_library_static {
		},

		vendor: true,
		host_supported: true,
		srcs: [
		"Reverb/src/LVREV_ApplyNewSettings.cpp",
		"Reverb/src/LVREV_ClearAudioBuffers.cpp",