Merge "AudioRecord const methods" (d67f2cf9) · Commits · e / os / android_frameworks_base

include/media/AudioRecord.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -225,7 +225,7 @@ public:

		/* get sample rate for this record track
		*/
		uint32_t getSampleRate();
		uint32_t getSampleRate() const;

		/* Sets marker position. When record reaches the number of frames specified,
		* a callback with event type EVENT_MARKER is called. Calling setMarkerPosition
		@@ -242,7 +242,7 @@ public:
		* - INVALID_OPERATION: the AudioRecord has no callback installed.
		*/
		status_t setMarkerPosition(uint32_t marker);
		status_t getMarkerPosition(uint32_t *marker);
		status_t getMarkerPosition(uint32_t *marker) const;


		/* Sets position update period. Every time the number of frames specified has been recorded,
		@@ -261,7 +261,7 @@ public:
		* - INVALID_OPERATION: the AudioRecord has no callback installed.
		*/
		status_t setPositionUpdatePeriod(uint32_t updatePeriod);
		status_t getPositionUpdatePeriod(uint32_t *updatePeriod);
		status_t getPositionUpdatePeriod(uint32_t *updatePeriod) const;


		/* Gets record head position. The position is the total number of frames
		@@ -275,7 +275,7 @@ public:
		* - NO_ERROR: successful operation
		* - BAD_VALUE: position is NULL
		*/
		status_t getPosition(uint32_t *position);
		status_t getPosition(uint32_t *position) const;

		/* returns a handle on the audio input used by this AudioRecord.
		*
		@@ -285,7 +285,7 @@ public:
		* Returned value:
		* handle on audio hardware input
		*/
		audio_io_handle_t getInput();
		audio_io_handle_t getInput() const;

		/* returns the audio session ID associated to this AudioRecord.
		*
		@@ -295,7 +295,7 @@ public:
		* Returned value:
		* AudioRecord session ID.
		*/
		int getSessionId();
		int getSessionId() const;

		/* obtains a buffer of "frameCount" frames. The buffer must be
		* filled entirely. If the track is stopped, obtainBuffer() returns
		@@ -326,7 +326,7 @@ public:
		* Such loss typically occurs when the user space process is blocked longer than the capacity of audio driver buffers.
		* Unit: the number of input audio frames
		*/
		unsigned int getInputFramesLost();
		unsigned int getInputFramesLost() const;

		private:
		/* copying audio tracks is not allowed */
		@@ -360,7 +360,7 @@ private:
		sp<IMemory> mCblkMemory;
		sp<ClientRecordThread> mClientRecordThread;
		status_t mReadyToRun;
		Mutex mLock;
		mutable Mutex mLock;
		Condition mCondition;

		uint32_t mFrameCount;

media/libmedia/AudioRecord.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -386,7 +386,7 @@ bool AudioRecord::stopped() const
		return !mActive;
		}

		uint32_t AudioRecord::getSampleRate()
		uint32_t AudioRecord::getSampleRate() const
		{
		AutoMutex lock(mLock);
		return mCblk->sampleRate;
		@@ -402,7 +402,7 @@ status_t AudioRecord::setMarkerPosition(uint32_t marker)
		return NO_ERROR;
		}

		status_t AudioRecord::getMarkerPosition(uint32_t *marker)
		status_t AudioRecord::getMarkerPosition(uint32_t *marker) const
		{
		if (marker == NULL) return BAD_VALUE;

		@@ -423,7 +423,7 @@ status_t AudioRecord::setPositionUpdatePeriod(uint32_t updatePeriod)
		return NO_ERROR;
		}

		status_t AudioRecord::getPositionUpdatePeriod(uint32_t *updatePeriod)
		status_t AudioRecord::getPositionUpdatePeriod(uint32_t *updatePeriod) const
		{
		if (updatePeriod == NULL) return BAD_VALUE;

		@@ -432,7 +432,7 @@ status_t AudioRecord::getPositionUpdatePeriod(uint32_t *updatePeriod)
		return NO_ERROR;
		}

		status_t AudioRecord::getPosition(uint32_t *position)
		status_t AudioRecord::getPosition(uint32_t *position) const
		{
		if (position == NULL) return BAD_VALUE;

		@@ -442,7 +442,7 @@ status_t AudioRecord::getPosition(uint32_t *position)
		return NO_ERROR;
		}

		unsigned int AudioRecord::getInputFramesLost()
		unsigned int AudioRecord::getInputFramesLost() const
		{
		if (mActive)
		return AudioSystem::getInputFramesLost(mInput);
		@@ -597,7 +597,7 @@ void AudioRecord::releaseBuffer(Buffer* audioBuffer)
		mCblk->stepUser(audioBuffer->frameCount);
		}

		audio_io_handle_t AudioRecord::getInput()
		audio_io_handle_t AudioRecord::getInput() const
		{
		AutoMutex lock(mLock);
		return mInput;
		@@ -615,7 +615,7 @@ audio_io_handle_t AudioRecord::getInput_l()
		return mInput;
		}

		int AudioRecord::getSessionId()
		int AudioRecord::getSessionId() const
		{
		return mSessionId;
		}