diff options
| author | Andreas Huber <andih@google.com> | 2012-01-18 10:51:55 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-01-18 10:51:55 -0800 |
| commit | c813985abd8ba61e999b3505f6a332574f87a1be (patch) | |
| tree | d87c4ec564d4f3d19db4c1032661799cce847617 /include/media | |
| parent | 04eaf3e5f20d7faa956c0d672024ffb5117f4c26 (diff) | |
| download | frameworks_av-c813985abd8ba61e999b3505f6a332574f87a1be.zip frameworks_av-c813985abd8ba61e999b3505f6a332574f87a1be.tar.gz frameworks_av-c813985abd8ba61e999b3505f6a332574f87a1be.tar.bz2 | |
Temporarily restore AudioSystem/AudioTrack APIs with their former signatures
until we get updated prebuilts from vendor.
Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioSystem.h | 6 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index b56701b..4415d33 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -87,6 +87,12 @@ public: static status_t getOutputFrameCount(int* frameCount, audio_stream_type_t stream = AUDIO_STREAM_DEFAULT); static status_t getOutputLatency(uint32_t* latency, audio_stream_type_t stream = AUDIO_STREAM_DEFAULT); + // DEPRECATED + static status_t getOutputSamplingRate(int* samplingRate, int stream = AUDIO_STREAM_DEFAULT); + + // DEPRECATED + static status_t getOutputFrameCount(int* frameCount, int stream = AUDIO_STREAM_DEFAULT); + static bool routedToA2dpOutput(audio_stream_type_t streamType); static status_t getInputBufferSize(uint32_t sampleRate, int format, int channelCount, diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 6e4a9f5..fe91799 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -153,6 +153,18 @@ public: int notificationFrames = 0, int sessionId = 0); + // DEPRECATED + explicit AudioTrack( int streamType, + uint32_t sampleRate = 0, + int format = AUDIO_FORMAT_DEFAULT, + int channelMask = 0, + int frameCount = 0, + uint32_t flags = 0, + callback_t cbf = 0, + void* user = 0, + int notificationFrames = 0, + int sessionId = 0); + /* Creates an audio track and registers it with AudioFlinger. With this constructor, * the PCM data to be rendered by AudioTrack is passed in a shared memory buffer * identified by the argument sharedBuffer. This prototype is for static buffer playback. |