diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-23 15:30:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 15:30:42 +0000 |
| commit | ad7345c0d3c4e3562a70ad89d797f7473c7be57a (patch) | |
| tree | f52441979e6aebf9b1b618bc7f7b7c665f78a5b7 /include | |
| parent | d34ed0f51697623456ddbca10ef9ccf5367ce952 (diff) | |
| parent | d198b85a163330b03e7507c9e8bfeb5f4d958a6c (diff) | |
| download | frameworks_av-ad7345c0d3c4e3562a70ad89d797f7473c7be57a.zip frameworks_av-ad7345c0d3c4e3562a70ad89d797f7473c7be57a.tar.gz frameworks_av-ad7345c0d3c4e3562a70ad89d797f7473c7be57a.tar.bz2 | |
Merge "Fix typos"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioRecord.h | 2 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 8e0b8f8..37184dc 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -152,8 +152,8 @@ public: * sessionId: Not yet supported. * transferType: How data is transferred from AudioRecord. * flags: See comments on audio_input_flags_t in <system/audio.h> + * pAttributes: If not NULL, supersedes inputSource for use case selection. * threadCanCallJava: Not present in parameter list, and so is fixed at false. - * pAttributes: if not NULL, supersedes inputSource for use case selection */ AudioRecord(audio_source_t inputSource, diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 3de0774..cc7acbc 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -182,7 +182,7 @@ public: AudioTrack( audio_stream_type_t streamType, uint32_t sampleRate, audio_format_t format, - audio_channel_mask_t, + audio_channel_mask_t channelMask, size_t frameCount = 0, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, @@ -574,7 +574,7 @@ public: * WOULD_BLOCK when obtainBuffer() returns same, or * AudioTrack was stopped during the write * or any other error code returned by IAudioTrack::start() or restoreTrack_l(). - * Default behavior is to only return until all data has been transferred. Set 'blocking' to + * Default behavior is to only return when all data has been transferred. Set 'blocking' to * false for the method to return immediately without waiting to try multiple times to write * the full content of the buffer. */ |