liboboe: rename Oboe to AAudio
All of the edits were done using scripts in media/liboboe/scripts.
The conversion is done using SED, which is called from
convert_oboe_aaudio.sh
The conversion can be reverted when debugging using revert_all_aaudio.sh
The string substitutions are in oboe_to_aaudio.sed
Bug: 34749573
Test: cts/tests/tests/nativemedia/aaudio
Change-Id: Ia10b34472a90df2652b87607c99156e9084e57aa
Signed-off-by: Phil Burk <philburk@google.com>
diff --git a/media/liboboe/src/client/AudioEndpoint.h b/media/liboboe/src/client/AudioEndpoint.h
index 6ae8b72..e786513 100644
--- a/media/liboboe/src/client/AudioEndpoint.h
+++ b/media/liboboe/src/client/AudioEndpoint.h
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#ifndef OBOE_AUDIO_ENDPOINT_H
-#define OBOE_AUDIO_ENDPOINT_H
+#ifndef AAUDIO_AUDIO_ENDPOINT_H
+#define AAUDIO_AUDIO_ENDPOINT_H
-#include <oboe/OboeAudio.h>
+#include <aaudio/AAudio.h>
-#include "OboeServiceMessage.h"
+#include "AAudioServiceMessage.h"
#include "AudioEndpointParcelable.h"
#include "fifo/FifoBuffer.h"
-namespace oboe {
+namespace aaudio {
#define ENDPOINT_DATA_QUEUE_SIZE_MIN 64
@@ -40,19 +40,19 @@
/**
* Configure based on the EndPointDescriptor_t.
*/
- oboe_result_t configure(const EndpointDescriptor *pEndpointDescriptor);
+ aaudio_result_t configure(const EndpointDescriptor *pEndpointDescriptor);
/**
* Read from a command passed up from the Server.
* @return 1 if command received, 0 for no command, or negative error.
*/
- oboe_result_t readUpCommand(OboeServiceMessage *commandPtr);
+ aaudio_result_t readUpCommand(AAudioServiceMessage *commandPtr);
/**
* Non-blocking write.
* @return framesWritten or a negative error code.
*/
- oboe_result_t writeDataNow(const void *buffer, int32_t numFrames);
+ aaudio_result_t writeDataNow(const void *buffer, int32_t numFrames);
/**
* Set the read index in the downData queue.
@@ -71,13 +71,13 @@
*/
bool isOutputFreeRunning() const { return mOutputFreeRunning; }
- int32_t setBufferSizeInFrames(oboe_size_frames_t requestedFrames,
- oboe_size_frames_t *actualFrames);
- oboe_size_frames_t getBufferSizeInFrames() const;
+ int32_t setBufferSizeInFrames(aaudio_size_frames_t requestedFrames,
+ aaudio_size_frames_t *actualFrames);
+ aaudio_size_frames_t getBufferSizeInFrames() const;
- oboe_size_frames_t getBufferCapacityInFrames() const;
+ aaudio_size_frames_t getBufferCapacityInFrames() const;
- oboe_size_frames_t getFullFramesAvailable();
+ aaudio_size_frames_t getFullFramesAvailable();
private:
FifoBuffer * mUpCommandQueue;
@@ -87,6 +87,6 @@
fifo_counter_t mDataWriteCounter; // only used if free-running
};
-} // namespace oboe
+} // namespace aaudio
-#endif //OBOE_AUDIO_ENDPOINT_H
+#endif //AAUDIO_AUDIO_ENDPOINT_H