Merge "Remove unnecessary property query." (8e9543dd) · Commits · e / os / android_frameworks_av

media/libaaudio/src/utility/AAudioUtilities.cpp

+0 −51

Original line number	Diff line number	Diff line
		@@ -544,45 +544,6 @@ int32_t AAudioConvert_framesToBytes(int32_t numFrames,
		return AAUDIO_OK;
		}

		static int32_t AAudioProperty_getMMapProperty(const char *propName,
		int32_t defaultValue,
		const char * caller) {
		int32_t prop = property_get_int32(propName, defaultValue);
		switch (prop) {
		case AAUDIO_UNSPECIFIED:
		case AAUDIO_POLICY_NEVER:
		case AAUDIO_POLICY_ALWAYS:
		case AAUDIO_POLICY_AUTO:
		break;
		default:
		ALOGE("%s: invalid = %d", caller, prop);
		prop = defaultValue;
		break;
		}
		return prop;
		}

		int32_t AAudioProperty_getMMapPolicy() {
		return AAudioProperty_getMMapProperty(AAUDIO_PROP_MMAP_POLICY,
		AAUDIO_UNSPECIFIED, __func__);
		}

		int32_t AAudioProperty_getMMapExclusivePolicy() {
		return AAudioProperty_getMMapProperty(AAUDIO_PROP_MMAP_EXCLUSIVE_POLICY,
		AAUDIO_UNSPECIFIED, __func__);
		}

		int32_t AAudioProperty_getMixerBursts() {
		const int32_t defaultBursts = 2; // arbitrary, use 2 for double buffered
		const int32_t maxBursts = 1024; // arbitrary
		int32_t prop = property_get_int32(AAUDIO_PROP_MIXER_BURSTS, defaultBursts);
		if (prop < 1 \|\| prop > maxBursts) {
		ALOGE("AAudioProperty_getMixerBursts: invalid = %d", prop);
		prop = defaultBursts;
		}
		return prop;
		}

		int32_t AAudioProperty_getWakeupDelayMicros() {
		const int32_t minMicros = 0; // arbitrary
		const int32_t defaultMicros = 200; // arbitrary, based on some observed jitter
		@@ -613,18 +574,6 @@ int32_t AAudioProperty_getMinimumSleepMicros() {
		return prop;
		}

		int32_t AAudioProperty_getHardwareBurstMinMicros() {
		const int32_t defaultMicros = 1000; // arbitrary
		const int32_t maxMicros = 1000 * 1000; // arbitrary
		int32_t prop = property_get_int32(AAUDIO_PROP_HW_BURST_MIN_USEC, defaultMicros);
		if (prop < 1 \|\| prop > maxMicros) {
		ALOGE("AAudioProperty_getHardwareBurstMinMicros: invalid = %d, use %d",
		prop, defaultMicros);
		prop = defaultMicros;
		}
		return prop;
		}

		static int32_t AAudioProperty_getMMapOffsetMicros(const char *functionName,
		const char *propertyName) {
		const int32_t minMicros = -20000; // arbitrary

media/libaaudio/src/utility/AAudioUtilities.h

+0 −34

Original line number	Diff line number	Diff line
		@@ -127,27 +127,6 @@ audio_channel_mask_t AAudio_getChannelMaskForOpen(

		// Note that this code may be replaced by Settings or by some other system configuration tool.

		/**
		* Read system property.
		* @return AAUDIO_UNSPECIFIED, AAUDIO_POLICY_NEVER or AAUDIO_POLICY_AUTO or AAUDIO_POLICY_ALWAYS
		*/
		int32_t AAudioProperty_getMMapPolicy();
		#define AAUDIO_PROP_MMAP_POLICY "aaudio.mmap_policy"

		/**
		* Read system property.
		* @return AAUDIO_UNSPECIFIED, AAUDIO_POLICY_NEVER or AAUDIO_POLICY_AUTO or AAUDIO_POLICY_ALWAYS
		*/
		int32_t AAudioProperty_getMMapExclusivePolicy();
		#define AAUDIO_PROP_MMAP_EXCLUSIVE_POLICY "aaudio.mmap_exclusive_policy"

		/**
		* Read system property.
		* @return number of bursts per AAudio service mixer cycle
		*/
		int32_t AAudioProperty_getMixerBursts();
		#define AAUDIO_PROP_MIXER_BURSTS "aaudio.mixer_bursts"

		/**
		* Read a system property that specifies the number of extra microseconds that a thread
		* should sleep when waiting for another thread to service a FIFO. This is used
		@@ -168,19 +147,6 @@ int32_t AAudioProperty_getWakeupDelayMicros();
		int32_t AAudioProperty_getMinimumSleepMicros();
		#define AAUDIO_PROP_MINIMUM_SLEEP_USEC "aaudio.minimum_sleep_usec"

		/**
		* Read system property.
		* This is handy in case the DMA is bursting too quickly for the CPU to keep up.
		* For example, there may be a DMA burst every 100 usec but you only
		* want to feed the MMAP buffer every 2000 usec.
		*
		* This will affect the framesPerBurst for an MMAP stream.
		*
		* @return minimum number of microseconds for a MMAP HW burst
		*/
		int32_t AAudioProperty_getHardwareBurstMinMicros();
		#define AAUDIO_PROP_HW_BURST_MIN_USEC "aaudio.hw_burst_min_usec"

		/**
		* Read a system property that specifies an offset that will be added to MMAP timestamps.
		* This can be used to correct bias in the timestamp.