Snap for 11120126 from 983e9a48a18c18d1add0fb691c47dace3633239e to 24Q1-release (17a905cf) · Commits · e / os / android_frameworks_av

media/audioserver/audioserver.rc

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ service audioserver /system/bin/audioserver
		# media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
		group audio camera drmrpc media mediadrm net_bt net_bt_admin net_bw_acct wakelock
		capabilities BLOCK_SUSPEND
		# match rtprio cur / max with sensor service as we handle AR/VR HID sensor data.
		rlimit rtprio 10 10
		ioprio rt 4
		task_profiles ProcessCapacityHigh HighPerformance
		onrestart restart vendor.audio-hal

media/codec2/hal/client/output.cpp

+10 −7

Original line number	Diff line number	Diff line
		@@ -141,11 +141,14 @@ status_t attachToBufferQueue(const C2ConstGraphicBlock& block,
		"status = " << INVALID_OPERATION << ".";
		return INVALID_OPERATION;
		}
		result = igbp->attachBuffer(bqSlot, graphicBuffer);
		if (result == OK) {
		syncVar->notifyDequeuedLocked();
		}
		syncVar->unlock();
		result = igbp->attachBuffer(bqSlot, graphicBuffer);
		if (result != OK) {
		syncVar->lock();
		syncVar->notifyQueuedLocked();
		syncVar->unlock();
		}
		} else {
		result = igbp->attachBuffer(bqSlot, graphicBuffer);
		}
		@@ -435,13 +438,13 @@ status_t OutputBufferQueue::outputBuffer(

		auto syncVar = syncMem ? syncMem->mem() : nullptr;
		if(syncVar) {
		syncVar->lock();
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);
		if (status == OK) {
		syncVar->lock();
		syncVar->notifyQueuedLocked();
		}
		syncVar->unlock();
		}
		} else {
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);
		@@ -490,13 +493,13 @@ status_t OutputBufferQueue::outputBuffer(
		auto syncVar = syncMem ? syncMem->mem() : nullptr;
		status_t status = OK;
		if (syncVar) {
		syncVar->lock();
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);
		if (status == OK) {
		syncVar->lock();
		syncVar->notifyQueuedLocked();
		}
		syncVar->unlock();
		}
		} else {
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);

media/codec2/sfplugin/utils/Codec2CommonUtils.cpp

+5 −28

Original line number	Diff line number	Diff line
		@@ -47,35 +47,12 @@ bool isAtLeastU() {
		}

		static bool isP010Allowed() {
		// The first SDK the device shipped with.
		static const int32_t kProductFirstApiLevel =
		base::GetIntProperty<int32_t>("ro.product.first_api_level", 0);

		// GRF devices (introduced in Android 11) list the first and possibly the current api levels
		// to signal which VSR requirements they conform to even if the first device SDK was higher.
		static const int32_t kBoardFirstApiLevel =
		base::GetIntProperty<int32_t>("ro.board.first_api_level", 0);

		// Some devices that launched prior to Android S may not support P010 correctly, even
		// though they may advertise it as supported.
		if (kProductFirstApiLevel != 0 && kProductFirstApiLevel < __ANDROID_API_S__) {
		return false;
		}

		if (kBoardFirstApiLevel != 0 && kBoardFirstApiLevel < __ANDROID_API_S__) {
		return false;
		}

		static const int32_t kBoardApiLevel =
		base::GetIntProperty<int32_t>("ro.board.api_level", 0);

		// For non-GRF devices, use the first SDK version by the product.
		static const int32_t kFirstApiLevel =
		kBoardApiLevel != 0 ? kBoardApiLevel :
		kBoardFirstApiLevel != 0 ? kBoardFirstApiLevel :
		kProductFirstApiLevel;
		// The Vendor API level which is min(ro.product.first_api_level, ro.board.[first_]api_level).
		// This is the api level to which VSR requirement the device conform.
		static const int32_t kVendorApiLevel =
		base::GetIntProperty<int32_t>("ro.vendor.api_level", 0);

		return kFirstApiLevel >= __ANDROID_API_T__;
		return kVendorApiLevel >= __ANDROID_API_T__;
		}

		bool isHalPixelFormatSupported(AHardwareBuffer_Format format) {

media/codec2/tests/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ cc_test {
		static_libs: [
		],

		cpp_std: "gnu++17",
		cflags: [
		"-Werror",
		"-Wall",

media/codec2/vndk/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ cc_defaults {
		// public dependency for implementing Codec 2 components
		cc_defaults {
		name: "libcodec2-impl-defaults",
		cpp_std: "gnu++17",

		shared_libs: [
		"libbase", // for C2_LOG