Merge "Track: Check buffer size" (ef48dc95) · Commits · e / os / android_frameworks_av

services/audioflinger/PatchPanel.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,7 @@ status_t AudioFlinger::PatchPanel::createPatchConnections(Patch *patch,
		format,
		frameCount,
		NULL,
		(size_t)0 /* bufferSize */,
		AUDIO_INPUT_FLAG_NONE);
		if (patch->mPatchRecord == 0) {
		return NO_MEMORY;
		@@ -494,6 +495,7 @@ status_t AudioFlinger::PatchPanel::createPatchConnections(Patch *patch,
		format,
		frameCount,
		patch->mPatchRecord->buffer(),
		patch->mPatchRecord->bufferSize(),
		AUDIO_OUTPUT_FLAG_NONE);
		if (patch->mPatchTrack == 0) {
		return NO_MEMORY;

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ public:
		audio_channel_mask_t channelMask,
		size_t frameCount,
		void *buffer,
		size_t bufferSize,
		const sp<IMemory>& sharedBuffer,
		audio_session_t sessionId,
		uid_t uid,
		@@ -240,6 +241,7 @@ public:
		audio_format_t format,
		size_t frameCount,
		void *buffer,
		size_t bufferSize,
		audio_output_flags_t flags);
		virtual ~PatchTrack();

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ public:
		audio_channel_mask_t channelMask,
		size_t frameCount,
		void *buffer,
		size_t bufferSize,
		audio_session_t sessionId,
		uid_t uid,
		audio_input_flags_t flags,
		@@ -102,6 +103,7 @@ public:
		audio_format_t format,
		size_t frameCount,
		void *buffer,
		size_t bufferSize,
		audio_input_flags_t flags);
		virtual ~PatchRecord();

+4 −2

Original line number	Diff line number	Diff line
		@@ -2018,7 +2018,8 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac
		}

		track = new Track(this, client, streamType, sampleRate, format,
		channelMask, frameCount, NULL, sharedBuffer,
		channelMask, frameCount,
		nullptr /* buffer /, (size_t)0 / bufferSize */, sharedBuffer,
		sessionId, uid, *flags, TrackBase::TYPE_DEFAULT, portId);

		lStatus = track != 0 ? track->initCheck() : (status_t) NO_MEMORY;
		@@ -6700,7 +6701,8 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe
		Mutex::Autolock _l(mLock);

		track = new RecordTrack(this, client, sampleRate,
		format, channelMask, frameCount, NULL, sessionId, uid,
		format, channelMask, frameCount,
		nullptr /* buffer /, (size_t)0 / bufferSize */, sessionId, uid,
		*flags, TrackBase::TYPE_DEFAULT, portId);

		lStatus = track->initCheck();

+3 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ public:
		audio_channel_mask_t channelMask,
		size_t frameCount,
		void *buffer,
		size_t bufferSize,
		audio_session_t sessionId,
		uid_t uid,
		bool isOut,
		@@ -82,6 +83,7 @@ public:

		sp<IMemory> getBuffers() const { return mBufferMemory; }
		void* buffer() const { return mBuffer; }
		size_t bufferSize() const { return mBufferSize; }
		virtual bool isFastTrack() const = 0;
		bool isOutputTrack() const { return (mType == TYPE_OUTPUT); }
		bool isPatchTrack() const { return (mType == TYPE_PATCH); }
		@@ -144,6 +146,7 @@ protected:
		sp<IMemory> mBufferMemory; // currently non-0 for fast RecordTrack only
		void* mBuffer; // start of track buffer, typically in shared memory
		// except for OutputTrack when it is in local memory
		size_t mBufferSize; // size of mBuffer in bytes
		// we don't really need a lock for these
		track_state mState;
		const uint32_t mSampleRate; // initial sample rate only; for tracks which