Snap for 5691653 from e30c6c001dd8831ae84dc1939d0236167f316503 to qt-c2f2-release (b26e56f9) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodecBuffers.cpp

+19 −2

Original line number	Diff line number	Diff line
		@@ -439,6 +439,10 @@ size_t BuffersArrayImpl::numClientBuffers() const {
		});
		}

		size_t BuffersArrayImpl::arraySize() const {
		return mBuffers.size();
		}

		// InputBuffersArray

		void InputBuffersArray::initialize(
		@@ -883,11 +887,24 @@ void OutputBuffersArray::realloc(const std::shared_ptr<C2Buffer> &c2buffer) {
		mAlloc = [format = mFormat, size] {
		return new LocalLinearBuffer(format, new ABuffer(size));
		};
		ALOGD("[%s] reallocating with linear buffer of size %u", mName, size);
		break;
		}

		// TODO: add support
		case C2BufferData::GRAPHIC: [[fallthrough]];
		case C2BufferData::GRAPHIC: {
		// This is only called for RawGraphicOutputBuffers.
		mAlloc = [format = mFormat,
		lbp = LocalBufferPool::Create(kMaxLinearBufferSize * mImpl.arraySize())] {
		return ConstGraphicBlockBuffer::AllocateEmpty(
		format,
		[lbp](size_t capacity) {
		return lbp->newBuffer(capacity);
		});
		};
		ALOGD("[%s] reallocating with graphic buffer: format = %s",
		mName, mFormat->debugString().c_str());
		break;
		}

		case C2BufferData::INVALID: [[fallthrough]];
		case C2BufferData::LINEAR_CHUNKS: [[fallthrough]];

media/codec2/sfplugin/CCodecBuffers.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -478,6 +478,11 @@ public:
		*/
		size_t numClientBuffers() const;

		/**
		* Return the size of the array.
		*/
		size_t arraySize() const;

		private:
		std::string mImplName; ///< name for debugging
		const char *mName; ///< C-string version of name

services/audioflinger/Threads.cpp

+46 −34

Original line number	Diff line number	Diff line
		@@ -3956,6 +3956,32 @@ status_t AudioFlinger::PlaybackThread::getTimestamp_l(AudioTimestamp& timestamp)
		return INVALID_OPERATION;
		}

		// For dedicated VoIP outputs, let the HAL apply the stream volume. Track volume is
		// still applied by the mixer.
		// All tracks attached to a mixer with flag VOIP_RX are tied to the same
		// stream type STREAM_VOICE_CALL so this will only change the HAL volume once even
		// if more than one track are active
		status_t AudioFlinger::PlaybackThread::handleVoipVolume_l(float *volume)
		{
		status_t result = NO_ERROR;
		if ((mOutput->flags & AUDIO_OUTPUT_FLAG_VOIP_RX) != 0) {
		if (*volume != mLeftVolFloat) {
		result = mOutput->stream->setVolume(volume, volume);
		ALOGE_IF(result != OK,
		"Error when setting output stream volume: %d", result);
		if (result == NO_ERROR) {
		mLeftVolFloat = *volume;
		}
		}
		// if stream volume was successfully sent to the HAL, mLeftVolFloat == v here and we
		// remove stream volume contribution from software volume.
		if (mLeftVolFloat == *volume) {
		*volume = 1.0f;
		}
		}
		return result;
		}

		status_t AudioFlinger::MixerThread::createAudioPatch_l(const struct audio_patch *patch,
		audio_patch_handle_t *handle)
		{
		@@ -4758,22 +4784,25 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac
		// no acknowledgement required for newly active tracks
		}
		sp<AudioTrackServerProxy> proxy = track->mAudioTrackServerProxy;
		// cache the combined master volume and stream type volume for fast mixer; this
		// lacks any synchronization or barrier so VolumeProvider may read a stale value
		const float vh = track->getVolumeHandler()->getVolume(
		proxy->framesReleased()).first;
		float volume;
		if (track->isPlaybackRestricted()) {
		if (track->isPlaybackRestricted() \|\| mStreamTypes[track->streamType()].mute) {
		volume = 0.f;
		} else {
		volume = masterVolume
		* mStreamTypes[track->streamType()].volume
		* vh;
		volume = masterVolume * mStreamTypes[track->streamType()].volume;
		}

		handleVoipVolume_l(&volume);

		// cache the combined master volume and stream type volume for fast mixer; this
		// lacks any synchronization or barrier so VolumeProvider may read a stale value
		const float vh = track->getVolumeHandler()->getVolume(
		proxy->framesReleased()).first;
		volume *= vh;
		track->mCachedVolume = volume;
		gain_minifloat_packed_t vlr = proxy->getVolumeLR();
		float vlf = volume * float_from_gain(gain_minifloat_unpack_left(vlr));
		float vrf = volume * float_from_gain(gain_minifloat_unpack_right(vlr));

		track->setFinalVolume((vlf + vrf) / 2.f);
		++fastTracks;
		} else {
		@@ -4916,20 +4945,22 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac
		uint32_t vl, vr; // in U8.24 integer format
		float vlf, vrf, vaf; // in [0.0, 1.0] float format
		// read original volumes with volume control
		float typeVolume = mStreamTypes[track->streamType()].volume;
		float v = masterVolume * typeVolume;
		float v = masterVolume * mStreamTypes[track->streamType()].volume;
		// Always fetch volumeshaper volume to ensure state is updated.
		const sp<AudioTrackServerProxy> proxy = track->mAudioTrackServerProxy;
		const float vh = track->getVolumeHandler()->getVolume(
		track->mAudioTrackServerProxy->framesReleased()).first;

		if (track->isPausing() \|\| mStreamTypes[track->streamType()].mute
		\|\| track->isPlaybackRestricted()) {
		if (mStreamTypes[track->streamType()].mute \|\| track->isPlaybackRestricted()) {
		v = 0;
		}

		handleVoipVolume_l(&v);

		if (track->isPausing()) {
		vl = vr = 0;
		vlf = vrf = vaf = 0.;
		if (track->isPausing()) {
		track->setPaused();
		}
		} else {
		gain_minifloat_packed_t vlr = proxy->getVolumeLR();
		vlf = float_from_gain(gain_minifloat_unpack_left(vlr));
		@@ -4981,25 +5012,6 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac
		track->mHasVolumeController = false;
		}

		// For dedicated VoIP outputs, let the HAL apply the stream volume. Track volume is
		// still applied by the mixer.
		if ((mOutput->flags & AUDIO_OUTPUT_FLAG_VOIP_RX) != 0) {
		v = mStreamTypes[track->streamType()].mute ? 0.0f : v;
		if (v != mLeftVolFloat) {
		status_t result = mOutput->stream->setVolume(v, v);
		ALOGE_IF(result != OK, "Error when setting output stream volume: %d", result);
		if (result == OK) {
		mLeftVolFloat = v;
		}
		}
		// if stream volume was successfully sent to the HAL, mLeftVolFloat == v here and we
		// remove stream volume contribution from software volume.
		if (v != 0.0f && mLeftVolFloat == v) {
		vlf = min(1.0f, vlf / v);
		vrf = min(1.0f, vrf / v);
		vaf = min(1.0f, vaf / v);
		}
		}
		// XXX: these things DON'T need to be done each time
		mAudioMixer->setBufferProvider(trackId, track);
		mAudioMixer->enable(trackId);

services/audioflinger/Threads.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -747,6 +747,7 @@ protected:
		// is safe to do so. That will drop the final ref count and destroy the tracks.
		virtual mixer_state prepareTracks_l(Vector< sp<Track> > *tracksToRemove) = 0;
		void removeTracks_l(const Vector< sp<Track> >& tracksToRemove);
		status_t handleVoipVolume_l(float *volume);

		// StreamOutHalInterfaceCallback implementation
		virtual void onWriteReady();

services/camera/libcameraservice/CameraService.cpp

+14 −13

Original line number	Diff line number	Diff line
		@@ -1149,6 +1149,8 @@ status_t CameraService::handleEvictionsLocked(const String8& cameraId, int clien
		clientPid,
		states[states.size() - 1]);

		resource_policy::ClientPriority clientPriority = clientDescriptor->getPriority();

		// Find clients that would be evicted
		auto evicted = mActiveClientManager.wouldEvict(clientDescriptor);

		@@ -1166,8 +1168,7 @@ status_t CameraService::handleEvictionsLocked(const String8& cameraId, int clien
		String8 msg = String8::format("%s : DENIED connect device %s client for package %s "
		"(PID %d, score %d state %d) due to eviction policy", curTime.string(),
		cameraId.string(), packageName.string(), clientPid,
		priorityScores[priorityScores.size() - 1],
		states[states.size() - 1]);
		clientPriority.getScore(), clientPriority.getState());

		for (auto& i : incompatibleClients) {
		msg.appendFormat("\n - Blocked by existing device %s client for package %s"
		@@ -1212,9 +1213,8 @@ status_t CameraService::handleEvictionsLocked(const String8& cameraId, int clien
		i->getKey().string(), String8{clientSp->getPackageName()}.string(),
		i->getOwnerId(), i->getPriority().getScore(),
		i->getPriority().getState(), cameraId.string(),
		packageName.string(), clientPid,
		priorityScores[priorityScores.size() - 1],
		states[states.size() - 1]));
		packageName.string(), clientPid, clientPriority.getScore(),
		clientPriority.getState()));

		// Notify the client of disconnection
		clientSp->notifyError(hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_DISCONNECTED,
		@@ -1348,14 +1348,19 @@ Status CameraService::connectDevice(
		Status ret = Status::ok();
		String8 id = String8(cameraId);
		sp<CameraDeviceClient> client = nullptr;

		String16 clientPackageNameAdj = clientPackageName;
		if (hardware::IPCThreadState::self()->isServingCall()) {
		std::string vendorClient =
		StringPrintf("vendor.client.pid<%d>", CameraThreadState::getCallingPid());
		clientPackageNameAdj = String16(vendorClient.c_str());
		}
		ret = connectHelper<hardware::camera2::ICameraDeviceCallbacks,CameraDeviceClient>(cameraCb, id,
		/api1CameraId/-1,
		CAMERA_HAL_API_VERSION_UNSPECIFIED, clientPackageName,
		CAMERA_HAL_API_VERSION_UNSPECIFIED, clientPackageNameAdj,
		clientUid, USE_CALLING_PID, API_2, /shimUpdateOnly/ false, /out/client);

		if(!ret.isOk()) {
		logRejected(id, CameraThreadState::getCallingPid(), String8(clientPackageName),
		logRejected(id, CameraThreadState::getCallingPid(), String8(clientPackageNameAdj),
		ret.toString8());
		return ret;
		}
		@@ -2368,11 +2373,7 @@ CameraService::BasicClient::BasicClient(const sp<CameraService>& cameraService,
		}
		mClientPackageName = packages[0];
		}
		if (hardware::IPCThreadState::self()->isServingCall()) {
		std::string vendorClient =
		StringPrintf("vendor.client.pid<%d>", CameraThreadState::getCallingPid());
		mClientPackageName = String16(vendorClient.c_str());
		} else {
		if (!hardware::IPCThreadState::self()->isServingCall()) {
		mAppOpsManager = std::make_unique<AppOpsManager>();
		}
		}