Audio/VideoSource renamed to Audio/VideoTrackSource

Author: devopvoid

webrtc-demo/webrtc-demo-api/src/main/java/dev/onvoid/webrtc/demo/net/PeerConnectionClient.java

@@ -46,7 +46,7 @@
 import dev.onvoid.webrtc.demo.net.codec.JsonBCodec;
 import dev.onvoid.webrtc.media.MediaStreamTrack;
 import dev.onvoid.webrtc.media.audio.AudioOptions;
-import dev.onvoid.webrtc.media.audio.AudioSource;
+import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 import dev.onvoid.webrtc.media.audio.AudioTrack;
 import dev.onvoid.webrtc.media.video.VideoCaptureCapability;
 import dev.onvoid.webrtc.media.video.VideoDesktopSource;
@@ -385,7 +385,7 @@ private void addAudio(RTCRtpTransceiverDirection direction) {
 			audioOptions.noiseSuppression = true;
 		}
 
-		AudioSource audioSource = factory.createAudioSource(audioOptions);
+		AudioTrackSource audioSource = factory.createAudioSource(audioOptions);
 		AudioTrack audioTrack = factory.createAudioTrack("audioTrack", audioSource);
 
 		peerConnection.addTrack(audioTrack, List.of("stream"));

webrtc-jni/src/main/cpp/include/JNI_AudioResampler.h

@@ -163,7 +163,7 @@ JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_createAud
 	rtc::scoped_refptr<webrtc::AudioSourceInterface> audioSource = factory->CreateAudioSource(audioOptions);
 
 	if (audioSource == nullptr) {
-		env->Throw(jni::JavaError(env, "Create audio source failed"));
+		env->Throw(jni::JavaError(env, "Create audio-track source failed"));
 		return nullptr;
 	}
 
@@ -178,7 +178,7 @@ JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_createAud
 		return nullptr;
 	}
 	if (jsource == nullptr) {
-		env->Throw(jni::JavaNullPointerException(env, "AudioSource is null"));
+		env->Throw(jni::JavaNullPointerException(env, "AudioTrackSource is null"));
 		return nullptr;
 	}
 
@@ -203,7 +203,7 @@ JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_createVid
 		return nullptr;
 	}
 	if (jsource == nullptr) {
-		env->Throw(jni::JavaNullPointerException(env, "VideoSource is null"));
+		env->Throw(jni::JavaNullPointerException(env, "VideoTrackSource is null"));
 		return nullptr;
 	}
 

webrtc-jni/src/main/cpp/include/JNI_PeerConnectionFactory.h

@@ -82,7 +82,7 @@ namespace jni
 		JavaEnums::add<webrtc::AudioDeviceModule::AudioLayer>(env, PKG_AUDIO"AudioLayer");
 		JavaEnums::add<jni::RTCStats::RTCStatsType>(env, PKG"RTCStatsType");
 
-		JavaFactories::add<webrtc::AudioSourceInterface>(env, PKG_MEDIA"audio/AudioSource");
+		JavaFactories::add<webrtc::AudioSourceInterface>(env, PKG_MEDIA"audio/AudioTrackSource");
 		JavaFactories::add<webrtc::AudioTrackInterface>(env, PKG_MEDIA"audio/AudioTrack");
 		JavaFactories::add<webrtc::VideoTrackInterface>(env, PKG_MEDIA"video/VideoTrack");
 		JavaFactories::add<webrtc::MediaStreamInterface>(env, PKG_MEDIA"MediaStream");

webrtc-jni/src/main/cpp/src/JNI_PeerConnectionFactory.cpp

@@ -22,9 +22,9 @@
 import dev.onvoid.webrtc.media.MediaType;
 import dev.onvoid.webrtc.media.audio.AudioDeviceModule;
 import dev.onvoid.webrtc.media.audio.AudioOptions;
-import dev.onvoid.webrtc.media.audio.AudioSource;
+import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 import dev.onvoid.webrtc.media.audio.AudioTrack;
-import dev.onvoid.webrtc.media.video.VideoSource;
+import dev.onvoid.webrtc.media.video.VideoTrackSource;
 import dev.onvoid.webrtc.media.video.VideoTrack;
 
 /**
@@ -74,14 +74,14 @@ public PeerConnectionFactory(AudioDeviceModule audioModule) {
 	}
 
 	/**
-	 * Creates an {@link AudioSource}. The audio source may be used by one or
-	 * more {@link AudioTrack}s.
+	 * Creates an {@link AudioTrackSource}. The audio source may be used by one
+	 * or more {@link AudioTrack}s.
 	 *
 	 * @param options Audio options to control the audio processing.
 	 *
 	 * @return The created audio source.
 	 */
-	public native AudioSource createAudioSource(AudioOptions options);
+	public native AudioTrackSource createAudioSource(AudioOptions options);
 
 	/**
 	 * Creates an new {@link AudioTrack}. The audio track can be added to the
@@ -94,7 +94,7 @@ public PeerConnectionFactory(AudioDeviceModule audioModule) {
 	 *
 	 * @return The created audio track.
 	 */
-	public native AudioTrack createAudioTrack(String label, AudioSource source);
+	public native AudioTrack createAudioTrack(String label, AudioTrackSource source);
 
 	/**
 	 * Creates a new {@link VideoTrack}. The video track can be added to the
@@ -107,7 +107,7 @@ public PeerConnectionFactory(AudioDeviceModule audioModule) {
 	 *
 	 * @return The created video track.
 	 */
-	public native VideoTrack createVideoTrack(String label, VideoSource source);
+	public native VideoTrack createVideoTrack(String label, VideoTrackSource source);
 
 	/**
 	 * Creates a new {@link RTCPeerConnection}.

webrtc-jni/src/main/cpp/src/WebRTCContext.cpp

@@ -18,7 +18,7 @@
 
 import dev.onvoid.webrtc.media.video.desktop.DesktopCapturer;
 
-public class VideoDesktopSource extends VideoSource {
+public class VideoDesktopSource extends VideoTrackSource {
 
 	public VideoDesktopSource() {
 		super();

webrtc/src/main/java/dev/onvoid/webrtc/PeerConnectionFactory.java

@@ -16,7 +16,7 @@
 
 package dev.onvoid.webrtc.media.video;
 
-public class VideoDeviceSource extends VideoSource {
+public class VideoDeviceSource extends VideoTrackSource {
 
 	public VideoDeviceSource() {
 		super();

webrtc/src/main/java/dev/onvoid/webrtc/media/video/VideoDesktopSource.java

@@ -21,9 +21,9 @@
 /**
  * A source for one or more VideoTracks.
  */
-public class VideoSource extends MediaSource {
+public class VideoTrackSource extends MediaSource {
 
-	protected VideoSource() {
+	protected VideoTrackSource() {
 
 	}
 

webrtc/src/main/java/dev/onvoid/webrtc/media/video/VideoDeviceSource.java

@@ -22,7 +22,7 @@
 import dev.onvoid.webrtc.media.MediaStreamTrackState;
 import dev.onvoid.webrtc.media.MediaType;
 import dev.onvoid.webrtc.media.audio.AudioOptions;
-import dev.onvoid.webrtc.media.audio.AudioSource;
+import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 import dev.onvoid.webrtc.media.audio.AudioTrack;
 import dev.onvoid.webrtc.media.video.VideoDeviceSource;
 import dev.onvoid.webrtc.media.video.VideoTrack;
@@ -64,7 +64,7 @@ void createAudioSourceNullOptions() {
 	@Test
 	void createAudioSource() {
 		AudioOptions audioOptions = new AudioOptions();
-		AudioSource audioSource = factory.createAudioSource(audioOptions);
+		AudioTrackSource audioSource = factory.createAudioSource(audioOptions);
 
 		assertNotNull(audioSource);
 		assertEquals(MediaSource.State.LIVE, audioSource.getState());
@@ -84,7 +84,7 @@ void createAudioTrackNullParams() {
 	@Test
 	void createAudioTrack() {
 		AudioOptions audioOptions = new AudioOptions();
-		AudioSource audioSource = factory.createAudioSource(audioOptions);
+		AudioTrackSource audioSource = factory.createAudioSource(audioOptions);
 		AudioTrack audioTrack = factory.createAudioTrack("audioTrack", audioSource);
 
 		assertNotNull(audioTrack);

webrtc/src/main/java/dev/onvoid/webrtc/media/video/VideoSource.java renamed to webrtc/src/main/java/dev/onvoid/webrtc/media/video/VideoTrackSource.java

@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import dev.onvoid.webrtc.media.audio.AudioOptions;
-import dev.onvoid.webrtc.media.audio.AudioSource;
+import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 import dev.onvoid.webrtc.media.audio.AudioTrack;
 import dev.onvoid.webrtc.media.video.VideoDeviceSource;
 import dev.onvoid.webrtc.media.video.VideoTrack;
@@ -93,7 +93,7 @@ void configuration() {
 
 	@Test
 	void addTrackNullParams() {
-		AudioSource audioSource = factory.createAudioSource(new AudioOptions());
+		AudioTrackSource audioSource = factory.createAudioSource(new AudioOptions());
 		AudioTrack track = factory.createAudioTrack("audioTrack", audioSource);
 
 		assertThrows(NullPointerException.class, () -> {
@@ -107,7 +107,7 @@ void addTrackNullParams() {
 
 	@Test
 	void addTrack() {
-		AudioSource audioSource = factory.createAudioSource(new AudioOptions());
+		AudioTrackSource audioSource = factory.createAudioSource(new AudioOptions());
 		AudioTrack audioTrack = factory.createAudioTrack("audioTrack", audioSource);
 
 		VideoDeviceSource videoSource = new VideoDeviceSource();
@@ -132,7 +132,7 @@ void addTrack() {
 
 	@Test
 	void removeTrack() {
-		AudioSource audioSource = factory.createAudioSource(new AudioOptions());
+		AudioTrackSource audioSource = factory.createAudioSource(new AudioOptions());
 		AudioTrack audioTrack = factory.createAudioTrack("audioTrack", audioSource);
 
 		VideoDeviceSource videoSource = new VideoDeviceSource();
@@ -159,7 +159,7 @@ void addTransceiverNullParams() {
 
 	@Test
 	void addAudioTransceiver() {
-		AudioSource audioSource = factory.createAudioSource(new AudioOptions());
+		AudioTrackSource audioSource = factory.createAudioSource(new AudioOptions());
 		AudioTrack track = factory.createAudioTrack("audioTrack", audioSource);
 
 		RTCRtpTransceiver transceiver = peerConnection.addTransceiver(track, new RTCRtpTransceiverInit());
@@ -176,7 +176,7 @@ void addAudioTransceiver() {
 
 	@Test
 	void addSendOnlyAudioTransceiver() {
-		AudioSource audioSource = factory.createAudioSource(new AudioOptions());
+		AudioTrackSource audioSource = factory.createAudioSource(new AudioOptions());
 		AudioTrack track = factory.createAudioTrack("audioTrack", audioSource);
 
 		RTCRtpTransceiverInit init = new RTCRtpTransceiverInit();
@@ -190,7 +190,7 @@ void addSendOnlyAudioTransceiver() {
 
 	@Test
 	void addRecvOnlyAudioTransceiver() {
-		AudioSource audioSource = factory.createAudioSource(new AudioOptions());
+		AudioTrackSource audioSource = factory.createAudioSource(new AudioOptions());
 		AudioTrack track = factory.createAudioTrack("audioTrack", audioSource);
 
 		RTCRtpTransceiverInit init = new RTCRtpTransceiverInit();

webrtc/src/test/java/dev/onvoid/webrtc/PeerConnectionFactoryTests.java

@@ -2,7 +2,7 @@
 
 import dev.onvoid.webrtc.media.MediaType;
 import dev.onvoid.webrtc.media.audio.AudioOptions;
-import dev.onvoid.webrtc.media.audio.AudioSource;
+import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 import dev.onvoid.webrtc.media.audio.AudioTrack;
 
 import java.util.ArrayList;
@@ -38,7 +38,7 @@ void setCodecCapabilities() {
 		codecCapabilities.add(audioCapabilities.getCodecs().get(0));
 		codecCapabilities.add(videoCapabilities.getCodecs().get(0));
 
-		AudioSource audioSource = factory.createAudioSource(new AudioOptions());
+		AudioTrackSource audioSource = factory.createAudioSource(new AudioOptions());
 		AudioTrack track = factory.createAudioTrack("audioTrack", audioSource);
 
 		RTCPeerConnection peerConnection = connection.getPeerConnection();

webrtc/src/test/java/dev/onvoid/webrtc/RTCPeerConnectionTests.java

@@ -20,7 +20,7 @@
 
 import dev.onvoid.webrtc.TestBase;
 import dev.onvoid.webrtc.media.audio.AudioOptions;
-import dev.onvoid.webrtc.media.audio.AudioSource;
+import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 
 import org.junit.jupiter.api.Test;
 
@@ -29,7 +29,7 @@ class MediaSourceTests extends TestBase {
 	@Test
 	void audioSourceStateAfterCreation() {
 		AudioOptions audioOptions = new AudioOptions();
-		AudioSource audioSource = factory.createAudioSource(audioOptions);
+		AudioTrackSource audioSource = factory.createAudioSource(audioOptions);
 
 		assertEquals(MediaSource.State.LIVE, audioSource.getState());
 	}

webrtc/src/test/java/dev/onvoid/webrtc/RTCRtpTransceiverTests.java

@@ -32,7 +32,7 @@ class AudioTrackTests extends TestBase {
 	@BeforeEach
 	void init() {
 		AudioOptions audioOptions = new AudioOptions();
-		AudioSource audioSource = factory.createAudioSource(audioOptions);
+		AudioTrackSource audioSource = factory.createAudioSource(audioOptions);
 
 		audioTrack = factory.createAudioTrack("audioTrack", audioSource);
 	}