Merge "libaudiohal@aidl: fix the encoder padding and delay ranges" into udc-qpr-dev (8bb76cf2) · Commits · e / os / android_frameworks_av

media/libaudiohal/impl/StreamHalAidl.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -836,7 +836,7 @@ status_t StreamOutHalAidl::filterAndUpdateOffloadMetadata(AudioParameter &parame
	parameters, String8(AudioParameter::keyOffloadCodecDelaySamples),		parameters, String8(AudioParameter::keyOffloadCodecDelaySamples),
	[&](int value) {		[&](int value) {
	// The legacy keys are misnamed, the value is in frames.		// The legacy keys are misnamed, the value is in frames.
	return value > 0 ? mOffloadMetadata.delayFrames = value, OK : BAD_VALUE;		return value >= 0 ? mOffloadMetadata.delayFrames = value, OK : BAD_VALUE;
	}))) {		}))) {
	updateMetadata = true;		updateMetadata = true;
	}		}
	@@ -844,7 +844,7 @@ status_t StreamOutHalAidl::filterAndUpdateOffloadMetadata(AudioParameter &parame
	parameters, String8(AudioParameter::keyOffloadCodecPaddingSamples),		parameters, String8(AudioParameter::keyOffloadCodecPaddingSamples),
	[&](int value) {		[&](int value) {
	// The legacy keys are misnamed, the value is in frames.		// The legacy keys are misnamed, the value is in frames.
	return value > 0 ? mOffloadMetadata.paddingFrames = value, OK : BAD_VALUE;		return value >= 0 ? mOffloadMetadata.paddingFrames = value, OK : BAD_VALUE;
	}))) {		}))) {
	updateMetadata = true;		updateMetadata = true;
	}		}