diff options
| author | Eric Laurent <elaurent@google.com> | 2009-07-07 09:36:14 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-07 09:36:14 -0700 |
| commit | fcc5be99e0497f25a12e77622c27b4de30e45b3d (patch) | |
| tree | 45632e5c03a03e444aa385139e6aeed8020a73dc /include | |
| parent | 43488fc78c927c25936e7b90030c5f10d2db94e5 (diff) | |
| parent | 88e209dcf8c2ebddda5c272f46d1bd5478bc639c (diff) | |
| download | frameworks_base-fcc5be99e0497f25a12e77622c27b4de30e45b3d.zip frameworks_base-fcc5be99e0497f25a12e77622c27b4de30e45b3d.tar.gz frameworks_base-fcc5be99e0497f25a12e77622c27b4de30e45b3d.tar.bz2 | |
am 88e209dc: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Merge commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c'
* commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c':
Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioRecord.h | 4 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 3 | ||||
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 7 |
3 files changed, 5 insertions, 9 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 106807e..83ff508 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -197,7 +197,6 @@ public: /* getters, see constructor */ - uint32_t sampleRate() const; int format() const; int channelCount() const; uint32_t frameCount() const; @@ -217,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(); @@ -323,7 +322,6 @@ private: sp<ClientRecordThread> mClientRecordThread; Mutex mRecordThreadLock; - uint32_t mSampleRate; uint32_t mFrameCount; audio_track_cblk_t* mCblk; diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 0955819..2e1fbda 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -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. diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index bda969c..496a739 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -26,7 +26,6 @@ namespace android { // ---------------------------------------------------------------------------- -#define MAX_SAMPLE_RATE 65535 #define THREAD_PRIORITY_AUDIO_CLIENT (ANDROID_PRIORITY_AUDIO) // Maximum cumulated timeout milliseconds before restarting audioflinger thread #define MAX_STARTUP_TIMEOUT_MS 3000 // Longer timeout period at startup to cope with A2DP init time @@ -55,9 +54,9 @@ struct audio_track_cblk_t uint16_t volume[2]; uint32_t volumeLR; }; - uint16_t sampleRate; - uint16_t channels; - int16_t flowControlFlag; // underrun (out) or overrrun (in) indication + uint32_t sampleRate; + uint8_t channels; + uint8_t flowControlFlag; // underrun (out) or overrrun (in) indication uint8_t out; // out equals 1 for AudioTrack and 0 for AudioRecord uint8_t forceReady; uint16_t bufferTimeoutMs; // Maximum cumulated timeout before restarting audioflinger |