Snap for 11944020 from 2e4fe31da66dd626dc9f9c81e683b8abc6ffa939 to 24Q3-release (f363509d) · Commits · e / os / android_frameworks_av

media/codec2/hal/common/Android.bp

+3 −5

Original line number	Diff line number	Diff line
		@@ -28,13 +28,9 @@ cc_library {
		"liblog",
		"libstagefright_foundation",
		"server_configurable_flags",
		"libaconfig_storage_read_api_cc",
		],

		static_libs: ["aconfig_mediacodec_flags_c_lib"],

		defaults: [
		"aconfig_lib_cc_static_link.defaults",
		],
		}

		cc_library_static {
		@@ -57,6 +53,7 @@ cc_library_static {
		shared_libs: [
		"libbase",
		"server_configurable_flags",
		"libaconfig_storage_read_api_cc",
		],

		static_libs: ["aconfig_mediacodec_flags_c_lib"],
		@@ -71,5 +68,6 @@ cc_defaults {
		shared_libs: [
		"libbase",
		"server_configurable_flags",
		"libaconfig_storage_read_api_cc",
		],
		}

media/codec2/sfplugin/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ cc_library_shared {
		"libui",
		"libutils",
		"server_configurable_flags",
		"libaconfig_storage_read_api_cc",
		],

		export_shared_lib_headers: [
		@@ -91,10 +92,6 @@ cc_library_shared {
		"libcodec2_client",
		],

		defaults: [
		"aconfig_lib_cc_static_link.defaults",
		],

		sanitize: {
		cfi: true,
		misc_undefined: [

media/codec2/vndk/C2Fence.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -533,8 +533,7 @@ C2Fence _C2FenceFactory::CreateFromNativeHandle(const native_handle_t* handle) {
		break;
		default:
		ALOGV("Unsupported fence type %d", type);
		// If this is malformed-handle close the handle here.
		(void) native_handle_close(handle);
		// Nothing else to do. The handle is owned by the caller.
		// return a null-fence in this case
		break;
		}

media/libaudioclient/ToneGenerator.cpp

+9 −14

Original line number	Diff line number	Diff line
		@@ -1264,13 +1264,10 @@ void ToneGenerator::stopTone() {
		nsec += 1000000000;
		}

		if ((sec + 1) > ((time_t)(INT_MAX / mSamplingRate))) {
		mMaxSmp = sec * mSamplingRate;
		} else {
		// mSamplingRate is always > 1000
		sec = sec * 1000 + nsec / 1000000; // duration in milliseconds
		mMaxSmp = (unsigned int)(((int64_t)sec * mSamplingRate) / 1000);
		}
		const uint64_t msec = static_cast<uint64_t>(sec) * 1000 + nsec / 1'000'000;
		mMaxSmp = std::min(static_cast<uint64_t>(TONEGEN_INF - 1),
		msec * mSamplingRate / 1000);

		ALOGV("stopTone() forcing mMaxSmp to %d, total for far %" PRIu64, mMaxSmp,
		mTotalSmp);
		} else {
		@@ -1638,14 +1635,11 @@ bool ToneGenerator::prepareWave() {

		mpToneDesc = mpNewToneDesc;

		if (mDurationMs == -1) {
		if (mDurationMs < 0) { // mDurationMs is signed, treat all neg numbers as INF.
		mMaxSmp = TONEGEN_INF;
		} else {
		if (mDurationMs > (int)(TONEGEN_INF / mSamplingRate)) {
		mMaxSmp = (mDurationMs / 1000) * mSamplingRate;
		} else {
		mMaxSmp = (mDurationMs * mSamplingRate) / 1000;
		}
		mMaxSmp = std::min(static_cast<uint64_t>(TONEGEN_INF - 1),
		static_cast<uint64_t>(mDurationMs) * mSamplingRate / 1000);
		ALOGV("prepareWave, duration limited to %d ms", mDurationMs);
		}

		@@ -1676,7 +1670,8 @@ bool ToneGenerator::prepareWave() {
		if (mpToneDesc->segments[0].duration == TONEGEN_INF) {
		mNextSegSmp = TONEGEN_INF;
		} else{
		mNextSegSmp = (mpToneDesc->segments[0].duration * mSamplingRate) / 1000;
		mNextSegSmp = std::min(static_cast<uint64_t>(TONEGEN_INF - 1),
		static_cast<uint64_t>(mpToneDesc->segments[0].duration) * mSamplingRate / 1000);
		}

		return true;

media/libstagefright/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -315,13 +315,10 @@ cc_library {
		"libaudioclient_aidl_conversion",
		"packagemanager_aidl-cpp",
		"server_configurable_flags",
		"libaconfig_storage_read_api_cc",
		"aconfig_mediacodec_flags_c_lib",
		],

		defaults: [
		"aconfig_lib_cc_static_link.defaults",
		],

		static_libs: [
		"android.media.codec-aconfig-cc",
		"libstagefright_esds",