diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-11-07 08:09:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-07 08:09:23 -0800 |
| commit | 9d91e2a52b74380dae2662c8c00477c013b83c2c (patch) | |
| tree | 4efa95627996831eb5dd6a92701ca79fdf262688 /include | |
| parent | 1f315f2550a06debd7e43fb508b2e1a8cd7a9046 (diff) | |
| parent | 05d499958e4030938ed77a924ebdd9899f36752e (diff) | |
| download | frameworks_av-9d91e2a52b74380dae2662c8c00477c013b83c2c.zip frameworks_av-9d91e2a52b74380dae2662c8c00477c013b83c2c.tar.gz frameworks_av-9d91e2a52b74380dae2662c8c00477c013b83c2c.tar.bz2 | |
Merge "Remove unused fields in AudioTrack::Buffer"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 76af2f8..529f74e 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -70,14 +70,6 @@ public: class Buffer { public: - enum { - MUTE = 0x00000001 - }; - uint32_t flags; // 0 or MUTE - audio_format_t format; // but AUDIO_FORMAT_PCM_8_BIT -> AUDIO_FORMAT_PCM_16_BIT - // accessed directly by WebKit ANP callback - int channelCount; // will be removed in the future, do not use - size_t frameCount; // number of sample frames corresponding to size; // on input it is the number of frames desired, // on output is the number of frames actually filled @@ -418,6 +410,17 @@ public: * +n limits wait time to n * WAIT_PERIOD_MS, * -1 causes an (almost) infinite wait time, * 0 non-blocking. + * + * Buffer fields + * On entry: + * frameCount number of frames requested + * After error return: + * frameCount 0 + * size 0 + * After successful return: + * frameCount actual number of frames available, <= number requested + * size actual number of bytes available + * raw pointer to the buffer */ enum { |