diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 12:27:51 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-20 14:41:34 -0800 |
| commit | 58f30210ea540b6ce5aa6a46330cd3499483cb97 (patch) | |
| tree | 8c559ac8ca7892803b62e5e6d6018e9a4f4533a3 /include/media/AudioRecord.h | |
| parent | 9bf3a2f69bbfa2562664181b779941e776b7e835 (diff) | |
| download | frameworks_av-58f30210ea540b6ce5aa6a46330cd3499483cb97.zip frameworks_av-58f30210ea540b6ce5aa6a46330cd3499483cb97.tar.gz frameworks_av-58f30210ea540b6ce5aa6a46330cd3499483cb97.tar.bz2 | |
Use audio_format_t consistently, continued
Was int or uint32_t.
When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.
Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.
Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
Diffstat (limited to 'include/media/AudioRecord.h')
| -rw-r--r-- | include/media/AudioRecord.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 44925f2..756e91d 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -68,7 +68,7 @@ public: }; uint32_t flags; int channelCount; - int format; + audio_format_t format; size_t frameCount; size_t size; union { @@ -112,7 +112,7 @@ public: static status_t getMinFrameCount(int* frameCount, uint32_t sampleRate, - int format, + audio_format_t format, int channelCount); /* Constructs an uninitialized AudioRecord. No connection with @@ -151,7 +151,7 @@ public: AudioRecord(int inputSource, uint32_t sampleRate = 0, - int format = 0, + audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channelMask = AUDIO_CHANNEL_IN_MONO, int frameCount = 0, uint32_t flags = 0, @@ -177,7 +177,7 @@ public: * */ status_t set(int inputSource = 0, uint32_t sampleRate = 0, - int format = 0, + audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channelMask = AUDIO_CHANNEL_IN_MONO, int frameCount = 0, uint32_t flags = 0, @@ -203,7 +203,7 @@ public: /* getters, see constructor */ - int format() const; + audio_format_t format() const; int channelCount() const; int channels() const; uint32_t frameCount() const; @@ -349,7 +349,7 @@ private: bool processAudioBuffer(const sp<ClientRecordThread>& thread); status_t openRecord_l(uint32_t sampleRate, - uint32_t format, + audio_format_t format, uint32_t channelMask, int frameCount, uint32_t flags, @@ -365,7 +365,7 @@ private: uint32_t mFrameCount; audio_track_cblk_t* mCblk; - uint32_t mFormat; + audio_format_t mFormat; uint8_t mChannelCount; uint8_t mInputSource; uint8_t mReserved[2]; |