Skip to content

Get default audio devices #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 12, 2021
Merged

Get default audio devices #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bf322f
Get default audio devices on Windows
devopvoid Dec 10, 2021
6d8d271
Get default audio devices on macOS
devopvoid Dec 12, 2021
061ad59
Get default audio devices on Linux
devopvoid Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions webrtc-jni/src/main/cpp/include/JNI_MediaDevices.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions webrtc-jni/src/main/cpp/include/media/audio/AudioDeviceManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ namespace jni
AudioDeviceManager();
virtual ~AudioDeviceManager() {};

AudioDevicePtr getDefaultAudioCaptureDevice();
AudioDevicePtr getDefaultAudioPlaybackDevice();
virtual AudioDevicePtr getDefaultAudioCaptureDevice();
virtual AudioDevicePtr getDefaultAudioPlaybackDevice();

virtual std::set<AudioDevicePtr> getAudioCaptureDevices() = 0;
virtual std::set<AudioDevicePtr> getAudioPlaybackDevices() = 0;
Expand Down
44 changes: 0 additions & 44 deletions webrtc-jni/src/main/cpp/include/media/audio/linux/AlsaAudioDeviceManager.h
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions webrtc-jni/src/main/cpp/include/media/audio/linux/PulseAudioDeviceManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ namespace jni
PulseAudioDeviceManager();
~PulseAudioDeviceManager();

AudioDevicePtr getDefaultAudioCaptureDevice();
AudioDevicePtr getDefaultAudioPlaybackDevice();
AudioDevicePtr getDefaultAudioCaptureDevice() override;
AudioDevicePtr getDefaultAudioPlaybackDevice() override;

std::set<AudioDevicePtr> getAudioCaptureDevices() override;
std::set<AudioDevicePtr> getAudioPlaybackDevices() override;
Expand All @@ -47,8 +47,10 @@ namespace jni
static void stateCallback(pa_context * ctx, void * userdata);
static void serverInfoCallback(pa_context * ctx, const pa_server_info * info, void * userdata);
static void subscribeCallback(pa_context * ctx, pa_subscription_event_type_t t, uint32_t idx, void * userdata);
static void getSourceInfoCallback(pa_context * ctx, const pa_source_info * info, int last, void * userdata);
static void getSourceCallback(pa_context * ctx, const pa_source_info * info, int last, void * userdata);
static void newSourceCallback(pa_context * ctx, const pa_source_info * info, int last, void * userdata);
static void getSinkInfoCallback(pa_context * ctx, const pa_sink_info * info, int last, void * userdata);
static void getSinkCallback(pa_context * ctx, const pa_sink_info * info, int last, void * userdata);
static void newSinkCallback(pa_context * ctx, const pa_sink_info * info, int last, void * userdata);

Expand All @@ -60,7 +62,9 @@ namespace jni
pa_context * context;

std::string defaultCaptureName;
std::string defaultCaptureDescName;
std::string defaultPlaybackName;
std::string defaultPlaybackDescName;

std::unordered_map<uint32_t, AudioDevicePtr> deviceMap;
};
Expand Down
4 changes: 4 additions & 0 deletions webrtc-jni/src/main/cpp/include/media/audio/macos/CoreAudioDeviceManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,15 @@ namespace jni
std::set<AudioDevicePtr> getAudioCaptureDevices() override;
std::set<AudioDevicePtr> getAudioPlaybackDevices() override;

AudioDevicePtr getDefaultAudioCaptureDevice() override;
AudioDevicePtr getDefaultAudioPlaybackDevice() override;

private:
void enumerateDevices(const AudioObjectPropertyScope & scope);
void onDevicesChanged();
void onDefaultDeviceChanged(const AudioObjectPropertyScope & scope, DeviceList<AudioDevicePtr> & devices, const AudioDevicePtr & device);
void checkDeviceGone(DeviceList<AudioDevicePtr> & devices, AudioDeviceID * devIDs, const int numDevIDs, const AudioObjectPropertyScope & scope);
AudioDevicePtr createDefaultAudioDevice(const AudioObjectPropertyScope & scope);
AudioDevicePtr createAudioDevice(const AudioDeviceID & deviceID, const AudioObjectPropertyScope & scope);
bool insertAudioDevice(const AudioDevicePtr & device, const AudioObjectPropertyScope & scope);
int getChannelCount(const AudioDeviceID & deviceID, const AudioObjectPropertyScope & scope);
Expand Down
4 changes: 4 additions & 0 deletions webrtc-jni/src/main/cpp/include/media/audio/windows/WindowsAudioDeviceManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@ namespace jni
std::set<AudioDevicePtr> getAudioCaptureDevices() override;
std::set<AudioDevicePtr> getAudioPlaybackDevices() override;

AudioDevicePtr getDefaultAudioCaptureDevice() override;
AudioDevicePtr getDefaultAudioPlaybackDevice() override;

private:
void enumerateDevices(EDataFlow dataFlow);
void addDevice(LPCWSTR deviceId);
void removeDevice(LPCWSTR deviceId);
AudioDevicePtr createDefaultAudioDevice(const EDataFlow & dataFlow);
AudioDevicePtr createAudioDevice(LPCWSTR deviceId, EDataFlow * dataFlow);
bool insertAudioDevice(AudioDevicePtr device, EDataFlow dataFlow);
void removeAudioDevice(DeviceList<AudioDevicePtr> & devices, std::string id);
Expand Down
34 changes: 34 additions & 0 deletions webrtc-jni/src/main/cpp/src/JNI_MediaDevices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,40 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_MediaDevices_removeDeviceCha
}
}

JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_media_MediaDevices_getDefaultAudioRenderDevice
(JNIEnv * env, jclass caller)
{
jni::WebRTCContext * context = static_cast<jni::WebRTCContext *>(javaContext);

auto device = context->getAudioDeviceManager()->getDefaultAudioPlaybackDevice();

try {
return jni::AudioDevice::toJavaAudioDevice(env, device).release();
}
catch (...) {
ThrowCxxJavaException(env);
}

return nullptr;
}

JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_media_MediaDevices_getDefaultAudioCaptureDevice
(JNIEnv * env, jclass caller)
{
jni::WebRTCContext * context = static_cast<jni::WebRTCContext *>(javaContext);

auto device = context->getAudioDeviceManager()->getDefaultAudioCaptureDevice();

try {
return jni::AudioDevice::toJavaAudioDevice(env, device).release();
}
catch (...) {
ThrowCxxJavaException(env);
}

return nullptr;
}

JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_media_MediaDevices_getAudioRenderDevices
(JNIEnv * env, jclass caller)
{
Expand Down
143 changes: 0 additions & 143 deletions webrtc-jni/src/main/cpp/src/media/audio/linux/AlsaAudioDeviceManager.cpp
View file
Open in desktop

This file was deleted.

Loading