Merge "Use audio_source_t consistently" (fd267d7c) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ public:
		RECORD_IIR_ENABLE = AUDIO_IN_ACOUSTICS_TX_IIR_ENABLE,
		};

		AudioRecord(int inputSource,
		AudioRecord(audio_source_t inputSource,
		uint32_t sampleRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,
		@@ -175,7 +175,7 @@ public:
		* - NO_INIT: audio server or audio hardware not initialized
		* - PERMISSION_DENIED: recording is not allowed for the requesting process
		* */
		status_t set(int inputSource = 0,
		status_t set(audio_source_t inputSource = AUDIO_SOURCE_DEFAULT,
		uint32_t sampleRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,
		@@ -208,7 +208,7 @@ public:
		int channels() const;
		uint32_t frameCount() const;
		size_t frameSize() const;
		int inputSource() const;
		audio_source_t inputSource() const;


		/* After it's created the track is not active. Call start() to
		@@ -367,8 +367,7 @@ private:
		audio_track_cblk_t* mCblk;
		audio_format_t mFormat;
		uint8_t mChannelCount;
		uint8_t mInputSource;
		uint8_t mReserved[2];
		audio_source_t mInputSource;
		status_t mStatus;
		uint32_t mLatency;

+1 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ public:
		audio_stream_type_t stream,
		int session = 0);
		static void releaseOutput(audio_io_handle_t output);
		static audio_io_handle_t getInput(int inputSource,
		static audio_io_handle_t getInput(audio_source_t inputSource,
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channels = AUDIO_CHANNEL_IN_MONO,

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ public:
		audio_stream_type_t stream,
		int session = 0) = 0;
		virtual void releaseOutput(audio_io_handle_t output) = 0;
		virtual audio_io_handle_t getInput(int inputSource,
		virtual audio_io_handle_t getInput(audio_source_t inputSource,
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channels = 0,

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ struct AudioSource : public MediaSource, public MediaBufferObserver {
		// Note that the "channels" parameter is _not_ the number of channels,
		// but a bitmask of audio_channels_t constants.
		AudioSource(
		int inputSource, uint32_t sampleRate,
		audio_source_t inputSource, uint32_t sampleRate,
		uint32_t channels = AUDIO_CHANNEL_IN_MONO);

		status_t initCheck() const;

+5 −5

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ AudioRecord::AudioRecord()
		}

		AudioRecord::AudioRecord(
		int inputSource,
		audio_source_t inputSource,
		uint32_t sampleRate,
		audio_format_t format,
		uint32_t channelMask,
		@@ -119,7 +119,7 @@ AudioRecord::~AudioRecord()
		}

		status_t AudioRecord::set(
		int inputSource,
		audio_source_t inputSource,
		uint32_t sampleRate,
		audio_format_t format,
		uint32_t channelMask,
		@@ -228,7 +228,7 @@ status_t AudioRecord::set(
		mMarkerReached = false;
		mNewPosition = 0;
		mUpdatePeriod = 0;
		mInputSource = (uint8_t)inputSource;
		mInputSource = inputSource;
		mFlags = flags;
		mInput = input;
		AudioSystem::acquireAudioSessionId(mSessionId);
		@@ -272,9 +272,9 @@ size_t AudioRecord::frameSize() const
		}
		}

		int AudioRecord::inputSource() const
		audio_source_t AudioRecord::inputSource() const
		{
		return (int)mInputSource;
		return mInputSource;
		}

		// -------------------------------------------------------------------------