donut snapshot (6d9d4ac9) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+14 −9

Original line number	Diff line number	Diff line
		@@ -39,10 +39,15 @@ class AudioRecord
		{
		public:

		enum stream_type {
		// input sources values must always be defined in the range
		// [AudioRecord::DEFAULT_INPUT, AudioRecord::NUM_INPUT_SOURCES[
		enum input_source {
		DEFAULT_INPUT =-1,
		MIC_INPUT = 0,
		NUM_STREAM_TYPES
		VOICE_UPLINK_INPUT = 1,
		VOICE_DOWNLINK_INPUT = 2,
		VOICE_CALL_INPUT = 3,
		NUM_INPUT_SOURCES
		};

		static const int DEFAULT_SAMPLE_RATE = 8000;
		@@ -118,7 +123,7 @@ public:
		*
		* Parameters:
		*
		* streamType: Select the audio input to record to (e.g. AudioRecord::MIC_INPUT).
		* inputSource: Select the audio input to record to (e.g. AudioRecord::MIC_INPUT).
		* sampleRate: Track sampling rate in Hz.
		* format: PCM sample format (e.g AudioSystem::PCM_16_BIT for signed
		* 16 bits per sample).
		@@ -140,7 +145,7 @@ public:
		RECORD_IIR_ENABLE = AudioSystem::TX_IIR_ENABLE
		};

		AudioRecord(int streamType,
		AudioRecord(int inputSource,
		uint32_t sampleRate = 0,
		int format = 0,
		int channelCount = 0,
		@@ -165,7 +170,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 streamType = 0,
		status_t set(int inputSource = 0,
		uint32_t sampleRate = 0,
		int format = 0,
		int channelCount = 0,
		@@ -192,11 +197,11 @@ public:

		/* getters, see constructor */

		uint32_t sampleRate() const;
		int format() const;
		int channelCount() const;
		uint32_t frameCount() const;
		int frameSize() const;
		int inputSource() const;


		/* After it's created the track is not active. Call start() to
		@@ -211,7 +216,7 @@ public:
		status_t stop();
		bool stopped() const;

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

		@@ -317,13 +322,13 @@ private:
		sp<ClientRecordThread> mClientRecordThread;
		Mutex mRecordThreadLock;

		uint32_t mSampleRate;
		uint32_t mFrameCount;

		audio_track_cblk_t* mCblk;
		uint8_t mFormat;
		uint8_t mChannelCount;
		uint8_t mReserved[2];
		uint8_t mInputSource;
		uint8_t mReserved;
		status_t mStatus;
		uint32_t mLatency;

include/media/AudioTrack.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -201,7 +201,6 @@ public:
		/* getters, see constructor */

		int streamType() const;
		uint32_t sampleRate() const;
		int format() const;
		int channelCount() const;
		uint32_t frameCount() const;
		@@ -246,7 +245,7 @@ public:

		/* set sample rate for this track, mostly used for games' sound effects
		*/
		void setSampleRate(int sampleRate);
		status_t setSampleRate(int sampleRate);
		uint32_t getSampleRate();

		/* Enables looping and sets the start and end points of looping.

include/media/IAudioFlinger.h

+1 −1

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

		virtual sp<IAudioRecord> openRecord(
		pid_t pid,
		int streamType,
		int inputSource,
		uint32_t sampleRate,
		int format,
		int channelCount,

include/media/IMediaPlayerService.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -57,4 +57,3 @@ public:
		}; // namespace android

		#endif // ANDROID_IMEDIAPLAYERSERVICE_H

include/media/MediaPlayerInterface.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -123,4 +123,3 @@ public:


		#endif // ANDROID_MEDIAPLAYERINTERFACE_H