Revert "Reland "Delete old Android ADM.""
This reverts commit 6e4d7e606c4327eaa9298193e22794fcb9b30218. Reason for revert: Still breaks downstream build (though in a different way this time) Original change's description: > Reland "Delete old Android ADM." > > This is a reland of commit 4ec3e9c98873520b3171d40ab0426b2f05edbbd2 > > Original change's description: > > Delete old Android ADM. > > > > The schedule move Android ADM code to sdk directory have been around > > for several years, but the old code still not delete. > > > > Bug: webrtc:7452 > > Change-Id: I0f75c680f71f0b2ce614de6cbd9f124c2a59d453 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264620 > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > Commit-Queue: Henrik Andreassson <henrika@webrtc.org> > > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#37174} > > Bug: webrtc:7452 > Change-Id: Icabad23e72c8258a854b7809a93811161517266c > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265872 > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#37236} Bug: webrtc:7452 Change-Id: Ide8fbd55fadd7aed9989053afff7c63c04f1320f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266023 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Björn Terelius <terelius@webrtc.org> Owners-Override: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37242}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
7517fb639b
commit
38a28603fd
127
modules/audio_device/android/aaudio_wrapper.h
Normal file
127
modules/audio_device/android/aaudio_wrapper.h
Normal file
@ -0,0 +1,127 @@
|
||||
/*
|
||||
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef MODULES_AUDIO_DEVICE_ANDROID_AAUDIO_WRAPPER_H_
|
||||
#define MODULES_AUDIO_DEVICE_ANDROID_AAUDIO_WRAPPER_H_
|
||||
|
||||
#include <aaudio/AAudio.h>
|
||||
|
||||
#include "api/sequence_checker.h"
|
||||
#include "modules/audio_device/include/audio_device_defines.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
class AudioManager;
|
||||
|
||||
// AAudio callback interface for audio transport to/from the AAudio stream.
|
||||
// The interface also contains an error callback method for notifications of
|
||||
// e.g. device changes.
|
||||
class AAudioObserverInterface {
|
||||
public:
|
||||
// Audio data will be passed in our out of this function dependning on the
|
||||
// direction of the audio stream. This callback function will be called on a
|
||||
// real-time thread owned by AAudio.
|
||||
virtual aaudio_data_callback_result_t OnDataCallback(void* audio_data,
|
||||
int32_t num_frames) = 0;
|
||||
// AAudio will call this functions if any error occurs on a callback thread.
|
||||
// In response, this function could signal or launch another thread to reopen
|
||||
// a stream on another device. Do not reopen the stream in this callback.
|
||||
virtual void OnErrorCallback(aaudio_result_t error) = 0;
|
||||
|
||||
protected:
|
||||
virtual ~AAudioObserverInterface() {}
|
||||
};
|
||||
|
||||
// Utility class which wraps the C-based AAudio API into a more handy C++ class
|
||||
// where the underlying resources (AAudioStreamBuilder and AAudioStream) are
|
||||
// encapsulated. User must set the direction (in or out) at construction since
|
||||
// it defines the stream type and the direction of the data flow in the
|
||||
// AAudioObserverInterface.
|
||||
//
|
||||
// AAudio is a new Android C API introduced in the Android O (26) release.
|
||||
// It is designed for high-performance audio applications that require low
|
||||
// latency. Applications communicate with AAudio by reading and writing data
|
||||
// to streams.
|
||||
//
|
||||
// Each stream is attached to a single audio device, where each audio device
|
||||
// has a unique ID. The ID can be used to bind an audio stream to a specific
|
||||
// audio device but this implementation lets AAudio choose the default primary
|
||||
// device instead (device selection takes place in Java). A stream can only
|
||||
// move data in one direction. When a stream is opened, Android checks to
|
||||
// ensure that the audio device and stream direction agree.
|
||||
class AAudioWrapper {
|
||||
public:
|
||||
AAudioWrapper(AudioManager* audio_manager,
|
||||
aaudio_direction_t direction,
|
||||
AAudioObserverInterface* observer);
|
||||
~AAudioWrapper();
|
||||
|
||||
bool Init();
|
||||
bool Start();
|
||||
bool Stop();
|
||||
|
||||
// For output streams: estimates latency between writing an audio frame to
|
||||
// the output stream and the time that same frame is played out on the output
|
||||
// audio device.
|
||||
// For input streams: estimates latency between reading an audio frame from
|
||||
// the input stream and the time that same frame was recorded on the input
|
||||
// audio device.
|
||||
double EstimateLatencyMillis() const;
|
||||
|
||||
// Increases the internal buffer size for output streams by one burst size to
|
||||
// reduce the risk of underruns. Can be used while a stream is active.
|
||||
bool IncreaseOutputBufferSize();
|
||||
|
||||
// Drains the recording stream of any existing data by reading from it until
|
||||
// it's empty. Can be used to clear out old data before starting a new audio
|
||||
// session.
|
||||
void ClearInputStream(void* audio_data, int32_t num_frames);
|
||||
|
||||
AAudioObserverInterface* observer() const;
|
||||
AudioParameters audio_parameters() const;
|
||||
int32_t samples_per_frame() const;
|
||||
int32_t buffer_size_in_frames() const;
|
||||
int32_t buffer_capacity_in_frames() const;
|
||||
int32_t device_id() const;
|
||||
int32_t xrun_count() const;
|
||||
int32_t format() const;
|
||||
int32_t sample_rate() const;
|
||||
int32_t channel_count() const;
|
||||
int32_t frames_per_callback() const;
|
||||
aaudio_sharing_mode_t sharing_mode() const;
|
||||
aaudio_performance_mode_t performance_mode() const;
|
||||
aaudio_stream_state_t stream_state() const;
|
||||
int64_t frames_written() const;
|
||||
int64_t frames_read() const;
|
||||
aaudio_direction_t direction() const { return direction_; }
|
||||
AAudioStream* stream() const { return stream_; }
|
||||
int32_t frames_per_burst() const { return frames_per_burst_; }
|
||||
|
||||
private:
|
||||
void SetStreamConfiguration(AAudioStreamBuilder* builder);
|
||||
bool OpenStream(AAudioStreamBuilder* builder);
|
||||
void CloseStream();
|
||||
void LogStreamConfiguration();
|
||||
void LogStreamState();
|
||||
bool VerifyStreamConfiguration();
|
||||
bool OptimizeBuffers();
|
||||
|
||||
SequenceChecker thread_checker_;
|
||||
SequenceChecker aaudio_thread_checker_;
|
||||
AudioParameters audio_parameters_;
|
||||
const aaudio_direction_t direction_;
|
||||
AAudioObserverInterface* observer_ = nullptr;
|
||||
AAudioStream* stream_ = nullptr;
|
||||
int32_t frames_per_burst_ = 0;
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // MODULES_AUDIO_DEVICE_ANDROID_AAUDIO_WRAPPER_H_
|
||||
Reference in New Issue
Block a user